From dfcab5f73b1f07e63ca9483d457bcfddccc95bf3 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 10 十月 2024 14:27:44 +0800
Subject: [PATCH] 班组列表返回数据调用方法修改，增加根据用户过滤显示班组；PDA模块所调用的班组返回数据方法新增
---
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
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 186e9a3..0bc28d5 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"
@@ -82,6 +82,7 @@
",HPRDORGID='" + omodel.HPRDORGID.ToString() + "'" +
",HPeriod='" + omodel.HPeriod.ToString() + "'" +
",HRemark='" + omodel.HRemark + "'" +
+ ",HMouldNum='" + omodel.HMouldNum + "'" +
",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
",HUpDateDate=getdate()" +
",HMainSourceBillSubType='" + omodel.HMainSourceBillSubType + "'" +
@@ -341,7 +342,11 @@
try
{
//寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (omodel.HInterID == 0 || omodel.HInterID.ToString() == null || omodel.HInterID.ToString() == "undefined")
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
//淇濆瓨鍓嶆帶鍒�=========================================
@@ -377,7 +382,8 @@
", HRoutingBillID,HMaterModel,HWidth,HWeight,HAuxQty,HAuxUnit,HAuxQty2,HAuxUnit2,HSplitNo" +
",HHeight,HInches,HAl1Long,HDensity,HTela,HUnderTela,HSizing,HSellDate" +
",HRemark2,HRemark3,HEmpID,HCusID,HColorRemark,HSplitSumQty,HSplitColorQty,HMachineLine" +
- ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HOrderLevID,HWidth_New,HRemark_New,HWeight_New,HPlanOrderProcNo) " +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HOrderLevID,HWidth_New,HRemark_New,HWeight_New,HPlanOrderProcNo" +
+ ",HMouldNum) " +
" values('" + this.BillType + "','" + omodel.HBillSubType + "','" + (omodel.HMainSourceBillSubType==null?"": omodel.HMainSourceBillSubType) + "'," + 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 + "'" +
"," + omodel.HWWOrderInterID.ToString() + "," + omodel.HWWOrderEntryID.ToString() + ",'" + omodel.HWWOrderBillNo + "'," + omodel.HICMOInterID.ToString() + "," + omodel.HEquipMentID.ToString() +
@@ -393,6 +399,7 @@
",'" + omodel.HHeight + "','" + omodel.HInches + "','" + omodel.HAl1Long + "','" + omodel.HDensity + "','" + omodel.HTela + "','" + omodel.HUnderTela + "','" + omodel.HSizing + "','" + omodel.HSellDate + "'" +
",'"+ omodel.HRemark2 + "','"+ omodel.HRemark3 + "',"+ omodel.HEmpID + "," + omodel.HCusID + ",'"+ omodel.HColorRemark + "',"+ omodel.HSplitSumQty + ","+ omodel.HSplitColorQty + ",'"+ omodel.HMachineLine + "'" +
","+ omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HOrderLevID + "'," + omodel.HWidth_New + ",'" + omodel.HRemark_New + "'," + omodel.HWeight_New + ",'" + omodel.HPlanOrderProcNo + "'" +
+ ",'"+ omodel.HMouldNum + "'" +
")");
sErr = sErr + "1;";
//鎻掑叆瀛愯〃
@@ -493,12 +500,34 @@
{
if (oSystemParameter.omodel.Sc_ProcessExchangeBill_AutoBarCode == "Y") //绯荤粺鍙傛暟 宸ュ簭娴佽浆鍗′繚瀛樻椂鑷姩鍚屾鏉＄爜淇℃伅鑷虫潯鐮佹。妗�
{
- oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ Int64 HBarCodeInterID = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧")
+ {
+ oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty" +
",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark" +
",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate" +
- ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag" +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID,HGiveAwayFlag" +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
+ ") values ("
+ + "'" + omodel.HBillNo + "','鍞竴鏉＄爜'," + omodel.HMaterID.ToString() + "," + omodel.HUnitID.ToString() + "," + omodel.HQty.ToString()
+ + ",'" + omodel.HBatchNo + "'," + omodel.HSupID.ToString() + ",0,'" + omodel.HMaker + "',getdate(),0," + omodel.HQty.ToString()
+ + ", " + omodel.HICMOInterID.ToString() + "," + omodel.HICMOEntryID + ",'" + omodel.HICMOBillNo + "','3710',''"
+ + ",1,1,0,0,0,'宸ュ簭娴佽浆鍗′繚瀛樿嚜鍔ㄥ悓姝�'"
+ + ",0,'',getdate(),'',getdate()"
+ + ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",''," + HBarCodeInterID + ",1,0"
+ + ",'','','',0,'','')");
+ }
+ else
+ {
+ oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty" +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark" +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate" +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID,HGiveAwayFlag" +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
") values ("
+ "'" + omodel.HBillNo + "','鍞竴鏉＄爜'," + omodel.HMaterID.ToString() + "," + omodel.HUnitID.ToString() + "," + omodel.HQty.ToString()
@@ -506,8 +535,9 @@
+ ", " + omodel.HInterID.ToString() + ",1,'" + omodel.HBillNo + "','3772',''"
+ ",1,1,0,0,0,'宸ュ簭娴佽浆鍗′繚瀛樿嚜鍔ㄥ悓姝�'"
+ ",0,'',getdate(),'',getdate()"
- + ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",'',0,0"
+ + ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",''," + HBarCodeInterID + ",1,0"
+ ",'','','',0,'','')");
+ }
}
}
else
--
Gitblit v1.9.1