From 26e4ec20ae8370f2b4e43ec7e77688d47d068a3b Mon Sep 17 00:00:00 2001 From: 沈泽 <211959439@qq.com> Date: 星期四, 14 十月 2021 08:32:22 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs index c8985f9..7c75a5d 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs @@ -235,17 +235,17 @@ /// <returns></returns> [Route("Sc_MouldScrapInBill/set_DeleteBill")] [HttpGet] - public object set_DeleteBill(string HInterID) + public object set_DeleteBill(string HInterID,string user) { //缂栬緫鏉冮檺 - //if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapInBill_Edit", 1, true, DBUtility.ClsPub.CurUserName)) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; - // objJsonResult.data = null; - // return objJsonResult; - //} + if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapInBill_Delete", 1, true, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } string s = ""; Int64 lngBillKey = 0; @@ -319,11 +319,21 @@ [Route("Sc_MouldScrapInBill/get_Display")] [HttpGet] - public object get_Display(string sWhere) + public object get_Display(string sWhere,string user, string Organization) { try { - ds = Sc_GetMouldScrapInHouseBill(sWhere); + //缂栬緫鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapRequestBillList", 1, true, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + ds = Sc_GetMouldScrapInHouseBill(sWhere,Organization); if (ds == null) { objJsonResult.code = "0"; @@ -351,16 +361,16 @@ } } - public static DataSet Sc_GetMouldScrapInHouseBill(string sWhere) + public static DataSet Sc_GetMouldScrapInHouseBill(string sWhere, string Organization) { + string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapInHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'"); if (sWhere == null || sWhere.Equals("")) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldScrapInHouseBillList " + sWhere, "h_v_Sc_MouldScrapInHouseBillList"); + return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by 鏃ユ湡 desc", "h_v_Sc_MouldScrapInHouseBillList"); } else { - string sql1 = "select * from h_v_Sc_MouldScrapInHouseBillList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere + "order by 鏃ユ湡 desc"; return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList"); } -- Gitblit v1.9.1