From f440eeb72f93587ae29089209710582cda9f384e Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期一, 07 二月 2022 23:21:52 +0800 Subject: [PATCH] 合并 --- WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBillController.cs | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs" index 1a41434..90f460c 100644 --- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs" +++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs" @@ -24,10 +24,20 @@ [Route("Kf_MateOutBill/GetMateOutBillList")] [HttpGet] - public object GetMateOutBillList(string sWhere) + public object GetMateOutBillList(string sWhere,string user) { try { + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + if (!DBUtility.ClsPub.Security_Log("Kf_MateOutBillQuery", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCn.RunProcReturn("select * from h_v_IF_MateOutBillList " + sWhere + " order by 鏃ユ湡 desc", "h_v_IF_MateOutBillList"); objJsonResult.code = "1"; objJsonResult.count = 1; @@ -57,7 +67,7 @@ public object set_DeleteBill(string HInterID, string user) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Delete", 1, false, user)) + if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Drop", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; -- Gitblit v1.9.1