From 1c6d93e7299e068b85e1c945ed9b14d0f9795b40 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 13 十月 2025 09:21:24 +0800
Subject: [PATCH] 智云MES测试记录20250923

---
 WebAPI/DLL/ClsKf_MateOutBill.cs |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WebAPI/DLL/ClsKf_MateOutBill.cs b/WebAPI/DLL/ClsKf_MateOutBill.cs
index 4a1f4a4..028311c 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" +
@@ -218,7 +218,7 @@
             try
             {
                 //寰楀埌mainid
-                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+                //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                 //omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
                 //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
                 if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
@@ -238,7 +238,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,7 +249,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" +
@@ -257,7 +257,7 @@
                         ",HMachineSpeed,HWaterRush,HWaterQty,HWaterRate) " +
                         " values(" +
                         "'" + this.BillType +
-                        "','" + this.HBillSubType +
+                        "','" + omodel.HBillSubType +
                         "'," + omodel.HInterID.ToString() +
                         ",'" + omodel.HBillNo +
                         "','" + omodel.HDate +
@@ -266,7 +266,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 +326,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 +451,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 +523,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