From 8ea3f1a01da09f503ce6333a95d7ade3de1926b7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 10 一月 2024 10:26:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/计划管理/ClsGy_RoutingBill.cs | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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 112b96d..79a54e7 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"
@@ -38,7 +38,7 @@
oCn.BeginTran();
//鏇存柊涓昏〃
oCn.RunProc("UpDate Gy_RoutingBillMain set " +
- " HPRDORGID=" + omodel.HPRDORGID.ToString() +
+ " HPRDORGID=" + omodel.HORGID.ToString() +
",HName='" + omodel.HName + "'" +
",HBillNo='" + omodel.HBillNo + "'" +
",HMaterTypeID=" + omodel.HMaterTypeID.ToString() +
@@ -51,25 +51,26 @@
",HDate='" + omodel.HDate + "'" +
",HYear=" + omodel.HYear.ToString() + "" +
",HPeriod=" + omodel.HPeriod.ToString() + "" +
- ",HUpDater='" + omodel.HUpDater + "'" +
- ",HUpDateDate='" + omodel.HUpDateDate + "'" +
",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
",HMainGroupID=" + omodel.HMainGroupID.ToString() +
",HMainProcID=" + omodel.HMainProcID.ToString() +
",HMainCenterID=" + omodel.HMainCenterID.ToString() +
- ",HMainTimeUnit='" + omodel.HMainTimeUnit.ToString() + "'" +
+ ",HMainTimeUnit='" + omodel.HMainTimeUnit + "'" +
",HMainUnitTime=" + omodel.HMainUnitTime.ToString() +
",HMainWorkQty=" + omodel.HMainWorkQty.ToString() +
",HMainPrice=" + omodel.HMainPrice.ToString() +
",HStdSourceQty=" + omodel.HStdSourceQty.ToString() +
",HAddSourceRate=" + omodel.HAddSourceRate.ToString() +
",HDelSourceRate=" + omodel.HDelSourceRate.ToString() +
- ",HPicNumVer='" + omodel.HPicNumVer.ToString() + "'" +
- ",HPicNumAssemble='" + omodel.HPicNumAssemble.ToString() + "'" +
- ",HMaterTexture='" + omodel.HMaterTexture.ToString() + "'" +
- ",HProductNum='" + omodel.HProductNum.ToString() + "'" +
- ",HVerNum='" + omodel.HVerNum.ToString() + "'" +
+ ",HPicNumVer='" + omodel.HPicNumVer + "'" +
+ ",HPicNumAssemble='" + omodel.HPicNumAssemble + "'" +
+ ",HMaterTexture='" + omodel.HMaterTexture + "'" +
+ ",HProductNum='" + omodel.HProductNum + "'" +
+ ",HVerNum='" + omodel.HVerNum + "'" +
+ ",HORGID=" + omodel.HORGID.ToString() +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
@@ -91,7 +92,7 @@
",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
",HTechnologyParameter,HPicNum,HProcCheckNote" +
- ",HOverRate" +
+ ",HOverRate,HWorkTimes_S,HSNCtrl" +
") 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() +
@@ -103,7 +104,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.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSNCtrl ? 1 : 0) +
") ");
}
//
@@ -202,14 +203,14 @@
",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
- ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HPRDORGID,HVerNum" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HPRDORGID,HORGID,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() + "','" + DBUtility.ClsPub.HOrgID + "','" + omodel.HVerNum.ToString() + "'" +
+ ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "'," + omodel.HORGID.ToString() + "," + omodel.HORGID.ToString() + ",'" + omodel.HVerNum + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsGy_RoutingBillSub oSub in DetailColl)
@@ -225,7 +226,7 @@
",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
",HTechnologyParameter,HPicNum,HProcCheckNote" +
- ",HOverRate,HProcWorkNum" +
+ ",HOverRate,HProcWorkNum,HWorkTimes_S,HSNCtrl" +
") 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() +
@@ -237,7 +238,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.HProcWorkNum.ToString() + "'" +
+ "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSNCtrl ? 1 : 0) +
") ");
}
//
@@ -333,7 +334,8 @@
omodel.HMaterTexture = Ds.Tables[0].Rows[0]["HMaterTexture"].ToString().Trim();
omodel.HProductNum = Ds.Tables[0].Rows[0]["HProductNum"].ToString().Trim();
omodel.HVerNum = Ds.Tables[0].Rows[0]["HVerNum"].ToString().Trim();
- omodel.HPRDORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"].ToString());
+ omodel.HPRDORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPRDORGID"].ToString());
+ omodel.HORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HORGID"].ToString());
//寰幆
DataSet DsSub ;
DsSub = oCn.RunProcReturn("Select * from Gy_RoutingBillSub Where HInterID=" + lngBillKey.ToString() + " Order by HEntryID ", "Gy_RoutingBillSub");
@@ -403,6 +405,8 @@
oSub.HPicNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPicNum"]);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcCheckNote"]);
oSub.HOverRate = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HOverRate"]);
+ oSub.HWorkTimes_S = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HWorkTimes_S"]);
+ oSub.HSNCtrl = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HSNCtrl"]);
DetailColl.Add(oSub);
}
sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
--
Gitblit v1.9.1