From e3ae7f17842fe7de358ced5398ef792a961f80eb Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 20 八月 2021 15:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 83 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 13 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..a6c3598 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"
@@ -71,7 +71,7 @@
",HWWOrderInterID=" + omodel.HWWOrderInterID.ToString() +
",HWWOrderEntryID=" + omodel.HWWOrderEntryID.ToString() +
",HWWOrderBillNo='" + omodel.HWWOrderBillNo + "'" +
- ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ //",HICMOInterID=" + omodel.HICMOInterID.ToString() +
",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
",HMaterID2=" + omodel.HMaterID2.ToString() +
@@ -112,9 +112,14 @@
",HMaterIDB='" + omodel.HMaterIDB + "'" +
",HMaterIDC='" + omodel.HMaterIDC + "'" +
",HMaterIDD='" + omodel.HMaterIDD + "'" +
+ ",HPicNumVer='" + omodel.HPicNumVer + "'" +
+ ",HPicNumAssemble='" + omodel.HPicNumAssemble + "'" +
+ ",HMaterTexture='" + omodel.HMaterTexture + "'" +
+ ",HProductNum='" + omodel.HProductNum + "'" +
+ ",HVerNum='" + omodel.HVerNum + "'" +
//鍔犲叆鐢熶骇绫诲瀷
- ",HWorkTypeNum='" + omodel.HWorkTypeNum +
- "' where HInterID=" + lngBillKey.ToString());
+ ",HWorkTypeNum='" + omodel.HWorkTypeNum + "'" +
+ " where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
@@ -126,18 +131,28 @@
oCn.RunProc("Insert into Sc_ProcessExchangeBillSub " +
" (HInterID,HEntryID,HBillNo_bak," +
"HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
- "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HRelationQty_In,HRelationQty_Out,HRelationQty_WWOrder,HRelationQty_Bad," +
- "HProcNo,HProcID,HProcNumber,HWorkRemark,HCenterID,HDeptID" +
- ",HDeptNumber,HGroupID,HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
- ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate,HPlanEndDate,HRelBeginDate" +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType," +
+ "HRelationQty,HRelationMoney,HRelationQty_In," +
+ "HRelationQty_Out,HRelationQty_WWOrder,HRelationQty_Bad," +
+ "HProcNo,HProcID,HProcNumber,HWorkRemark," +
+ "HCenterID,HDeptID" +
+ ",HDeptNumber,HGroupID," +
+ "HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
+ ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate," +
+ "HPlanEndDate,HRelBeginDate" +
",HRelEndDate,HReadyTime,HQueueTime,HMoveTime,HBeginDayQty,HBeginFixQty" +
- ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HMyWorkDays,HOutPrice,HOutMoney,HPassRate" +
- ",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
+ ",HFixWorkDays,HTrunWorkDays,HReadyTimes," +
+ "HMyWorkDays,HOutPrice,HOutMoney,HPassRate" +
+ ",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID," +
+ "HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
",HSupID,HSupFlag,HOverRate,HMaxQty,HTechnologyParameter,HProcCheckNote,HPicNum" +
+ ",HMouldNo,HProcWorkNum" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + omodel.HBillNo + "'" +
",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HRelationQty_In.ToString() + "," + oSub.HRelationQty_Out.ToString() + "," + oSub.HRelationQty_WWOrder.ToString() + "," + oSub.HRelationQty_Bad.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "',"
+ + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HRelationQty_In.ToString() + ","
+ + oSub.HRelationQty_Out.ToString() + "," + oSub.HRelationQty_WWOrder.ToString() + "," + oSub.HRelationQty_Bad.ToString() +
"," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNumber + "','" + oSub.HWorkRemark + "'" +
"," + oSub.HCenterID.ToString() + "," + oSub.HDeptID.ToString() + ",'" + oSub.HDeptNumber + "'," + oSub.HGroupID.ToString() +
",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HSourceID.ToString() +
@@ -149,6 +164,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() + "'" +
") ");
}
//
@@ -270,7 +286,8 @@
",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" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum" +
") " +
" 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 +298,8 @@
",'" + 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 +
+ ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
@@ -297,6 +315,7 @@
",HFixWorkDays,HTrunWorkDays,HReadyTimes,HMyWorkDays,HOutPrice,HOutMoney,HPassRate" +
",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
",HSupID,HSupFlag,HOverRate,HMaxQty,HTechnologyParameter,HProcCheckNote,HPicNum" +
+ ",HMouldNo,HProcWorkNum" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + omodel.HBillNo + "'" +
",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
@@ -312,6 +331,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() + "'" +
") ");
//鏇存柊鎵�閫夋祦杞崱鏁伴噺
if (!oSub.HBackProc)
@@ -407,6 +427,7 @@
omodel.HWWOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWWOrderEntryID"]);
omodel.HWWOrderBillNo = Ds.Tables[0].Rows[0]["HWWOrderBillNo"].ToString().Trim();
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
omodel.HICMOBillNo = Ds.Tables[0].Rows[0]["HICMOBillNo"].ToString().Trim();
omodel.HBatchNo = Ds.Tables[0].Rows[0]["HBatchNo"].ToString().Trim();
omodel.HMaterID2 = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID2"]);
@@ -432,6 +453,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 +536,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);
}
@@ -598,6 +627,7 @@
omodel.HWWOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWWOrderEntryID"]);
omodel.HWWOrderBillNo = Ds.Tables[0].Rows[0]["HWWOrderBillNo"].ToString().Trim();
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
omodel.HICMOBillNo = Ds.Tables[0].Rows[0]["HICMOBillNo"].ToString().Trim();
omodel.HBatchNo = Ds.Tables[0].Rows[0]["HBatchNo"].ToString().Trim();
omodel.HMaterID2 = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID2"]);
@@ -630,7 +660,31 @@
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"]);
+ omodel.HProductNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProductNum"]);
//寰幆
DataSet DsSub;
if (bBack)
@@ -722,6 +776,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 = "鏄剧ず鍗曟嵁鎴愬姛锛�";
@@ -779,6 +835,7 @@
omodel.HWWOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWWOrderEntryID"]);
omodel.HWWOrderBillNo = Ds.Tables[0].Rows[0]["HWWOrderBillNo"].ToString().Trim();
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
omodel.HICMOBillNo = Ds.Tables[0].Rows[0]["HICMOBillNo"].ToString().Trim();
omodel.HBatchNo = Ds.Tables[0].Rows[0]["HBatchNo"].ToString().Trim();
omodel.HMaterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID"]);
--
Gitblit v1.9.1