From 62c74801e8b0358a2b970b840ee7f6feb48a4071 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 25 十一月 2024 16:38:21 +0800
Subject: [PATCH] 收料通知单列表、采购入库单列表、应付单列表、付款单列表后端分页

---
 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