From c478bd5e4fd87b7cf2afb1a98c29b29c43db78b5 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 08 十一月 2024 13:36:48 +0800
Subject: [PATCH] 工艺路线查询全部

---
 WebAPI/Controllers/LMESController.cs |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index fb15989..dd8abdb 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1326,7 +1326,7 @@
                 {
                     string sql1 = "select * from h_v_Gy_RoutingBillList where 1 = 1 ";
                     //瀹㈡埛鑷畾涔�
-                    if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�" || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒" || oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧")
+                    if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�" || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒" )
                     {
                          sql1 = "select top 1000 * from h_v_Gy_RoutingBillList where 1 = 1 ";
                     }
@@ -3611,9 +3611,18 @@
 
                     //瀹℃牳宸ヨ壓璺嚎
                     oCN.RunProc(" Update Gy_RoutingBillMain set HChecker='" + user + "',HCheckDate=getdate(),HBillStatus=2 Where HInterID=" + HInterID.ToString());
-                   
-                    ////鍒锋柊榛樿宸ヨ壓璺嚎
-                    //oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID);
+
+                    //鑾峰彇绯荤粺鍙傛暟
+                    string Ret = "";
+                    if (oSystemParameter.ShowBill(ref Ret))
+                    {
+                        //鍒ゆ柇瀹㈡埛
+                        if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟                      
+                        {
+                            //鍒锋柊榛樿宸ヨ壓璺嚎
+                            oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'");
+                        }
+                    }                 
 
                     ////瀹℃牳鍗曟嵁
                     //if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))

--
Gitblit v1.9.1