From e0586c9193b7ac3113980899efadb4ab6f4851b8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 17 二月 2023 17:23:38 +0800
Subject: [PATCH] 生产任务单无列表 工艺路线维护 工序返工申请单 工序流转批量

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

diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 3a69b83..9cd90b3 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -231,25 +231,25 @@
                     return objJsonResult;
                 }
 
-                //string sErrMsg = "";
-                //if (oSystemParameter.ShowBill(ref sErrMsg))
-                //{
-                //    if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
-                //    {
-                //        if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y" && OperationType == 1)
-                //        {
-                //            //璁剧疆杞伐搴�
-                //            oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
-                //        }
-                //    }
-                //}
-
-                if (IsProNo == 1 && OperationType == 1)
+                string sErrMsg = "";
+                if (oSystemParameter.ShowBill(ref sErrMsg))
                 {
-                    //璁剧疆杞伐搴�
-                    oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
+                    if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
+                    {
+                        if (oSystemParameter.omodel.Gy_RoutingBill_SaveAutoLastProc == "Y" && OperationType == 1)
+                        {
+                            //璁剧疆杞伐搴�
+                            oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
+                        }
+                    }
+                    else if (IsProNo == 1 && OperationType == 1)
+                    {
+                        //璁剧疆杞伐搴�
+                        oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
+                    }
                 }
 
+
                 //鏄惁鍕鹃�夐粯璁ゅ伐鑹鸿矾绾�
                 if (HStandard)
                 {

--
Gitblit v1.9.1