From 74f3a827b455592df58dccf2ab67e76f722df7c1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 09 八月 2022 16:06:56 +0800
Subject: [PATCH] 报工平台维护
---
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 b6d37ed..d2a73ad 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"
@@ -117,7 +117,7 @@
",HMaterTexture='" + omodel.HMaterTexture + "'" +
",HProductNum='" + omodel.HProductNum + "'" +
",HVerNum='" + omodel.HVerNum + "'" +
- ",WorkBillSortNo='" + omodel.WorkBillSortNo + "'" +
+ ",HWorkBillSortNo='" + omodel.HWorkBillSortNo + "'" +
//鍔犲叆鐢熶骇绫诲瀷
",HWorkTypeNum='" + omodel.HWorkTypeNum + "'" +
" where HInterID=" + lngBillKey.ToString());
@@ -168,7 +168,7 @@
",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
"," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
"," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
- ",'" + oSub.HMouldNo?.ToString() + "','" + oSub.HProcWorkNum?.ToString() + "','"+ omodel.HSeOrderInterID.ToString() + "','"+ omodel.HSeOrderEntryID.ToString() + "'"+
+ ",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'"+
") ");
oCn.RunProc(sql1);
}
@@ -269,6 +269,7 @@
//鏂板鍗曟嵁
public override bool AddBill(ref string sReturn)
{
+ string sErr = "";
try
{
//寰楀埌mainid
@@ -279,6 +280,7 @@
//omodel.HProjectNum = "";
//omodel.HProjectNum = GetNewCodeByNum(omodel.HInterID, 1, 3).ToString();
//
+
oCn.BeginTran();
//涓昏〃
oCn.RunProc("Insert Into Sc_ProcessExchangeBillMain " +
@@ -292,7 +294,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,HPRDORGID,HBLFlag,WorkBillSortNo" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID,HBLFlag,HCusNumber,HPickLabel,HPickLabelNumber,HWorkBillSortNo" +
") " +
" 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 + "'" +
@@ -304,8 +306,9 @@
",'" + 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.HPRDORGID+ "','"+omodel.HBLFlag+"','" + omodel.WorkBillSortNo +
+ ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "','"+omodel.HBLFlag+ "','" + omodel.HCusNumber + "','" + omodel.HPickLabel + "','" + omodel.HPickLabelNumber + "','" + omodel.HWorkBillSortNo +
"') ");
+ sErr = sErr + "1;";
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
{
@@ -345,9 +348,11 @@
",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
"," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
"," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
- ",'" + oSub.HMouldNo?.ToString() + "','" + oSub.HProcWorkNum?.ToString() + "','" + omodel.HSeOrderInterID.ToString() + "','" + omodel.HSeOrderEntryID.ToString() + "'" +
+ ",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isStrNull( omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'" +
") ");
+ sErr = sErr + sql1 + "2;";
oCn.RunProc(sql1);
+ sErr = sErr + "2;";
//鏇存柊鎵�閫夋祦杞崱鏁伴噺
if (!oSub.HBackProc)
{
@@ -358,10 +363,13 @@
}
}
+ sErr = sErr + "3;";
}
oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetRemark " + omodel.HInterID.ToString()); //璁剧疆 澶囨敞 涓� 宸ヨ壓娴�
+ sErr = sErr + "4;";
oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetUpdate " + omodel.HInterID.ToString()); //璁剧疆 鏈亾 棣栭亾 杞� 绛変俊鎭�
+ sErr = sErr + "5;";
DataSet ds = new DataSet();
//璁剧疆鏉＄爜鍙� 鍥炲～ 棰嗘枡鎵规
ds = oCn.RunProcReturn("exec h_p_Mes_ProcessExchangeBackBarCode " + omodel.HInterID.ToString(), "h_p_Mes_ProcessExchangeBackBarCode");
@@ -372,10 +380,11 @@
return false;
}
+ sErr = sErr + "6;";
//oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetDate " + omodel.HInterID.ToString()); //鍥炲～ 寮�宸ュ畬宸ユ棩鏈�
//oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_RelationQty " + omodel.HInterID.ToString() + ",1"); //杩斿伐娴佽浆鍗� 鍙嶅啓 鎷嗗垎鏁伴噺 鍥炲～浠诲姟鍗� 娴佽浆鍗℃暟閲� 鍥炲～浠诲姟鍗曚笂闄愭暟閲�
-
+
//鎺у埗鍏宠仈鏁伴噺
ds = null;
ds = oCn.RunProcReturn("exec h_p_Sc_ProcessExchangeBill_Checkqty " + omodel.HInterID.ToString(), "h_p_Sc_ProcessExchangeBill_Checkqty");
@@ -386,6 +395,7 @@
return false;
}
+ sErr = sErr + "7;";
//
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
@@ -394,7 +404,7 @@
}
catch (Exception e)
{
- sReturn = e.Message;
+ sReturn = sErr + "," + e.Message;
oCn.RollBack();
throw (e);
}
--
Gitblit v1.9.1