From c0111407b29aed0229f0a5a695a9ebb2896c9e65 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 24 十月 2025 13:38:18 +0800
Subject: [PATCH] 1
---
WebAPI/DLL/ClsKf_MateOutBill.cs | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/WebAPI/DLL/ClsKf_MateOutBill.cs b/WebAPI/DLL/ClsKf_MateOutBill.cs
index abd3a03..7f65745 100644
--- a/WebAPI/DLL/ClsKf_MateOutBill.cs
+++ b/WebAPI/DLL/ClsKf_MateOutBill.cs
@@ -67,7 +67,7 @@
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
string sErrMsg = "";
oSystemParameter.ShowBill(ref sErrMsg);
- if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴") //涔斾竴瀹㈡埛
+ if (true ) //涔斾竴瀹㈡埛
{
mainSql = "UpDate Kf_ICStockBillMain set " +
" HBillNo='" + omodel.HBillNo +
@@ -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();
}
@@ -144,7 +145,7 @@
"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
") ";
- if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴") //涔斾竴瀹㈡埛
+ if (true) //涔斾竴瀹㈡埛
{
subSql = "Insert into Kf_ICStockBillSub" +
"(HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
@@ -238,7 +239,7 @@
",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",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) +
@@ -249,15 +250,15 @@
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
string sErrMsg = "";
oSystemParameter.ShowBill(ref sErrMsg);
- if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴") //涔斾竴瀹㈡埛
+ if (true) //涔斾竴瀹㈡埛
{
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 +
@@ -266,7 +267,7 @@
",'" + omodel.HRemark +
"'," + omodel.HProcExchInterID +
",'" + omodel.HProcExchBillNo +
- "','" + "3772" +
+ "','" + (string.IsNullOrEmpty(omodel.HMainSourceBillType) == true ? "3772" : omodel.HMainSourceBillType) +
"','" + DBUtility.ClsPub.CurUserName +
"',getdate()" +
"," + omodel.HSupID.ToString() +
@@ -300,7 +301,8 @@
"," + omodel.HMaterEmpID +
"," + omodel.HMachineSpeed +
"," + omodel.HWaterRush +
- "," + omodel.HWaterQty +
+ ",'" + omodel.HHuaGun +
+ "'," + omodel.HWaterQty +
"," + omodel.HWaterRate +
")";
}
@@ -326,7 +328,7 @@
"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
") ";
- if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴") //涔斾竴瀹㈡埛
+ if (true) //涔斾竴瀹㈡埛
{
subSql = "Insert into Kf_ICStockBillSub" +
"(HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
@@ -451,7 +453,7 @@
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
string sErrMsg = "";
oSystemParameter.ShowBill(ref sErrMsg);
- if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴") //涔斾竴瀹㈡埛
+ if (true) //涔斾竴瀹㈡埛
{
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
@@ -523,7 +525,7 @@
oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
- if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴") //涔斾竴瀹㈡埛
+ if (true) //涔斾竴瀹㈡埛
{
oSub.HRate = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[0]["HRate"]);
}
--
Gitblit v1.9.1