From e376ae7ff7dc914a91032a9e5954fca28b20287d Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 27 八月 2025 09:06:16 +0800
Subject: [PATCH] 直接调拨免扫物料条码上传方法修改，条码状态更新导入模块优化
---
WebAPI/DLL/ClsKf_MateOutBill.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/WebAPI/DLL/ClsKf_MateOutBill.cs b/WebAPI/DLL/ClsKf_MateOutBill.cs
index 521d125..9b07b66 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 +
@@ -144,7 +144,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" +
@@ -236,12 +236,13 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
+ ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag, HMainSourceBillType" +
") " +
" values('" + this.BillType + "','" + this.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() + "'" +
") ";
@@ -249,7 +250,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 = "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" +
@@ -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() +
@@ -326,7 +327,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 +452,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 +524,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