From e4eb9faebca09bb48a66d47764a27e8282c2872c Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期四, 29 一月 2026 16:10:56 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 24ff319..1a95bd3 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1707,9 +1707,8 @@
objJsonResult.data = null;
return objJsonResult;
}
-
if (oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
- {
+ {
string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
join JL20250716203240..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
join JL20250716203240..T_BD_STAFFTEMP c on c.FID = a.FID
@@ -1717,7 +1716,7 @@
where e.HItemID ='" + HKeeperID + "' ";
//鏌ヨ璐ㄦ鍛樺搴旇川妫�閮ㄩ棬
ds = oCN.RunProcReturn(sql, "T_HR_EMPINFO");
- LogService.Write("sql" + sql);
+ // LogService.Write("sql" + sql);
if (ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -1737,7 +1736,6 @@
model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //璐ㄦ缁勭粐
model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //鏉ユ簮缁勭粐
//model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //璐ㄦ閮ㄩ棬
-
if (oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
{
model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //璐ㄦ鍛�
@@ -1782,7 +1780,21 @@
FentityModel2.Add("FBasePolicyQty", HRightQty.ToString() == "0" ? HBadQty.ToString() : HRightQty.ToString()); //鍩烘湰鍗曚綅鏁伴噺
FentityModel2.Add("FUsePolicy", HUseResult.ToString()); //浣跨敤鍐崇瓥
FentityModel2.Add("FIsCheck", false); //鏄惁鎶芥
- FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊
+ // 閿﹂殕鍚敤涓嶈壇澶勭悊
+ if (string.Equals(oSystemParameter.omodel.WMS_CampanyName, "閿﹂殕"))
+ {
+ // 鍒ゆ柇鍗曟嵁鏄惁鍚堟牸
+ if (HCheckResult.ToString() == "2")
+ {
+ FentityModel2.Add("FIsDefectProcess", true); //涓嶈壇澶勭悊
+ }else
+ {
+ FentityModel2.Add("FIsDefectProcess", false);
+ }
+ }else
+ {
+ FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊
+ }
FentityModel2.Add("FCanSale", false); //鍙攢鍞�
FentityModel2.Add("FIsMRBReview", false); //MRP璇勫
FentityModel2.Add("FIsReturn", true); //鍒ら��
@@ -1861,13 +1873,13 @@
Ids = fID,
};
+
K3CloudApiClient client = new K3CloudApiClient("http://47.96.97.237/k3cloud");
// K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/");
-
result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦
- // result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//瀹℃牳
+ result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//瀹℃牳
if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
oCN.RollBack();
@@ -1896,14 +1908,14 @@
//鏂囦欢IO娴�
string a = Convert.ToBase64String(buffer);
- //if(oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
- //{
+ if(oSystemParameter.omodel.WMS_CampanyName == "閿﹂殕")
+ {
ds = oCN.RunProcReturn("select * from JL20250716203240..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
- //}
- //else
- //{
- // ds = oCN.RunProcReturn("select * from AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
- //}
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select * from AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
+ }
HInterID = long.Parse(ds.Tables[0].Rows[0]["FID"].ToString());
@@ -1921,7 +1933,7 @@
string _vlog = InvokeHelper.UpLoad("QM_InspectBill", jsonStr);
LogService.Write("json:" + jsonStr);
LogService.Write("_vlog:" + _vlog);
-
+
if (JObject.Parse(_vlog)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
oCN.RollBack();
--
Gitblit v1.9.1