From 175b53e6f0adb40a0d861981f56f120615d55897 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 13 十一月 2024 14:52:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 4d9070e..4855e30 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");
 

--
Gitblit v1.9.1