From f46017c7fc76869b18a7927afe4756c41e2763cf Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 22 二月 2023 11:15:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
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