From 0028f14fae13c2094247ce5742759e654b607122 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 29 十月 2021 08:22:41 +0800
Subject: [PATCH] 1
---
DAL/计划管理/ClsGy_RoutingBill.cs | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 5 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..112b96d 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,8 @@
oCn.BeginTran();
//鏇存柊涓昏〃
oCn.RunProc("UpDate Gy_RoutingBillMain set " +
- " HName='" + omodel.HName + "'" +
+ " HPRDORGID=" + omodel.HPRDORGID.ToString() +
+ ",HName='" + omodel.HName + "'" +
",HBillNo='" + omodel.HBillNo + "'" +
",HMaterTypeID=" + omodel.HMaterTypeID.ToString() +
",HMaterID=" + omodel.HMaterID.ToString() +
@@ -64,6 +65,11 @@
",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() + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
@@ -137,23 +143,73 @@
{
try
{
+ string orgid = DBUtility.ClsPub.HOrgID.ToString();
//寰楀埌mainid
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" +
+ //",HYear,HPeriod,HRemark,HMaker,Hmakedate,HMaterID,HName,HMaterTypeID" +
+ //",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
+ //",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
+ //",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
+ //",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HPRDORGID,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.HPRDORGID.ToString()+"','" + omodel.HVerNum.ToString() + "'"+
+ //") ");
+
oCn.RunProc("Insert Into Gy_RoutingBillMain " +
"(HBillType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,Hmakedate,HMaterID,HName,HMaterTypeID" +
",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HPRDORGID,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() + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsGy_RoutingBillSub oSub in DetailColl)
@@ -169,7 +225,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 +237,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() + "'" +
") ");
}
//
@@ -223,7 +279,7 @@
{
//鏌ヨ涓昏〃
DataSet Ds ;
- Ds = oCn.RunProcReturn("Select * from Gy_RoutingBillMain Where HInterID=" + lngBillKey.ToString(), "Gy_RoutingBillMain");
+ Ds = oCn.RunProcReturn("Select * from Gy_RoutingBillMain Where HInterID=" + lngBillKey.ToString()+" and HPRDORGID='"+DBUtility.ClsPub.HOrgID.ToString()+"'", "Gy_RoutingBillMain");
if(Ds.Tables[0].Rows.Count==0)
{
sReturn = "鍗曟嵁鏈壘鍒帮紒";
@@ -272,7 +328,12 @@
omodel.HStdSourceQty = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HStdSourceQty"].ToString());
omodel.HAddSourceRate = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HAddSourceRate"].ToString());
omodel.HDelSourceRate = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HDelSourceRate"].ToString());
-
+ omodel.HPicNumVer = Ds.Tables[0].Rows[0]["HPicNumVer"].ToString().Trim();
+ omodel.HPicNumAssemble = Ds.Tables[0].Rows[0]["HPicNumAssemble"].ToString().Trim();
+ 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());
//寰幆
DataSet DsSub ;
DsSub = oCn.RunProcReturn("Select * from Gy_RoutingBillSub Where HInterID=" + lngBillKey.ToString() + " Order by HEntryID ", "Gy_RoutingBillSub");
--
Gitblit v1.9.1