From a3f4fe73cfc233c4a912d603344a5cb650db4c93 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 27 九月 2021 14:01:15 +0800
Subject: [PATCH] 工序流转卡、生产任务单、工艺路线新增保存组织,列表组织过滤

---
 PlanM/计划管理/Gy_RoutingBill.cs                                |    1 +
 PlanM/计划管理/Gy_RoutingBillList.cs                            |    2 +-
 DAL/生产管理/ClsSc_ICMOBill.cs                                  |    7 ++++---
 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs         |    5 +++--
 WorkM/流转卡管理/Sc_ProcessExchangeBill.cs                       |    1 +
 DAL/计划管理/ClsGy_RoutingBill.cs                               |    7 ++++---
 DBUtility/业务单据/ClsXt_BaseBillMain.cs                        |    5 ++++-
 WorkM/生产管理/Sc_ICMOBill.cs                                   |    1 +
 WebAPI/Models/Gy_RoutingBill.cs                             |    2 ++
 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs |    1 +
 DAL/车间管理/ClsSc_ProcessExchangeBill.cs                       |    7 ++++---
 WorkM/流转卡管理/Sc_ProcessExchangeBillList.cs                   |    1 +
 WorkM/生产管理/Sc_ICMOBillList.cs                               |    1 +
 13 files changed, 28 insertions(+), 13 deletions(-)

diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBill.cs"
index e60abca..b396298 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBill.cs"
@@ -38,6 +38,7 @@
                 oCn.BeginTran();
                 //鏇存柊涓昏〃
                 oCn.RunProc("UpDate Sc_ICMOBillMain set  " +
+                ",HPRDORGID=" + omodel.HPRDORGID.ToString() +
                 " HBillNo='" + omodel.HBillNo + "'" +
                 ",HSeOrderBillNo='" + omodel.HSeOrderBillNo + "'" +
                 ",HSeOrderInterID=" + omodel.HSeOrderInterID.ToString() +
@@ -116,14 +117,14 @@
                 ",HSeOrderInterID,HSeOrderEntryID,HDeptID,HDeptNumber,HCusID,HCusNumber" +
                 ",HCenterID,HCenterNumber,HMaterID,HMaterNumber,HUnitID,HUnitNumber" +
                 ",HBomID,HBomNumber,HRoutingInterID,HPlanBeginDate,HPlanEndDate,HBeginDate" +
-                ",HEndDate,HLevNum,HReadyQty,HPlanQty,HRelationQty,HOrderProcNo" +
+                ",HEndDate,HLevNum,HReadyQty,HPlanQty,HRelationQty,HOrderProcNo,HPRDORGID" +
                 ") " +
                 " values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "','" + omodel.HSeOrderBillNo + "'" +
                 "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "',getdate(),'" + omodel.HRemark + "'," + omodel.HEmpID.ToString() + ",'" + omodel.HEmpNumber + "'" +
                 "," + omodel.HSeOrderInterID.ToString() + "," + omodel.HSeOrderEntryID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber + "'," + omodel.HCusID.ToString() + ",'" + omodel.HCusNumber +"'"+
                 "," + omodel.HCenterID.ToString() + ",'" + omodel.HCenterNumber + "'," + omodel.HMaterID.ToString() + ",'" + omodel.HMaterNumber + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HUnitNumber + "'" +
                 "," + omodel.HBomID.ToString() + ",'" + omodel.HBomNumber + "'," + omodel.HRoutingInterID.ToString() + ",'" + omodel.HPlanBeginDate.ToShortDateString() + "','" + omodel.HPlanEndDate.ToShortDateString() + "','" + omodel.HBeginDate.ToShortDateString() + "'" +
-                ",'" + omodel.HEndDate.ToShortDateString() + "'," + omodel.HLevNum.ToString() + "," + omodel.HReadyQty.ToString() + "," + omodel.HPlanQty.ToString() + "," + omodel.HRelationQty.ToString() + ",'" + omodel.HOrderProcNo.ToString() +   "'" + 
+                ",'" + omodel.HEndDate.ToShortDateString() + "'," + omodel.HLevNum.ToString() + "," + omodel.HReadyQty.ToString() + "," + omodel.HPlanQty.ToString() + "," + omodel.HRelationQty.ToString() + ",'" + omodel.HOrderProcNo.ToString() +   "','"+omodel.HPRDORGID.ToString()+"'" + 
                 ") ");
                 ////鎻掑叆瀛愯〃
                 //foreach (Model.ClsSc_ICMOBillSub oSub in DetailColl)
@@ -154,7 +155,7 @@
             {
                 //鏌ヨ涓昏〃
                 DataSet Ds ;
-                Ds = oCn.RunProcReturn("Select * from Sc_ICMOBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_ICMOBillMain");
+                Ds = oCn.RunProcReturn("Select * from Sc_ICMOBillMain Where HInterID=" + lngBillKey.ToString()+ " and HPRDORGID="+DBUtility.ClsPub.HOrgID+"", "Sc_ICMOBillMain");
                 if(Ds.Tables[0].Rows.Count==0)
                 {
                     sReturn = "鍗曟嵁鏈壘鍒帮紒";
diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
index 72337bd..d597519 100644
--- "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
+++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
@@ -38,6 +38,7 @@
                 oCn.BeginTran();
                 //鏇存柊涓昏〃
                 oCn.RunProc("UpDate Gy_RoutingBillMain set  " +
+                ",HPRDORGID=" + omodel.HPRDORGID.ToString() +
                 " HName='" + omodel.HName + "'" +
                 ",HBillNo='" + omodel.HBillNo + "'" +
                 ",HMaterTypeID=" + omodel.HMaterTypeID.ToString() +
@@ -184,14 +185,14 @@
                 ",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
                 ",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
                 ",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
-                ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum" +
+                ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HPRDORGID,HVerNum" +
                 ") " +
                 " values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                 "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + omodel.HMaterID.ToString() + ",'" + omodel.HName + "'," + omodel.HMaterTypeID.ToString() +
                 ",'" + omodel.HRoutingGroupID.ToString() + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HMaterNumber + "','" + omodel.HUnitNumber + "'," + DBUtility.ClsPub.BoolToString(omodel.HStandard) +
                 "," + omodel.HMainGroupID.ToString() + "," + omodel.HMainProcID.ToString() + "," + omodel.HMainCenterID.ToString() + ",'" + omodel.HMainTimeUnit + "'," + omodel.HMainUnitTime.ToString() + "," + omodel.HMainWorkQty.ToString() +
                 "," + omodel.HMainPrice.ToString() + "," + omodel.HStdSourceQty.ToString() + "," + omodel.HAddSourceRate + "," + omodel.HDelSourceRate.ToString() +
-                ",'" + omodel.HPicNumVer.ToString() + "','" + omodel.HPicNumAssemble.ToString() + "','" + omodel.HMaterTexture.ToString() + "','" + omodel.HProductNum.ToString() + "','" + omodel.HVerNum.ToString() + "'"+
+                ",'" + omodel.HPicNumVer.ToString() + "','" + omodel.HPicNumAssemble.ToString() + "','" + omodel.HMaterTexture.ToString() + "','" + omodel.HProductNum.ToString() + "','"+omodel.HPRDORGID.ToString()+"','" + omodel.HVerNum.ToString() + "'"+
                 ") ");
                 //鎻掑叆瀛愯〃
                 foreach (Model.ClsGy_RoutingBillSub oSub in DetailColl)
@@ -261,7 +262,7 @@
             {
                 //鏌ヨ涓昏〃
                 DataSet Ds ;
-                Ds = oCn.RunProcReturn("Select * from Gy_RoutingBillMain Where HInterID=" + lngBillKey.ToString(), "Gy_RoutingBillMain");
+                Ds = oCn.RunProcReturn("Select * from Gy_RoutingBillMain Where HInterID=" + lngBillKey.ToString()+" and HPRDORGID='"+DBUtility.ClsPub.HOrgID.ToString()+"'", "Gy_RoutingBillMain");
                 if(Ds.Tables[0].Rows.Count==0)
                 {
                     sReturn = "鍗曟嵁鏈壘鍒帮紒";
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index 9ca1058..59e7baa 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -63,6 +63,7 @@
                 " HBillNo='" + omodel.HBillNo + "'" +  //鍥哄畾璧嬪��===============
                 ",HDate='" + omodel.HDate + "'" +
                 ",HYear='" + omodel.HYear.ToString() + "'" +
+                ",HPRDORGID='" + omodel.HPRDORGID.ToString() + "'" +
                 ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                 ",HRemark='" + omodel.HRemark + "'" +
                 ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
@@ -287,7 +288,7 @@
                 ",HProdMaterName,HCusName,HWorkRemark,HImportNote,HMaterNumber_A" +
                 ",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
                 ",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" +
-                ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum" +
+                ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID" +
                 ") " +
                 " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
                 "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
@@ -299,7 +300,7 @@
                 ",'" + omodel.HProdMaterName + "','" + omodel.HCusName + "','" + omodel.HWorkRemark + "','" + omodel.HImportNote + "','" + omodel.HMaterNumber_A + "'" +
                 ",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
                 ",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
-                ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "'" +
+                ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "'" +
                 ") ");
                 //鎻掑叆瀛愯〃
                 foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
@@ -456,7 +457,7 @@
             {
                 //鏌ヨ涓昏〃
                 DataSet Ds;
-                Ds = oCn.RunProcReturn("Select * from Sc_ProcessExchangeBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_ProcessExchangeBillMain");
+                Ds = oCn.RunProcReturn("Select * from Sc_ProcessExchangeBillMain Where HInterID=" + lngBillKey.ToString()+" and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " ", "Sc_ProcessExchangeBillMain");
                 if (Ds.Tables[0].Rows.Count == 0)
                 {
                     sReturn = "鍗曟嵁鏈壘鍒帮紒";
diff --git "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBillMain.cs" "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBillMain.cs"
index 4c3b94a..f1d8f76 100644
--- "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBillMain.cs"
+++ "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBillMain.cs"
@@ -39,6 +39,9 @@
         public string HMainSourceBillNo;
         public string HMainSourceBillType; 
         public Int64 HMainSourceInterID;
-        public Int64 HMainSourceEntryID; 
+        public Int64 HMainSourceEntryID;
+
+        //组织
+        public Int64 HPRDORGID;
     }
 }
diff --git "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs" "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
index cc1efe0..5ee8641 100644
--- "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
+++ "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
@@ -1042,6 +1042,7 @@
             if (BillStatus ==DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
                 BillNew.omodel.HInterID = BillOld.omodel.HInterID;
             //涓荤被璧嬪��
+            BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID;  //缁勭粐
             BillNew.omodel.HYear = 2011;
             BillNew.omodel.HPeriod = 1;
             BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();  //鍦ㄨ祴鍊肩被鍓嶅氨澶勭悊濂藉瓧绗︿覆鍜屾暟瀛�
diff --git "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBillList.cs" "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBillList.cs"
index 564de88..140dd54 100644
--- "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBillList.cs"
+++ "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBillList.cs"
@@ -46,7 +46,7 @@
             //杩囨护鏉′欢
             if (frmCondition.SqlStr.Trim().Length == 0)
                 return;
-            sSql = frmCondition.SqlStr + sWhere + " order by 鍗曟嵁鍙� desc,hsubid ";
+            sSql = frmCondition.SqlStr + sWhere + " and HPRDORGID='"+DBUtility.ClsPub.HOrgID.ToString()+"' order by 鍗曟嵁鍙� desc,hsubid ";
             //
             DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
             //鐢熸垚棣栬鏍囬
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index bf213cb..337127e 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -57,6 +57,7 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
+                BillNew.omodel.HPRDORGID= mainList[0].HPRDORGID;//缁勭粐
                 BillNew.omodel.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
                 BillNew.omodel.HYear = sYear;
                 BillNew.omodel.HPeriod = sPeriod;
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index c1ad168..19632c0 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -134,6 +134,7 @@
                 double HStdSourceQty = mainList[0].HStdSourceQty;//鏍囧噯璧勬簮鏁�
                 double HAddSourceRate = mainList[0].HAddSourceRate;//鍔犺祫婧愬閲�
                 double HDelSourceRate = mainList[0].HDelSourceRate;//鍑忚祫婧愬噺閲�
+                int HPRDORGID = mainList[0].HPRDORGID;  //缁勭粐
 
                 //涓昏〃
                 oCN.RunProc("Insert Into Gy_RoutingBillMain   " +
@@ -141,13 +142,13 @@
                 ",HYear,HPeriod,HRemark,HMaker,Hmakedate,HMaterID,HName,HMaterTypeID" +
                 ",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
                 ",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
-                ",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
+                ",HMainPrice,HStdSourceQty,HAddSourceRate,HPRDORGID,HDelSourceRate" +
                 ") " +
                 " values('" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
                 "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HMaterID + ",'" + HName + "'," + HMaterTypeID +
                 "," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
                 "," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
-                "," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HDelSourceRate +
+                "," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
                 ") ");
 
                 //淇濆瓨瀛愯〃
diff --git a/WebAPI/Models/Gy_RoutingBill.cs b/WebAPI/Models/Gy_RoutingBill.cs
index ef05e1d..22bba28 100644
--- a/WebAPI/Models/Gy_RoutingBill.cs
+++ b/WebAPI/Models/Gy_RoutingBill.cs
@@ -29,5 +29,7 @@
         public double HAddSourceRate { get; set; }
         public double HDelSourceRate { get; set; }
 
+        public int HPRDORGID { get; set; }
+
     }
 }
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
index 60ca177..e427d62 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
@@ -1357,6 +1357,7 @@
             //
             BillNew.omodel.HYear = sYear;
             BillNew.omodel.HPeriod = sPeriod;
+            BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID;  //缁勭粐
             //鍥哄畾璧嬪��=================================
             BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();  //鍦ㄨ祴鍊肩被鍓嶅氨澶勭悊濂藉瓧绗︿覆鍜屾暟瀛�
             BillNew.omodel.HDate = this.dtpHDate.Value;
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillList.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillList.cs"
index b1514a5..efbd15e 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillList.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillList.cs"
@@ -858,6 +858,7 @@
             //    MessageBox.Show("娌℃湁杈撳叆鏉′欢!");
             //    return;
             //}
+            sFastSQL = sFastSQL + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + "";
             sDlgWhere = sFastSQL;
             Display();
             sDlgWhere = "";
diff --git "a/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBill.cs" "b/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBill.cs"
index 6ed1f00..7242162 100644
--- "a/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBill.cs"
+++ "b/WorkM/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOBill.cs"
@@ -893,6 +893,7 @@
             if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
                 BillNew.omodel.HInterID = BillOld.omodel.HInterID;
             //涓荤被璧嬪��
+            BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID;  //缁勭粐
             BillNew.omodel.HYear = 2011;
             BillNew.omodel.HPeriod = 1;
             BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();  //鍦ㄨ祴鍊肩被鍓嶅氨澶勭悊濂藉瓧绗︿覆鍜屾暟瀛�
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 ee8cebe..4888f34 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"
@@ -646,6 +646,7 @@
             //    MessageBox.Show("娌℃湁杈撳叆鏉′欢!");
             //    return;
             //}
+            sFastSQL = sFastSQL + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + "";
             sDlgWhere = sFastSQL;
             Display();
             sDlgWhere = "";

--
Gitblit v1.9.1