From 1acd793656c629f5b90190dc656cd1b269fa36b6 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 17 三月 2026 11:43:17 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 45df6de..f7a4d60 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1861,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()); //
@@ -1915,13 +1915,13 @@
K3CloudApiClient client = new K3CloudApiClient("http://47.96.97.237/k3cloud");
// K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/");
- if (oSystemParameter.ShowBill(ref sErr))
- {
- if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
- {
- result0 = InvokeHelper.Save("QM_InspectBill", JsonConvert.SerializeObject(json));//淇濆瓨
- }
- }
+ //if (oSystemParameter.ShowBill(ref sErr))
+ //{
+ // if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
+ // {
+ // result0 = InvokeHelper.Save("QM_InspectBill", JsonConvert.SerializeObject(json));//淇濆瓨
+ // }
+ //}
result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦
result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//瀹℃牳
if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
--
Gitblit v1.9.1