From 8c8be9fbcc6888f0770dd95fcf96cd75bff1a952 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期五, 29 十一月 2024 12:11:09 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/LMESController.cs | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs index 94292f4..a978efe 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 @@ -1326,7 +1326,7 @@ { string sql1 = "select * from h_v_Gy_RoutingBillList where 1 = 1 "; //瀹㈡埛鑷畾涔� - if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�" || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒" || oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") + if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�" || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒" ) { sql1 = "select top 1000 * from h_v_Gy_RoutingBillList where 1 = 1 "; } @@ -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)) @@ -3779,6 +3788,17 @@ objJsonResult.data = null; return objJsonResult; } + //鑾峰彇绯荤粺鍙傛暟璁剧疆澶辨晥鏃堕棿 + string Ret = ""; + if (oSystemParameter.ShowBill(ref Ret)) + { + //鍒ゆ柇瀹㈡埛 + if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟 + { + //鍒锋柊澶辨晥鏃堕棿 + oCN.RunProc("update Gy_RoutingBillMain set HEndDate = CONVERT(date, DATEADD(day, -1, GETDATE())) where HInterID = " + HInterID); + } + } } else { -- Gitblit v1.9.1