From 179635da5c03219f833cc145595369d2e9b85e14 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 31 十月 2024 16:38:31 +0800
Subject: [PATCH] 工序返工申请单：增加字段 HBillOperationType 审核时根据HBillOperationType进行相关反写
---
WebAPI/Controllers/LMESController.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 94292f4..21336e2 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1210,7 +1210,7 @@
#region 宸ヨ壓璺嚎鍒嗛〉鍒楄〃
[Route("Gy_RoutingBill/page")]
[HttpGet]
- public json Gy_RoutingBillPage(string sWhere, string user, int page, int size)
+ public object Gy_RoutingBillPage(string sWhere, string user, int page, int size)
{
DataSet ds;
json res = new json();
@@ -1256,7 +1256,7 @@
res.count = CountConstant.FAIL;
res.Message = "Exception锛�" + e.ToString();
res.data = null;
- return objJsonResult;
+ return res;
}
}
#endregion
@@ -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