From dbbb9d51fd82287021e87d7d9f41483e4f8bee95 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 13 八月 2021 16:24:16 +0800
Subject: [PATCH] 修改生产任务单下推流转卡数量控制超出问题；修改流转卡数量显示问题；修改流转卡保存后单据显示问题；
---
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 5d42bac..4c7a3d1 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"
@@ -270,7 +270,7 @@
",HProdMaterCode,HSeOrderBillNo,HCusShortName,HCusNeedMaterial,HPlanSendGoodsDate" +
",HProdMaterName,HCusName,HWorkRemark,HImportNote,HMaterNumber_A" +
",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
- ",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD" +
+ ",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" +
") " +
" 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 + "'" +
@@ -281,7 +281,7 @@
",'" + omodel.HProdMaterCode + "','" + omodel.HSeOrderBillNo + "','" + omodel.HCusShortName + "','" + omodel.HCusNeedMaterial + "','" + omodel.HPlanSendGoodsDate + "'" +
",'" + 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.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
@@ -432,6 +432,12 @@
omodel.HBLFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HBLFlag"]);
omodel.HEquipMentID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipMentID"]);
omodel.HProjectNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProjectNum"]);
+ //===============
+ omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumVer"]);
+ omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumAssemble"]);
+ omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterTexture"]);
+ omodel.HProductNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProductNum"]);
+ omodel.HVerNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNum"]);
//
//寰幆
DataSet DsSub;
@@ -509,6 +515,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HTechnologyParameter"]);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPicNum"]);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcCheckNote"]);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMouldNo"]);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcWorkNum"]);
DetailColl.Add(oSub);
}
@@ -630,7 +638,30 @@
omodel.HBLFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HBLFlag"]);
omodel.HEquipMentID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipMentID"]);
omodel.HProjectNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProjectNum"]);
- //
+
+ omodel.HProdMaterCode = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProdMaterCode"]);
+ omodel.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSeOrderBillNo"]);
+ omodel.HCusShortName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusShortName"]);
+ omodel.HCusNeedMaterial = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusNeedMaterial"]);
+ omodel.HPlanSendGoodsDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPlanSendGoodsDate"]);
+ omodel.HProdMaterName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProdMaterName"]);
+ omodel.HCusName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusName"]);
+ omodel.HWorkRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HWorkRemark"]);
+ omodel.HImportNote = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HImportNote"]);
+ omodel.HMaterNumber_A = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_A"]);
+ omodel.HMaterNumber_B = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_B"]);
+ omodel.HMaterNumber_C = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_C"]);
+ omodel.HMaterNumber_D = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_D"]);
+ omodel.HProdType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProdType"]);
+ omodel.HMaterShortName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterShortName"]);
+ omodel.HMaterIDA = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDA"]);
+ omodel.HMaterIDB = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDB"]);
+ omodel.HMaterIDC = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDC"]);
+ omodel.HMaterIDD = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDD"]);
+ omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumVer"]);
+ omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumAssemble"]);
+ omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterTexture"]);
+ omodel.HVerNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNum"]);
//寰幆
DataSet DsSub;
if (bBack)
@@ -722,6 +753,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HTechnologyParameter"]);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPicNum"]);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcCheckNote"]);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMouldNo"]);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcWorkNum"]);
DetailColl.Add(oSub);
}
sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
--
Gitblit v1.9.1