From ce58bfdb73054fa181e0731d60f4c2e74798cabb Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 13 十月 2025 09:23:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/DLL/ClsKf_MateOutBill.cs |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WebAPI/DLL/ClsKf_MateOutBill.cs b/WebAPI/DLL/ClsKf_MateOutBill.cs
index 028311c..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();
                 }
@@ -254,7 +255,7 @@
                     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 +
                         "','" + omodel.HBillSubType +
@@ -300,7 +301,8 @@
                         "," + omodel.HMaterEmpID +
                         "," + omodel.HMachineSpeed +
                         "," + omodel.HWaterRush +
-                        "," + omodel.HWaterQty +
+                        ",'" + omodel.HHuaGun +
+                        "'," + omodel.HWaterQty +
                         "," + omodel.HWaterRate +
                         ")";
                 }

--
Gitblit v1.9.1