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/计划管理/ClsGy_RoutingBill.cs | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
index 9c293f8..a91f6db 100644
--- "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
+++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
@@ -141,6 +141,37 @@
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCn.BeginTran();
+ //string BillType1 = this.BillType;
+ //string HInterID = omodel.HInterID.ToString();
+ //string HBillNo = omodel.HBillNo;
+ //DateTime HDate = omodel.HDate;
+ //string HYear = omodel.HYear.ToString();
+ //string HPeriod = omodel.HPeriod.ToString();
+ //string HRemark = omodel.HRemark;
+ //string CurUserName = DBUtility.ClsPub.CurUserName;
+ //string HMaterID = omodel.HMaterID.ToString();
+ //string HName = omodel.HName;
+ //string HMaterTypeID = omodel.HMaterTypeID.ToString();
+ //string HRoutingGroupID = omodel.HRoutingGroupID.ToString();
+ //string HUnitID = omodel.HUnitID.ToString();
+ //string HMaterNumber = omodel.HMaterNumber;
+ //string HUnitNumber = omodel.HUnitNumber;
+ //string HStandard = DBUtility.ClsPub.BoolToString(omodel.HStandard);
+ //string HMainGroupID = omodel.HMainGroupID.ToString();
+ //string HMainProcID = omodel.HMainProcID.ToString();
+ //string HMainCenterID = omodel.HMainCenterID.ToString();
+ //string HMainTimeUnit = omodel.HMainTimeUnit;
+ //string HMainUnitTime = omodel.HMainUnitTime.ToString();
+ //string HMainWorkQty = omodel.HMainWorkQty.ToString();
+ //string HMainPrice = omodel.HMainPrice.ToString();
+ //string HStdSourceQty = omodel.HStdSourceQty.ToString();
+ //string HAddSourceRate = omodel.HAddSourceRate.ToString();
+ //string HDelSourceRate = omodel.HDelSourceRate.ToString();
+ //string HPicNumVer = omodel.HPicNumVer.ToString();
+ //string HPicNumAssemble = omodel.HPicNumAssemble.ToString();
+ //string HMaterTexture = omodel.HMaterTexture.ToString();
+ //string HProductNum = omodel.HProductNum.ToString();
+ //string HVerNum = omodel.HVerNum.ToString();
//涓昏〃
oCn.RunProc("Insert Into Gy_RoutingBillMain " +
"(HBillType,HInterID,HBillNo,HDate" +
@@ -148,12 +179,14 @@
",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum" +
") " +
" values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + omodel.HMaterID.ToString() + ",'" + omodel.HName + "'," + omodel.HMaterTypeID.ToString() +
",'" + omodel.HRoutingGroupID.ToString() + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HMaterNumber + "','" + omodel.HUnitNumber + "'," + DBUtility.ClsPub.BoolToString(omodel.HStandard) +
"," + omodel.HMainGroupID.ToString() + "," + omodel.HMainProcID.ToString() + "," + omodel.HMainCenterID.ToString() + ",'" + omodel.HMainTimeUnit + "'," + omodel.HMainUnitTime.ToString() + "," + omodel.HMainWorkQty.ToString() +
"," + omodel.HMainPrice.ToString() + "," + omodel.HStdSourceQty.ToString() + "," + omodel.HAddSourceRate + "," + omodel.HDelSourceRate.ToString() +
+ ",'" + omodel.HPicNumVer.ToString() + "','" + omodel.HPicNumAssemble.ToString() + "','" + omodel.HMaterTexture.ToString() + "','" + omodel.HProductNum.ToString() + "','" + omodel.HVerNum.ToString() + "'"+
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsGy_RoutingBillSub oSub in DetailColl)
@@ -169,7 +202,7 @@
",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
",HTechnologyParameter,HPicNum,HProcCheckNote" +
- ",HOverRate" +
+ ",HOverRate,HProcWorkNum" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HProcNo.ToString() + "," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
"," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
@@ -181,7 +214,7 @@
"," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
",'"+ oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
- "', " + oSub.HOverRate.ToString() +
+ "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'" +
") ");
}
//
--
Gitblit v1.9.1