From 4c48e5aa84a3331409ca0665b6dc3240067e97cd Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期三, 20 九月 2023 17:25:18 +0800 Subject: [PATCH] 产线返修平台:界面调整 产线返修平台:加载表头报错提醒修改 --- WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 191 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 142 insertions(+), 49 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs index 5cbd86a..705fbcc 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs @@ -42,15 +42,30 @@ string OperationType = sArray[2].ToString(); string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О - //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄� - if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Edit", 1, false, user)) + if (OperationType == "5") { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏃犵紪杈戞潈闄�!"; - objJsonResult.data = null; - return objJsonResult; + //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄� + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "寮�宸ュ崟鏃犵紪杈戞潈闄�!"; + objJsonResult.data = null; + return objJsonResult; + } } + else { + //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄� + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "杩涚珯鍗曟棤缂栬緫鏉冮檺!"; + objJsonResult.data = null; + return objJsonResult; + } + } + List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2); long HMainInterID = 0; @@ -534,20 +549,36 @@ #region 杩斿洖宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛� [Route("Cj_StationInBill/get_Display")] [HttpGet] - public object get_Display(string sWhere,string user) + public object get_Display(string sWhere,string user,string HBillSubType) { try { List<object> columnNameList = new List<object>(); - //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� - if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Query", 1, false, user)) + + if (HBillSubType == "SUB") { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; - objJsonResult.data = null; - return objJsonResult; + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "寮�宸ュ崟鏃犳煡璇㈡潈闄�!"; + objJsonResult.data = null; + return objJsonResult; + } } + else { + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "杩涚珯鍗曟棤鏌ヨ鏉冮檺!"; + objJsonResult.data = null; + return objJsonResult; + } + } + if (sWhere == null || sWhere.Equals("")) { @@ -680,20 +711,36 @@ #region 瀹℃牳 [Route("Cj_StationInBill/set_CheckBill")] [HttpGet] - public object set_CheckBill(int HInterID,string CurUserName) + public object set_CheckBill(int HInterID,string CurUserName,string HBillSubType) { try { - string ModRightNameCheck = "Cj_StationInBill_Check"; - //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false,CurUserName)) + string ModRightNameCheck = ""; + + if (HBillSubType == "SUB") { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; - objJsonResult.data = null; - return objJsonResult; + //瀹℃牳鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Check", 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "寮�宸ュ崟瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } } + else { + //瀹℃牳鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Check", 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "杩涚珯鍗曞鏍稿け璐ワ紒鏃犳潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + } + if (HInterID == 0) { objJsonResult.code = "0"; @@ -797,20 +844,36 @@ #region 鍙嶅鏍� [Route("Cj_StationInBill/set_AbandonCheck")] [HttpGet] - public object set_AbandonCheck(int HInterID, string CurUserName) + public object set_AbandonCheck(int HInterID, string CurUserName, string HBillSubType) { try { - string ModRightNameCheck = "Cj_StationInBill_Check"; - //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName)) + if (HBillSubType == "SUB") { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒鏃犳潈闄愶紒"; - objJsonResult.data = null; - return objJsonResult; + //瀹℃牳鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Check", 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "寮�宸ュ崟鍙嶅鏍稿け璐ワ紒鏃犳潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } } + else + { + //瀹℃牳鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Check", 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "杩涚珯鍗曞弽瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + + if (HInterID == 0) { @@ -942,19 +1005,34 @@ #region 宸ュ簭杩涚珯鍏抽棴/鍙嶅叧闂姛鑳� [Route("Cj_StationInBill/CloseCj_StationInBill")] [HttpGet] - public object CloseSc_StationInBill(string HInterID, int Type, string user) + public object CloseSc_StationInBill(string HInterID, int Type, string user,string HBillSubType) { try { - //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄� - if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Close", 1, false, user)) + if (HBillSubType == "SUB") { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏃犳潈闄愬叧闂�!"; - objJsonResult.data = null; - return objJsonResult; + //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄� + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Close", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "寮�宸ュ崟鏃犳潈闄愬叧闂�!"; + objJsonResult.data = null; + return objJsonResult; + } } + else { + //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄� + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Close", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "杩涚珯鍗曟棤鏉冮檺鍏抽棴!"; + objJsonResult.data = null; + return objJsonResult; + } + } + if (string.IsNullOrWhiteSpace(HInterID)) { @@ -1094,20 +1172,35 @@ #region 鏍规嵁id鍒犻櫎杩涚珯鍗� [Route("Cj_StationInBill/del_StationInBill")] [HttpGet] - public object del_StationInBill(long HInterID,string HDeleteMan) + public object del_StationInBill(long HInterID,string HDeleteMan,string HBillSubType) { try { string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О - //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Drop", 1, false, HDeleteMan)) + if (HBillSubType == "SUB") { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏃犳潈闄愶紒"; - objJsonResult.data = null; - return objJsonResult; + //缂栬緫鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Drop", 1, false, HDeleteMan)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "寮�宸ュ崟鏃犳潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } } + else { + //缂栬緫鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Drop", 1, false, HDeleteMan)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "杩涚珯鎺ユ敹鍗曟棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill(); if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo)) { -- Gitblit v1.9.1