From da4b0a4e9a171b46d08beb45aa2b2ac7f7e3b12e Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期四, 05 三月 2026 10:51:10 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index a6e8588..7693aa3 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1503,7 +1503,9 @@
FentityModel.Add("FBaseUnitId", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//鍩烘湰鍗曚綅
FentityModel.Add("FBaseInspectQty", HCheckQty.ToString());//鍩烘湰鍗曚綅妫�楠屾暟閲�
FentityModel.Add("FSupplierId", new JObject() { ["Fnumber"] = HSupNumber.ToString() }); // 渚涘簲鍟�
- //FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHNumber.ToString() }); // 浠撳簱
+
+
+ // FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHID.ToString() }); // 浠撳簱
FentityModel.Add("FInspectTimes", "1"); // 妫�楠屾鏁�
FentityModel.Add("FTimeUnit", "24");//鏃堕棿鍗曚綅
FentityModel.Add("FSAMPLEDAMAGEBEARER", "2");//鏍锋湰鐮村潖鎵挎媴鏂�
@@ -1767,10 +1769,31 @@
FentityModel.Add("FQCStatus", "1");// 璐ㄦ鐘舵��
FentityModel.Add("FIsRelated", false);// 涓嶈壇鍝佸叧鑱旀爣蹇�
FentityModel.Add("FSrcBillType0", "PUR_ReceiveBill");// 婧愬崟绫诲瀷
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
+ {
+ FentityModel.Add("FSrcBillNo0", HSLBillNo.ToString()); //鏀舵枡閫氱煡鍗曞崟鍙�
+ FentityModel.Add("FSrcInterId0", HSLInterID.ToString()); //鏀舵枡閫氱煡鍗曚富ID
+ FentityModel.Add("FSrcEntryId0", HSLEntryID.ToString());
+ FentityModel.Add("FSrcEntrySeq0", HSLSeQ.ToString()); //婧愬崟琛屽彿
+
+ FentityModel.Add("F_WPVT_Text_uky", HSourceBillNo.ToString()); //閲囪喘璁㈠崟琛屽彿
+ FentityModel.Add("F_WPVT_Integer_fg2", HSeQ.ToString()); //璁㈠崟琛屽彿
+ }
+ }
FentityModel.Add("FBaseUnitId", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//鍩烘湰鍗曚綅
FentityModel.Add("FBaseInspectQty", HCheckQty.ToString());//鍩烘湰鍗曚綅妫�楠屾暟閲�
FentityModel.Add("FSupplierId", new JObject() { ["Fnumber"] = HSupNumber.ToString() }); // 渚涘簲鍟�
- //FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHNumber.ToString() }); // 浠撳簱
+
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
+ {
+ FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHID.ToString() }); // 浠撳簱
+
+ }
+ }
FentityModel.Add("FInspectTimes", "1"); // 妫�楠屾鏁�
FentityModel.Add("FTimeUnit", "24");//鏃堕棿鍗曚綅
FentityModel.Add("FSAMPLEDAMAGEBEARER", "2");//鏍锋湰鐮村潖鎵挎媴鏂�
@@ -1789,7 +1812,7 @@
FentityModel2.Add("FBasePolicyQty", HRightQty.ToString() == "0" ? HBadQty.ToString() : HRightQty.ToString()); //鍩烘湰鍗曚綅鏁伴噺
FentityModel2.Add("FUsePolicy", HUseResult.ToString()); //浣跨敤鍐崇瓥
FentityModel2.Add("FIsCheck", false); //鏄惁鎶芥
- // 閿﹂殕鍚敤涓嶈壇澶勭悊
+ // 閿﹂殕鍚敤涓嶈壇澶勭悊
if (oSystemParameter.ShowBill(ref sErr))
{
if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
@@ -1838,7 +1861,7 @@
JArray Fentity4 = new JArray();
JObject FentityModel4 = new JObject();
FentityModel4.Add("FEntity_Link_FRuleId", "QM_PURReceive2Inspect"); //鍗曟嵁杞崲瑙勫垯
- FentityModel4.Add("FEntity_Link_FSTableName", "T_PUR_RECEIVEENTRY"); //鏀舵枡閫氱煡鍗曞瓙琛�
+ FentityModel4.Add("FEntity_Link_FSTableName", "T_PUR_ReceiveEntry"); //鏀舵枡閫氱煡鍗曞瓙琛�
FentityModel4.Add("FEntity_Link_FSBillId", HSLInterID.ToString()); //鏀舵枡閫氱煡鍗曚富鍐呯爜
FentityModel4.Add("FEntity_Link_FSId", HSLEntryID.ToString()); //鏀舵枡閫氱煡鍗曞瓙鍐呯爜
FentityModel4.Add("FEntity_Link_FBaseAcceptQty", HRightQty.ToString()); //
--
Gitblit v1.9.1