From d2b5cb03e2ab7d672203f41ef8b1709c087e6d4a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 20 十二月 2024 15:11:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/生产管理/Sc_ICMOBillList.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git "a/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBillList.cs" "b/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBillList.cs"
index 4888f34..b4e527a 100644
--- "a/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBillList.cs"
+++ "b/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBillList.cs"
@@ -49,7 +49,7 @@
//杩囨护鏉′欢
if (frmCondition.SqlStr.Trim().Length == 0)
return;
- sSql = frmCondition.SqlStr + sWhere + sDlgWhere + " order by 鍗曟嵁鍙� desc,hsubid ";
+ sSql = frmCondition.SqlStr + sWhere + sDlgWhere + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " order by 鍗曟嵁鍙� desc,hsubid ";
//
DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
@@ -699,7 +699,7 @@
oSc_ProcessExchangeBill.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
oSc_ProcessExchangeBill.ModCaption = "宸ュ簭娴佽浆鍗�";
- oSc_ProcessExchangeBill.oXT = Ds;
+ oSc_ProcessExchangeBill.oXT = Ds; //--h_v_S_Sc_ICMOBillList 杩欎釜瑙嗗浘鏉ヨ幏鍙� 宸ヨ壓璺嚎
oSc_ProcessExchangeBill.ShowDialog();
}
/////////////////////////////
--
Gitblit v1.9.1