From a24146dbb442e09daca1d0a901c55632a176ec6d Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 30 五月 2022 13:36:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 122 +++++++++++-----------------------------
1 files changed, 35 insertions(+), 87 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 d627869..847bfa4 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"
@@ -58,8 +58,7 @@
{
//
oCn.BeginTran();
- //鏇存柊涓昏〃
- oCn.RunProc("UpDate Sc_ProcessExchangeBillMain set " +
+ string sql = string.Format(@"UpDate Sc_ProcessExchangeBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + omodel.HDate + "'" +
",HYear='" + omodel.HYear.ToString() + "'" +
@@ -121,6 +120,8 @@
//鍔犲叆鐢熶骇绫诲瀷
",HWorkTypeNum='" + omodel.HWorkTypeNum + "'" +
" where HInterID=" + lngBillKey.ToString());
+ //鏇存柊涓昏〃
+ oCn.RunProc(sql);
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
@@ -129,7 +130,8 @@
omodel.HInterID = lngBillKey;
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
{
- oCn.RunProc("Insert into Sc_ProcessExchangeBillSub " +
+
+ string sql1 = string.Format(@"Insert into Sc_ProcessExchangeBillSub " +
" (HInterID,HEntryID,HBillNo_bak," +
"HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
"HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType," +
@@ -147,26 +149,27 @@
",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID," +
"HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
",HSupID,HSupFlag,HOverRate,HMaxQty,HTechnologyParameter,HProcCheckNote,HPicNum" +
- ",HMouldNo,HProcWorkNum" +
+ ",HMouldNo,HProcWorkNum,HSeOrderInterID,HSeOrderEntryID" +
") 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.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() +
- ",'" + oSub.HQty + "','" + oSub.HTimeUnit + "','" + oSub.HPlanWorkTimes + "','" + oSub.HPlanBeginDate.ToShortDateString() + "'" +
- ",'" + oSub.HPlanEndDate.ToShortDateString() + "','" + oSub.HRelBeginDate.ToShortDateString() + "','" + oSub.HRelEndDate.ToShortDateString() + "'" +
+ ",'" + oSub.HQty + "','" + oSub.HTimeUnit + "','" + oSub.HPlanWorkTimes + "','" + omodel.HPlanBeginDate.ToShortDateString() + "'" +
+ ",'" + omodel.HPlanEndDate.ToShortDateString() + "',getdate(),getdate()" +
"," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() + "," + oSub.HBeginDayQty.ToString() +
"," + oSub.HBeginFixQty.ToString() + "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() +
"," + oSub.HMyWorkDays.ToString() + "," + oSub.HOutPrice.ToString() + "," + oSub.HOutMoney.ToString() + "," + oSub.HPassRate.ToString() + ",'" + oSub.HLastProc + "'" +
",'" + 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() + "'" +
+ ",'" + oSub.HMouldNo?.ToString() + "','" + oSub.HProcWorkNum?.ToString() + "','"+ omodel.HSeOrderInterID.ToString() + "','"+ omodel.HSeOrderEntryID.ToString() + "'"+
") ");
+ oCn.RunProc(sql1);
}
//
oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetRemark " + omodel.HInterID.ToString()); //璁剧疆 澶囨敞 涓� 宸ヨ壓娴�
@@ -305,100 +308,45 @@
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
{
-
- string HInterID = omodel.HInterID.ToString();
- string HEntryID = oSub.HEntryID.ToString();
- string HBillNo = omodel.HBillNo;
- string HCloseMan = oSub.HCloseMan;
- string HEntryCloseDate = oSub.HEntryCloseDate.ToString();
- string HCloseType = Convert.ToString(oSub.HCloseType ? 1 : 0);
- string HRemark = oSub.HRemark;
- string HSourceInterID = oSub.HSourceInterID.ToString();
- string HSourceEntryID = oSub.HSourceEntryID.ToString();
- string HSourceBillNo = oSub.HSourceBillNo;
- string HSourceBillType = oSub.HSourceBillType;
- string HRelationQty = oSub.HRelationQty.ToString();
- string HRelationMoney = oSub.HRelationMoney.ToString();
- string HProcNo = oSub.HProcNo.ToString();
- string HProcID = oSub.HProcID.ToString();
- string HProcNumber = oSub.HProcNumber;
- string HWorkRemark = oSub.HWorkRemark;
- string HCenterID = oSub.HCenterID.ToString();
- string HDeptID = oSub.HDeptID.ToString();
- string HDeptNumber = oSub.HDeptNumber;
- string HGroupID = oSub.HGroupID.ToString();
- string HGroupNumber = oSub.HGroupNumber;
- string HWorkerID = oSub.HWorkerID.ToString();
- string HWorkerNumber = oSub.HWorkerNumber;
- string HSourceID = oSub.HSourceID.ToString();
- string HQty = oSub.HQty.ToString();
- string HTimeUnit = oSub.HTimeUnit;
- string HPlanWorkTimes = oSub.HPlanWorkTimes.ToString();
- string HPlanBeginDate = oSub.HPlanBeginDate.ToShortDateString();
- string HPlanEndDate = oSub.HPlanEndDate.ToShortDateString();
- string HRelBeginDate = oSub.HRelBeginDate.ToShortDateString();
- string HRelEndDate = oSub.HRelEndDate.ToShortDateString();
- string HReadyTime = oSub.HReadyTime.ToString();
- string HQueueTime = oSub.HQueueTime.ToString();
- string HMoveTime = oSub.HMoveTime.ToString();
- string HBeginDayQty = oSub.HBeginDayQty.ToString();
- string HBeginFixQty = oSub.HBeginFixQty.ToString();
- string HFixWorkDays = oSub.HFixWorkDays.ToString();
- string HTrunWorkDays = oSub.HTrunWorkDays.ToString();
- string HReadyTimes = oSub.HReadyTimes.ToString();
- string HMyWorkDays = oSub.HMyWorkDays.ToString();
- string HOutPrice = oSub.HOutPrice.ToString();
- string HOutMoney = oSub.HOutMoney.ToString();
- string HPassRate = oSub.HPassRate.ToString();
- string HLastProc = oSub.HLastProc;
- string HKeyProc = oSub.HKeyProc;
- string HFstProc = oSub.HFstProc;
- string HICMOInterID = oSub.HICMOInterID.ToString();
- string HICMOBillNo = oSub.HICMOBillNo;
- string HWWOrderInterID = oSub.HWWOrderInterID.ToString();
- string HWWOrderEntryID = oSub.HWWOrderEntryID.ToString();
- string HWWOrderBillNo = oSub.HWWOrderBillNo;
- string HReportQty = oSub.HReportQty.ToString();
- string HBackProc = Convert.ToString(oSub.HBackProc ? 1 : 0);
- string HSupID = oSub.HSupID.ToString();
- string HSupFlag = Convert.ToString(oSub.HSupFlag ? 1 : 0);
- string HOverRate = oSub.HOverRate.ToString();
- string HMaxQty = oSub.HMaxQty.ToString();
- string HTechnologyParameter = oSub.HTechnologyParameter;
- string HProcCheckNote = oSub.HProcCheckNote;
- string HPicNum = oSub.HPicNum;
- string HMouldNo = oSub.HMouldNo.ToString();
- string HProcWorkNum = oSub.HProcWorkNum.ToString();
-
- oCn.RunProc("Insert into Sc_ProcessExchangeBillSub " +
+ string sql1 = string.Format(@"Insert into Sc_ProcessExchangeBillSub " +
" (HInterID,HEntryID,HBillNo_bak," +
"HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
- "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
- "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" +
+ ",HMouldNo,HProcWorkNum,HSeOrderInterID,HSeOrderEntryID" +
") 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.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() +
- ",'" + oSub.HQty + "','" + oSub.HTimeUnit + "','" + oSub.HPlanWorkTimes + "','" + oSub.HPlanBeginDate.ToShortDateString() + "'" +
- ",'" + oSub.HPlanEndDate.ToShortDateString() + "','" + oSub.HRelBeginDate.ToShortDateString() + "','" + oSub.HRelEndDate.ToShortDateString() + "'" +
+ ",'" + oSub.HQty + "','" + oSub.HTimeUnit + "','" + oSub.HPlanWorkTimes + "','" + omodel.HPlanBeginDate.ToShortDateString() + "'" +
+ ",'" + omodel.HPlanEndDate.ToShortDateString() + "',getdate(),getdate()" +
"," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() + "," + oSub.HBeginDayQty.ToString() +
"," + oSub.HBeginFixQty.ToString() + "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() +
"," + oSub.HMyWorkDays.ToString() + "," + oSub.HOutPrice.ToString() + "," + oSub.HOutMoney.ToString() + "," + oSub.HPassRate.ToString() + ",'" + oSub.HLastProc + "'" +
",'" + 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() + "'" +
+ "," + 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() + "'" +
") ");
+ oCn.RunProc(sql1);
//鏇存柊鎵�閫夋祦杞崱鏁伴噺
if (!oSub.HBackProc)
{
--
Gitblit v1.9.1