From 1f08ee8a30b5b1db536150fb5f9ccb815e64719e Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 11 十二月 2025 16:48:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsKf_MateOutBill.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/WebAPI/DLL/ClsKf_MateOutBill.cs b/WebAPI/DLL/ClsKf_MateOutBill.cs
index 9b07b66..7f65745 100644
--- a/WebAPI/DLL/ClsKf_MateOutBill.cs
+++ b/WebAPI/DLL/ClsKf_MateOutBill.cs
@@ -110,7 +110,8 @@
",HMaterEmpID=" + omodel.HMaterEmpID +
",HMachineSpeed=" + omodel.HMachineSpeed +
",HWaterRush=" + omodel.HWaterRush +
- ",HWaterQty=" + omodel.HWaterQty +
+ ",HHuaGun='" + omodel.HHuaGun +
+ "',HWaterQty=" + omodel.HWaterQty +
",HWaterRate=" + omodel.HWaterRate +
" where HInterID=" + lngBillKey.ToString();
}
@@ -236,13 +237,12 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag, HMainSourceBillType" +
+ ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ " values('" + this.BillType + "','" + omodel.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
- ",'" + omodel.HMainSourceBillType.ToString() + "'" +
") ";
@@ -255,10 +255,10 @@
mainSql = "Insert Into Kf_ICStockBillMain" +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HMaker,HMakeDate,HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HMaterID,HMaterName,HVerNo,HModel,HModel2,HPieceQty,HCusID,HWeight,HLong,HSingleWeight,HMaterSumWeight,HMaterEmpID" +
- ",HMachineSpeed,HWaterRush,HWaterQty,HWaterRate) " +
+ ",HMachineSpeed,HWaterRush,HHuaGun,HWaterQty,HWaterRate) " +
" values(" +
"'" + this.BillType +
- "','" + this.HBillSubType +
+ "','" + omodel.HBillSubType +
"'," + omodel.HInterID.ToString() +
",'" + omodel.HBillNo +
"','" + omodel.HDate +
@@ -301,7 +301,8 @@
"," + omodel.HMaterEmpID +
"," + omodel.HMachineSpeed +
"," + omodel.HWaterRush +
- "," + omodel.HWaterQty +
+ ",'" + omodel.HHuaGun +
+ "'," + omodel.HWaterQty +
"," + omodel.HWaterRate +
")";
}
--
Gitblit v1.9.1