From 336353d20184dc995d51f14ba020195a1e497d37 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期四, 28 十二月 2023 11:01:44 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs index 4fbc2ed..cde5732 100644 --- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs +++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs @@ -1243,14 +1243,14 @@ try { //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� - //if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user)) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "鏃犳潈闄愭煡璇�!"; - // objJsonResult.data = null; - // return objJsonResult; - //} + if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳潈闄愭煡璇�!"; + objJsonResult.data = null; + return objJsonResult; + } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); string sql1 = "select top 1000 * from h_v_Gy_RoutingBillQuery where 1 = 1 "; @@ -1283,7 +1283,7 @@ DataSet ds; try { - + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); string sql1 = "select top 1000 * from h_v_Gy_RoutingBillQuerySub where 1 = 1 and hmainid=" + sWhere; string sql = sql1 + " order by hmainid desc,cast(宸ュ簭鍙� as int)"; -- Gitblit v1.9.1