From 82f41ba53073e1e8ce0c21489b7d4f34178ebf8d Mon Sep 17 00:00:00 2001 From: 杨乐 <yang.le.192@qq.com> Date: 星期二, 08 二月 2022 16:55:58 +0800 Subject: [PATCH] 采购管理 销售管理 仓存管理-验收入库-领料发货 页面页数调整,数据排序 --- WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 68 +++++++++++++++++++++++++++++----- 1 files changed, 58 insertions(+), 10 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs index 2e2beea..a87e6e8 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs @@ -30,14 +30,30 @@ { var _value = oMain["oMain"].ToString(); string msg1 = _value.ToString(); + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); try { //濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲 - msg1 = "[" + msg1.ToString() + "]"; - List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1); + string msg2 = "[" + sArray[0].ToString() + "]"; + string user = sArray[1].ToString(); + + //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄� + 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; HMainInterID = list[0].HMainInterID; long HProcExchInterID = list[0].lngBillKey;//娴佽浆鍗′富鍐呯爜 + + + if (HProcExchInterID <= 0) { objJsonResult.code = "0"; @@ -276,6 +292,18 @@ } oCN.Commit(); + string sReturn = ""; + if (oSystemParameter.ShowBill(ref sReturn) == true) + { + if (oSystemParameter.omodel.MES_StationInBill_SaveAutoAddnew == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳 + { + objJsonResult.Verify = "Y"; + } + else + { + objJsonResult.Verify = "N"; + } + } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�"; @@ -348,13 +376,23 @@ } #endregion - #region 杩斿洖濮斿宸ュ簭鎺ユ敹鍗曞垪琛� + #region 杩斿洖宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛� [Route("Cj_StationInBill/get_Display")] [HttpGet] - public object get_Display(string sWhere) + public object get_Display(string sWhere,string user) { try { + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + 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("")) { ds = oCN.RunProcReturn("select * from h_v_MES_StationInBillList " + sWhere+ " order by 杩涚珯鏃堕棿 desc", "h_v_MES_StationInBillList"); @@ -480,9 +518,9 @@ { try { - string ModRightNameCheck = "MES_StationInBill_Check"; + string ModRightNameCheck = "Cj_StationInBill_Check"; //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,CurUserName)) + if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false,CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -597,6 +635,17 @@ { try { + string ModRightNameCheck = "Cj_StationInBill_Check"; + //瀹℃牳鏉冮檺 + if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒鏃犳潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + if (HInterID == 0) { objJsonResult.code = "0"; @@ -777,9 +826,8 @@ { try { - //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("MES_StationInBill_Delete", 1, true, HDeleteMan)) + if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Drop", 1, false, HDeleteMan)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -868,7 +916,7 @@ } #endregion - //#region 鏌ョ湅宸ュ簭娴佽浆鍗″叧鑱旀暟閲忓垪琛ㄥ姞杞� + #region 鏌ョ湅宸ュ簭娴佽浆鍗″叧鑱旀暟閲忓垪琛ㄥ姞杞� [Route("Cj_StationInBill/GetStationQtyList")] [HttpGet] public object GetStationQtyList(string HInterID) @@ -902,6 +950,6 @@ return objJsonResult; } } - //#endregion + #endregion } } \ No newline at end of file -- Gitblit v1.9.1