From af6431130aa4aa4ea8026d5c8485c4da1bae355b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 29 十一月 2024 09:29:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 4d9070e..f655bd7 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -379,14 +379,16 @@
}
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+ {
+ //鏄惁鍕鹃�夐粯璁ゅ伐鑹鸿矾绾�
+ if (HStandard)
+ {
+ //璁剧疆榛樿宸ヨ壓璺嚎
+ oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'");
+ }
+ }
- //鏄惁鍕鹃�夐粯璁ゅ伐鑹鸿矾绾�
- //if (HStandard)
- //{
- // //璁剧疆榛樿宸ヨ壓璺嚎
- // oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'");
- //}
-
//鍒ゆ柇鏄惁閲嶅宸ュ簭鍙�
ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl");
@@ -2429,10 +2431,9 @@
}
catch (Exception e)
{
- oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳宸ヨ壓璺嚎澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "椹冲洖宸ヨ壓璺嚎澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1