From d38136e8b743a3186dc873d0f18e5a58e84e86d9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 十一月 2022 08:51:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/车间管理/ClsSc_StationOutBill.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
index c38efe1..826bb5e 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
@@ -105,7 +105,10 @@
",HMouldNum='" + omodel.HMouldNum.ToString() + "'" +
",HSourceNameList='" + omodel.HSourceNameList.ToString() + "'" +
",HWasterQty=" + omodel.HWasterQty.ToString() +
+ ",HBadCount=" + omodel.HBadCount.ToString() +
",HLastSubProc=" + Convert.ToString(omodel.HLastSubProc ? 1 : 0) +
+ ",HPersonNums=" + omodel.HPersonNums.ToString() +
+ ",HMachineNums=" + omodel.HMachineNums.ToString() +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
//DeleteRelation(ref sReturn, lngBillKey);
@@ -336,6 +339,7 @@
",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID" +
+ ",HPersonNums,HMachineNums" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate(),'" + omodel.HMouldNum + "'" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HSourceName + "'," + omodel.HPieceQty.ToString() + "," + omodel.HWasterQty.ToString() + "," + omodel.HPlanPieceQty.ToString() + "," + omodel.HBadPNL.ToString() +
@@ -344,7 +348,8 @@
"," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" + "," + omodel.HSourceID2.ToString() + "," + omodel.HSourceID3.ToString() + "," + omodel.HSourceID4.ToString() + "," + omodel.HSourceID5.ToString() +
"," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() + "," + omodel.HBadCount.ToString() + "," + omodel.HCenterID.ToString() + "," + omodel.HProcNo.ToString() + ",'" + omodel.HOrderProcNO + "'" + ",'" + omodel.HSourceNameList + "'" +
"," + omodel.HMainSourceInterID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + Convert.ToString(omodel.HLastSubProc ? 1 : 0) +
- "," + omodel.HEmpID2.ToString() + "," + omodel.HEmpID3.ToString() + "," + omodel.HEmpID4.ToString() + "," + omodel.HEmpID5.ToString() + "," + omodel.HDSQty.ToString() + "," + omodel.HChongQty.ToString() + "," + omodel.HPriceRate.ToString() + "," + omodel.HWorkTimes.ToString() + "," + omodel.HQCCheckID.ToString() +
+ "," + omodel.HEmpID2.ToString() + "," + omodel.HEmpID3.ToString() + "," + omodel.HEmpID4.ToString() + "," + omodel.HEmpID5.ToString() + "," + omodel.HDSQty.ToString() + "," + omodel.HChongQty.ToString() + "," + omodel.HPriceRate.ToString() + "," + omodel.HWorkTimes.ToString() + "," + omodel.HQCCheckID.ToString() +
+ "," + omodel.HPersonNums.ToString() + "," + omodel.HMachineNums.ToString() +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_StationOutBillSub oSub in DetailColl)
@@ -545,7 +550,7 @@
// " \"FEntity_Link_FSId\":" + Pub_Class.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HICMOEntryID"]) + " " +
// " } ] } " +
// " ] }}";
- // //
+ // //6
// oWeb.WebService1 oweb = new DAL.oWeb.WebService1();
// //
// oweb.Url = Pub_Class.ClsPub.HWEBSUrl_CLD;
@@ -675,6 +680,8 @@
omodel.HMouldNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMouldNum"]);
omodel.HQCCheckID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HQCCheckID"]);
omodel.HSourceNameList = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceNameList"]);
+ omodel.HPersonNums = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPersonNums"]);
+ omodel.HMachineNums = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMachineNums"]);
//
//寰幆
DataSet DsSub ;
--
Gitblit v1.9.1