From 6775b696de3ecbdea4201c6dd57103e165ccb7f8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 08 九月 2023 13:56:44 +0800
Subject: [PATCH] 染厂报表 提料计划信息导入完善

---
 WebAPI/Controllers/Sc_ProcessMangementController.cs |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 6f57fad..947f268 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -405,6 +405,10 @@
         {
             try
             {
+                string sErr = "";
+                oSystemParameter.ShowBill(ref sErr);
+
+
                 //鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿
                 Int64 HInterID = DBUtility.ClsPub.CreateBillID("3711", ref DBUtility.ClsPub.sExeReturnInfo);
                 string HBillNo = DBUtility.ClsPub.CreateBillCode("3711", ref DBUtility.ClsPub.sExeReturnInfo, true);
@@ -521,7 +525,10 @@
                     FentityModel.Add("FCostRate", dr1["FCostRate"].ToString());// 鎴愭湰鏉冮噸
                     FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// 鍊掑啿棰嗘枡
                     FentityModel.Add("FMOMAINENTRYID", dr1["FMOENTRYID"].ToString());//
-                    //FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //鍖呰鏍囪瘑
+                    if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
+                    {
+                        FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() });//鍖呰鏍囪瘑
+                    }
                     FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //鎵瑰彿
                     FentityModel.Add("F_bsv_Text", dr1["宸ュ簭娴佽浆鍗″彿"].ToString()); //娴佽浆鍗″彿
                     JArray Fentity2 = new JArray();
@@ -1075,7 +1082,7 @@
                     FentityModel.Add("FSrcInterId", item["HSourceInterID"].ToString());//  
                     FentityModel.Add("FBasePrdRealQty", item["鏁伴噺"].ToString());//
                     FentityModel.Add("FIsFinished", "false");//
-                    FentityModel.Add("FStockStatusId", new JObject() { ["FNumber"] = "KCZT08_SYS" }); //
+                    FentityModel.Add("FStockStatusId", new JObject() { ["FNumber"] = "KCZT001" }); //
                     FentityModel.Add("FSrcEntrySeq", item["HSourceSeQ"].ToString());//  婧愬崟鍒嗗綍琛屽彿
                     FentityModel.Add("FMOMAINENTRYID", item["HMOEntryID"].ToString());//
                     FentityModel.Add("FKeeperTypeId", "BD_KeeperOrg");
@@ -1215,7 +1222,7 @@
             Int64 HSourceEntryID, string HSourceBillNo, string user,
             Int64 HWHID, Int64 HSPID, Int64 HSupID, Int64 HKeeperID,
             Int64 HMaterID, string HSourceBillType, Int64 HSLInterID,
-            Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ, string HBillNo, Int64 HInterID)
+            Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ, string HBillNo, Int64 HInterID, string HBatchNo)
         {
             try
             {
@@ -1310,6 +1317,7 @@
                 FentityModel.Add("FBaseAcceptQty", HRightQty.ToString());//鍩烘湰鍗曚綅鎺ユ敹鏁�
                 FentityModel.Add("FCurrency", new JObject() { ["Fnumber"] = "PRE001" });//甯佸埆
                 FentityModel.Add("FIsSplitRow ", false);// 鏄惁鎷嗗垎琛�
+                FentityModel.Add("FLot", new JObject() { ["Fnumber"] = HBatchNo.ToString() });//鎵瑰彿
 
                 JArray Fentity2 = new JArray();
                 JObject FentityModel2 = new JObject();

--
Gitblit v1.9.1