From c2b52ca1156888dc4d63f19be5515f56eb2954dd Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 23 十月 2024 09:06:37 +0800
Subject: [PATCH] 生产质量汇报单,增加HNowProcID int //当前工序字段,不良品台账增加过滤条件

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

diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index dfe2672..c63108f 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1456,7 +1456,7 @@
                 if (oSystemParameter.ShowBill(ref Ret))
                 {
                     //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰�
-                    if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤")
+                    if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤" || oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧")
                     {
                         //鍒ゆ柇鏄惁鏈夋煡璇㈠伐浠锋潈闄�
                         if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_CheckProcPrice", 1, false, UserName))
@@ -1601,6 +1601,18 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
+                DataSet dss;
+                //鍒ゆ柇宸ヨ壓璺嚎鏄惁琚紩鐢�
+                dss = oCN.RunProcReturn("select COUNT(*) as number from Sc_ProcessExchangeBillMain where HRoutingBillID = " + lngBillKey, "Gy_RoutingBillMain");
+                //鍒ゆ柇鏄惁鍙紪杈�
+                if (dss.Tables[0].Rows[0]["number"].ToString() != "0")
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "姝ゅ崟鎹凡缁忚寮曠敤锛屼笉鍏佽鍒犻櫎锛�";
+                    objJsonResult.data = 1;
+                    return objJsonResult;
+                }
                 //if (hdeleteman != "")
                 //{
                 //    objJsonResult.code = "0";

--
Gitblit v1.9.1