From a5b7843bbda42aea3e24f0a519679b6cc8f3ee72 Mon Sep 17 00:00:00 2001 From: 杨乐 <yang.le.192@qq.com> Date: 星期五, 11 二月 2022 17:55:26 +0800 Subject: [PATCH] 权限编辑 2727 不良品处理 --- WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs | 35 +++ WebAPI/Controllers/QC_ManagementController.cs | 101 +++++++-- WebAPI/Controllers/BaseSet/Gy_GroupController.cs | 16 WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs | 27 +- WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 12 + WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs | 32 +- WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 16 WebAPI/Controllers/QC_POStockInCheckBillController.cs | 39 +++ WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs | 18 WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs | 39 +++ WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs | 6 WebAPI/Controllers/Sc_ProcessMangementController.cs | 201 ++++++++++++++++++++ WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs | 11 + WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs | 36 +++ 14 files changed, 492 insertions(+), 97 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs index 6fed5e4..96e7835 100644 --- a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs @@ -32,7 +32,7 @@ try { //鏌ョ湅鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem", 1, false, user)) + if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -136,6 +136,7 @@ DAL.ClsGy_QCCheckItem_View oDeptHlp = new DAL.ClsGy_QCCheckItem_View(); try { + //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄� if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User)) { objJsonResult.code = "0"; @@ -304,8 +305,18 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); - string msg4 = sArray[2].ToString(); + string msg4 = sArray[2].ToString();//鐢ㄦ埛鍚� string msg5 = sArray[3].ToString(); + + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log(msg5, 1, false, msg4)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } //鍙嶅簭鍒楀寲 msg2 = "[" + msg2.ToString() + "]"; @@ -321,18 +332,6 @@ string HRemark = list[0].HRemark; bool HStopflag = list[0].HStopflag; bool HUseFlag = list[0].HUseFlag; - - - //鍒ゆ柇鏉冮檺 - if (!ClsPub.Security_Log(msg5, 1, false, msg4)) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; - objJsonResult.data = null; - return objJsonResult; - } - if (!DBUtility.ClsPub.AllowNumber(HNumber)) { diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs index 212d419..26c7b7f 100644 --- a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs @@ -291,14 +291,14 @@ //var HProcID = ""; //鍒ゆ柇鏉冮檺 - if (!ClsPub.Security_Log(msg5, 1, false, msg4)) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; - objJsonResult.data = null; - return objJsonResult; - } + //if (!ClsPub.Security_Log(msg5, 1, false, msg4)) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; + // objJsonResult.data = null; + // return objJsonResult; + //} //if (!DBUtility.ClsPub.AllowNumber(HNumber)) //{ diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs index 9c9a4a8..cbaf775 100644 --- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs @@ -323,14 +323,14 @@ long HProcID = list[0].HProcID; //鍒ゆ柇鏉冮檺 - if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3)) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒"; - objJsonResult.data = null; - return objJsonResult; - } + //if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3)) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒"; + // objJsonResult.data = null; + // return objJsonResult; + //} //if (!DBUtility.ClsPub.AllowNumber(HNumber)) //{ diff --git a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs index 4e87a28..403bac0 100644 --- a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs @@ -19,7 +19,7 @@ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; - #region 妫�楠岄」鐩垪琛ㄦ暟鎹� + #region 妫�楠岄」鐩垎绫诲垪琛ㄦ暟鎹� /// <summary> /// 杩斿洖妫�楠岄」鐩垪琛� ///鍙傛暟锛歴tring sql銆� @@ -32,7 +32,7 @@ try { //鏌ョ湅鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem", 1, false, user)) + if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckClass_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -136,6 +136,7 @@ DAL.ClsGy_QCCheckClass_View oDeptHlp = new DAL.ClsGy_QCCheckClass_View(); try { + //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄� if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User)) { objJsonResult.code = "0"; @@ -144,6 +145,7 @@ objJsonResult.data = null; return objJsonResult; } + if (oDeptHlp.GetInfoByID(HItemID)) { if (oDept.HavChildCodes(HItemID)) @@ -314,8 +316,18 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); - string msg4 = sArray[2].ToString(); - string msg5 = sArray[3].ToString(); + string msg4 = sArray[2].ToString();//鐢ㄦ埛鍚� + string msg5 = sArray[3].ToString();//淇敼妯″潡鍚嶇О + + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log(msg5, 1, false, msg4)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } //鍙嶅簭鍒楀寲 msg2 = "[" + msg2.ToString() + "]"; @@ -330,18 +342,6 @@ string HRemark = list[0].HRemark; string HStopflag = list[0].HStopflag; string HUseFlag = list[0].HUseFlag; - - - //鍒ゆ柇鏉冮檺 - if (!ClsPub.Security_Log(msg5, 1, false, msg4)) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; - objJsonResult.data = null; - return objJsonResult; - } - if (!DBUtility.ClsPub.AllowNumber(HNumber)) { diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs index 7ea7315..91fcfda 100644 --- a/WebAPI/Controllers/QC_ManagementController.cs +++ b/WebAPI/Controllers/QC_ManagementController.cs @@ -104,11 +104,21 @@ /// <returns></returns> [Route("QC_Management/MES_QC_CheckProjectList_Json")] [HttpGet] - public object MES_QC_CheckProjectList_Json(string sWhere) + public object MES_QC_CheckProjectList_Json(string sWhere,string user) { DataSet ds; try { + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckProject_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡璇㈡潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sWhere == null || sWhere.Equals("")) { @@ -174,11 +184,21 @@ /// <returns></returns> [Route("QC_Management/MES_QC_FirstPieceCheckBillList_Json")] [HttpGet] - public object MES_QC_FirstPieceCheckBillList_Json(string sqlWhere) + public object MES_QC_FirstPieceCheckBillList_Json(string sqlWhere,string user) { DataSet ds; try { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_FirstPieceCheckBill_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sqlWhere == null || sqlWhere.Equals("")) { @@ -209,11 +229,21 @@ /// <returns></returns> [Route("QC_Management/MES_QC_PatrolProcCheckBillList_Json")] [HttpGet] - public object MES_QC_PatrolProcCheckBillList_Json(string sqlWhere) + public object MES_QC_PatrolProcCheckBillList_Json(string sqlWhere,string user) { DataSet ds; try { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_PatrolProcCheckBill_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sqlWhere == null || sqlWhere.Equals("")) { @@ -496,7 +526,17 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); + string user = sArray[2].ToString();//鐢ㄦ埛鍚� + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckProject_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犵紪杈戞潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } string UserName = ""; ListModels oListModels = new ListModels(); @@ -756,10 +796,6 @@ } } #endregion - - - - #region 鏉ユ枡妫�楠� /// <summary> @@ -1098,21 +1134,21 @@ /// <returns></returns> [Route("DeltetQC_FirstPieceCheck")] [HttpGet] - public object DeltetQC_FirstPieceCheck(string HInterID) + public object DeltetQC_FirstPieceCheck(string HInterID,string user) { DataSet ds; - //string ModRightNameCheck = "Sc_ProcessReport_check"; + string ModRightNameCheck = "QC_FirstPieceCheckBill_Delete"; try { //鍒犻櫎鏉冮檺 - //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName)) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; - // objJsonResult.data = null; - // return objJsonResult; - //} + if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (string.IsNullOrWhiteSpace(HInterID)) @@ -1182,12 +1218,23 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); + string user = sArray[2].ToString(); string UserName = ""; ListModels oListModels = new ListModels(); try { + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_PatrolProcCheckBill_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } + WebAPI.DLL.ClsQC_PatrolProcCheckBill oBill = new WebAPI.DLL.ClsQC_PatrolProcCheckBill(); List<Model.ClsQC_PatrolProcCheckBillMain> lsmain = new List<Model.ClsQC_PatrolProcCheckBillMain>(); msg2 = msg2.Replace("\\", ""); @@ -1300,21 +1347,21 @@ /// <returns></returns> [Route("DeltetQC_PatrolProcCheck")] [HttpGet] - public object DeltetQC_PatrolProcCheck(string HInterID) + public object DeltetQC_PatrolProcCheck(string HInterID,string user) { DataSet ds; - //string ModRightNameCheck = "Sc_ProcessReport_check"; + string ModRightNameCheck = "QC_PatrolProcCheckBill_Delete"; try { //鍒犻櫎鏉冮檺 - //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName)) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; - // objJsonResult.data = null; - // return objJsonResult; - //} + if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒犻櫎澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (string.IsNullOrWhiteSpace(HInterID)) diff --git a/WebAPI/Controllers/QC_POStockInCheckBillController.cs b/WebAPI/Controllers/QC_POStockInCheckBillController.cs index a3f9caf..d292a8b 100644 --- a/WebAPI/Controllers/QC_POStockInCheckBillController.cs +++ b/WebAPI/Controllers/QC_POStockInCheckBillController.cs @@ -24,15 +24,25 @@ /// <summary> /// 杩斿洖鍒楄〃 + /// 鏉ユ枡鍏ュ簱妫�楠屽崟 ///鍙傛暟锛歴tring sql銆� ///杩斿洖鍊硷細object銆� /// </summary> - [Route("QC_POStockInCheckBill/GetPOStockInCheckBill")] + [Route("QC_POStockInCheckBill/GetPOStockInCheckBill")] [HttpGet] - public object GetPOStockInCheckBill(string sWhere) + public object GetPOStockInCheckBill(string sWhere,string user) { try - { + { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_POStockInCheckBill_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } ds = QC_POStockInCheckBill(sWhere); objJsonResult.code = "1"; @@ -148,8 +158,19 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); + string user = sArray[2].ToString(); try { + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_POStockInCheckBill_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } + msg2 = "[" + msg2.ToString() + "]"; List<QC_POStockInCheckBill> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_POStockInCheckBill>>(msg2); int HYear = 2021; @@ -275,10 +296,20 @@ /// <returns></returns> [Route("QC_POStockInCheckBill/DeltetPOStockInCheckBill")] [HttpGet] - public object DeltetPOStockInCheckBill(string HInterID) + public object DeltetPOStockInCheckBill(string HInterID,string user) { try { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_POStockInCheckBill_Delete", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + oCN.BeginTran(); oCN.RunProc("Delete From QC_POStockInCheckBillMain where HInterID = " + HInterID); oCN.RunProc("Delete From QC_POStockInCheckBillSub where HInterID = " + HInterID); diff --git a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs index 92741bd..9c07a28 100644 --- a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs +++ b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs @@ -281,19 +281,19 @@ [HttpGet] public object EquipAuditBill(int HInterID, int IsAudit, string CurUserName) { - // string ModRightNameCheck = ""; 璇ユā鍧楃殑瀹℃牳鍔熻兘 + string ModRightNameCheck = "Sb_EquipRepairSendWorkBill_Check"; //璇ユā鍧楃殑瀹℃牳鍔熻兘 DBUtility.ClsPub.CurUserName = CurUserName;//瀛樺偍鐢ㄦ埛鍚� try { ////鍒ゆ柇鏄惁鏈夊鏍告潈闄� - // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName)) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; - // objJsonResult.data = null; - // return objJsonResult; - //} + 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) { diff --git a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs index 6a84adb..cfc5238 100644 --- a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs +++ b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs @@ -71,6 +71,7 @@ /// <summary> /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳 + /// 浜у搧鍏ュ簱妫�楠屽崟鍒楄〃 ///鍙傛暟锛歴tring sql銆� ///杩斿洖鍊硷細object銆� /// </summary> @@ -104,8 +105,19 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); + string user = sArray[2].ToString(); try { + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_POStockInCheckBill_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } + msg2 = "[" + msg2.ToString() + "]"; List<QC_LastPieceCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_LastPieceCheckBillMain>>(msg2); string BillType = "7507"; @@ -243,14 +255,25 @@ } /// <summary> ///鍒犻櫎鍔熻兘 + ///浜у搧鍏ュ簱妫�楠屽崟 /// </summary> /// <returns></returns> [Route("QC_LastPieceCheckBill/DeltetLastPieceCheckBill")] [HttpGet] - public object DeltetLastPieceCheckBill(string HInterID) + public object DeltetLastPieceCheckBill(string HInterID,string user) { try - { + { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_POStockInCheckBill_Drop", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + oCN.BeginTran(); oCN.RunProc("Delete From QC_LastPieceCheckBillMain where HInterID = " + HInterID); oCN.RunProc("Delete From QC_LastPieceCheckBillSub where HInterID = " + HInterID); @@ -278,10 +301,20 @@ /// </summary> [Route("QC_LastPieceCheckBill/GetLastPieceCheckBillList")] [HttpGet] - public object GetLastPieceCheckBillList(string sWhere) + public object GetLastPieceCheckBillList(string sWhere,string user) { try { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_POStockInCheckBill_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_QC_LastPieceCheckBillListDetail order by hmainid desc ", "h_v_QC_LastPieceCheckBillListDetail"); diff --git a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs index c12e97d..4ec0dd6 100644 --- a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs +++ b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs @@ -29,10 +29,20 @@ /// </summary> [Route("QC_OutCompCheckBill/GetOutCompCheckBillList")] [HttpGet] - public object GetOutCompCheckBillList(string sWhere) + public object GetOutCompCheckBillList(string sWhere,string user) { try { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_OutCompCheckBill_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_QC_OutCompCheckBillList order by hmainid desc ", "h_v_QC_OutCompCheckBillList"); @@ -152,8 +162,19 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); + string user = sArray[2].ToString(); try { + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_OutCompCheckBill_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } + msg2 = "[" + msg2.ToString() + "]"; List<QC_OutCompCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_OutCompCheckBillMain>>(msg2); int HYear = 2021; @@ -267,10 +288,20 @@ /// <returns></returns> [Route("QC_OutCompCheckBill/DeltetOutCompCheckBill")] [HttpGet] - public object DeltetOutCompCheckBill(string HInterID) + public object DeltetOutCompCheckBill(string HInterID,string user) { try { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_OutCompCheckBill_Delete", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + oCN.BeginTran(); oCN.RunProc("Delete From QC_OutCompCheckBillMain where HInterID = " + HInterID); oCN.RunProc("Delete From QC_OutCompCheckBillSub where HInterID = " + HInterID); diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs index 6d3de22..0250992 100644 --- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs +++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs @@ -45,6 +45,7 @@ string UserName = sArray[1].ToString(); string refSav = sArray[2].ToString(); DBUtility.ClsPub.CurUserName = UserName; + //淇濆瓨鏉冮檺 if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Edit", 1, false, DBUtility.ClsPub.CurUserName)) { @@ -54,6 +55,7 @@ objJsonResult.data = null; return objJsonResult; } + //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞� string s = ""; int sYear = 0; @@ -371,6 +373,16 @@ { try { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("OA_ErrMsgBackBill_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + ds = Get_TransFerBillList(sWhere); if (ds == null) { diff --git a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs index 870499a..a78b4e7 100644 --- a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs +++ b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs @@ -56,17 +56,17 @@ int pageSize = limit; if (sWhere == null || sWhere.Equals("")) { - sWhere = " where 1=1 order by hmainid desc "; + sWhere = " where 1=1 "; } else { - sWhere = " where 1=1" + sWhere+ " order by hmainid desc "; + sWhere = " where 1=1" + sWhere; } DataSet ds0 = oCn.RunProcReturn("select count(*) CountNum from h_v_PackUnionBillList "+sWhere+"", "h_v_PackUnionBillList"); count = int.Parse(ds0.Tables[0].Rows[0]["CountNum"].ToString()); //string sql = string.Format(@"select top " + pageSize + " hmainid,鏃ユ湡,鍗曟嵁鍙�,绠卞彿鏉″舰鐮�,鍑�閲�,姣涢噸,鐨噸,鐢熶骇缁勭粐,閮ㄩ棬,鎿嶄綔鍛�,瀹㈡埛鏍囩鍙�,鐗╂枡浠g爜,鐗╂枡鍚嶇О,璁¢噺鍗曚綅浠g爜,璁¢噺鍗曚綅鍚嶇О,鏁伴噺,鍒跺崟浜�,鍒跺崟鏃ユ湡 from(select row_number() over (order by hmainid desc) as RowNumber,hmainid,鏃ユ湡,鍗曟嵁鍙�,绠卞彿鏉″舰鐮�,鍑�閲�,姣涢噸,鐨噸,鐢熶骇缁勭粐,閮ㄩ棬,鎿嶄綔鍛�,瀹㈡埛鏍囩鍙�,鐗╂枡浠g爜,鐗╂枡鍚嶇О,璁¢噺鍗曚綅浠g爜,璁¢噺鍗曚綅鍚嶇О,鏁伴噺,鍒跺崟浜�,鍒跺崟鏃ユ湡 from h_v_PackUnionBillList " + sWhere + ") as A where RowNumber >" + pageSize + " *(" + pageNum + "-1)"); - string sql = string.Format(@"select hmainid,鏃ユ湡,鍗曟嵁鍙�,绠卞彿鏉″舰鐮�,鏉$爜,鍑�閲�,姣涢噸,鐨噸,鐢熶骇缁勭粐,閮ㄩ棬,鎿嶄綔鍛�,瀹㈡埛鏍囩鍙�,鐗╂枡浠g爜,鐗╂枡鍚嶇О,璁¢噺鍗曚綅浠g爜,璁¢噺鍗曚綅鍚嶇О,鏁伴噺,鍒跺崟浜�,鍒跺崟鏃ユ湡 from h_v_PackUnionBillList " + sWhere + " order by hmainid offset ((" + pageNum + "-1)*" + pageSize + ") rows fetch next " + pageSize + " rows only"); + string sql = string.Format(@"select hmainid,鏃ユ湡,鍗曟嵁鍙�,绠卞彿鏉″舰鐮�,鏉$爜,鍑�閲�,姣涢噸,鐨噸,鐢熶骇缁勭粐,閮ㄩ棬,鎿嶄綔鍛�,瀹㈡埛鏍囩鍙�,鐗╂枡浠g爜,鐗╂枡鍚嶇О,璁¢噺鍗曚綅浠g爜,璁¢噺鍗曚綅鍚嶇О,鏁伴噺,鍒跺崟浜�,鍒跺崟鏃ユ湡 from h_v_PackUnionBillList " + sWhere + " order by hmainid desc offset ((" + pageNum + "-1)*" + pageSize + ") rows fetch next " + pageSize + " rows only"); ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_PackUnionBillList"); string aa = ds.Tables[0].Columns[0].ToString(); diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index 8ff9829..9ac11d2 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -1152,11 +1152,21 @@ /// <returns></returns> [Route("Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json")] [HttpGet] - public object MES_QC_NoPassProdCheckBill_Json(string sWhere) + public object MES_QC_NoPassProdCheckBill_Json(string sWhere,string user) { DataSet ds; try { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_NoPassProdCheckBillQuery", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sWhere == null || sWhere.Equals("")) { @@ -1179,6 +1189,184 @@ } return GetObjectJson(ds); } + + /// <summary> + /// 涓嶅悎鏍艰瘎瀹� 鍒犻櫎 + /// </summary> + /// <param name="HInterID"></param> + /// <param name="user"></param> + /// <returns></returns> + [Route("Sc_ProcessMangement/ProcessMangementDeleteBill")] + [HttpGet] + public object ProcessMangementDeleteBill(string HInterID, string user) + { + try + { + if (!DBUtility.ClsPub.Security_Log("QC_NoPassProdCheckBill_Drop", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳潈闄愬垹闄�"; + objJsonResult.data = null; + return objJsonResult; + } + + ds = oCN.RunProcReturn("select * from h_v_QC_NoPassProdCheckBillList where hmainid =" + HInterID + " ", "h_v_QC_NoPassProdCheckBillList"); + + if (ds.Tables[0].Rows[0]["瀹℃牳浜�"].ToString() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸插鏍�,涓嶈兘鍒犻櫎!"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.BeginTran(); + oCN.RunProc("Delete from QC_NoPassProdCheckBillMain where HInterID=" + HInterID); + oCN.RunProc("Delete from QC_NoPassProdCheckBillSub where HInterID=" + HInterID); + oCN.Commit(); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎鎴愬姛!"; + objJsonResult.data = null; + return objJsonResult; + + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒犻櫎澶辫触!"+e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #region 涓嶅悎鏍艰瘎瀹� 瀹℃牳/鍙嶅鏍� + [Route("Sc_ProcessMangement/AuditProcessMangement")] + [HttpGet] + public object AuditProcessMangement(int HInterID, int IsAudit, string CurUserName) + { + string ModRightNameCheck = "QC_NoPassProdCheckBill_Check"; //璇ユā鍧楃殑瀹℃牳鍔熻兘 + DBUtility.ClsPub.CurUserName = CurUserName;//瀛樺偍鐢ㄦ埛鍚� + try + { + ////鍒ゆ柇鏄惁鏈夊鏍告潈闄� + 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"; + objJsonResult.count = 0; + objJsonResult.Message = "ID灏忎簬0"; + objJsonResult.data = null; + return objJsonResult; + } + + Int64 lngBillKey = 0; + lngBillKey = DBUtility.ClsPub.isLong(HInterID);//鏁版嵁杞崲 + + //鏌ヨ瀹℃牳鐨勬暟鎹� + ds = oCN.RunProcReturn("select * from QC_NoPassProdCheckBillMain where HInterID='" + HInterID + "'", "QC_NoPassProdCheckBillMain"); + + if (ds.Tables[0].Rows.Count > 0) + { + var hcloseman = ds.Tables[0].Rows[0]["HCloseMan"].ToString();//鍏抽棴浜� + var hdeleteman = ds.Tables[0].Rows[0]["HDeleteMan"].ToString();//浣滃簾浜� + var hchecker = ds.Tables[0].Rows[0]["HChecker"].ToString();//瀹℃牳浜� + + if (hcloseman != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "褰撳墠鍗曟嵁宸插叧闂�,鏃犳硶瀹℃牳!"; + objJsonResult.data = null; + return objJsonResult; + } + + if (hdeleteman != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "褰撳墠鍗曟嵁宸蹭綔搴�,鏃犳硶瀹℃牳!"; + objJsonResult.data = null; + return objJsonResult; + } + //IsAudit==0 瀹℃牳 + if (IsAudit == 1) + { + if (hchecker != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "褰撳墠鍗曟嵁宸插鏍�,鏃犳硶鍐嶆瀹℃牳!"; + objJsonResult.data = null; + return objJsonResult; + } + } + //IsAudit==1 鍙嶅鏍� + if (IsAudit == 2) + { + if (hchecker == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "褰撳墠鍗曟嵁鏈鏍�,鏃犳硶鍙嶅鏍�!"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�;鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + + //瀹℃牳鎻愪氦 + if (IsAudit == 1) + { + oCN.RunProc(" Update QC_NoPassProdCheckBillMain set HChecker='" + CurUserName + "',HCheckDate='" + DateTime.Now + "',HBillStatus=2 Where HBillType='7509' and HInterID=" + HInterID); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "瀹℃牳鎴愬姛!"; + objJsonResult.data = null; + return objJsonResult; + } + //鍙嶅鏍告彁浜� + if (IsAudit == 2) + { + oCN.RunProc(" Update QC_NoPassProdCheckBillMain set HChecker='',HCheckDate=null,HBillStatus=0 Where HBillType='7509' and HInterID=" + HInterID); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅鏍告垚鍔�!"; + objJsonResult.data = null; + return objJsonResult; + } + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触鎴栧弽瀹℃牳澶辫触" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion /// <summary> /// PDA宸ュ簭姹囨姤鍗曚繚瀛� @@ -1617,12 +1805,23 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); + string user = sArray[2].ToString(); string UserName=""; ListModels oListModels = new ListModels(); try { + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_NoPassProdCheckBill_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } + DLL.ClsQC_NoPassProdCheckBill oBill = new DLL.ClsQC_NoPassProdCheckBill(); List<Model.ClsQC_NoPassProdCheckBillMain> lsmain = new List<Model.ClsQC_NoPassProdCheckBillMain>(); msg2 = msg2.Replace("\\", ""); diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" index 84cbef5..e14d9db 100644 --- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" +++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" @@ -42,9 +42,21 @@ string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); string OperationType = sArray[2].ToString().Trim(); + string user = sArray[3].ToString();//鐢ㄦ埛鍚� + bool bResult; try { + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } + msg2 = "[" + msg2.ToString() + "]"; List<Model.ClsQC_ProcessCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillMain>>(msg2); DAL.ClsQC_ProcessCheckBill BillNew = new DAL.ClsQC_ProcessCheckBill(); @@ -370,11 +382,21 @@ /// </summary> [Route("QC_ProcessCheckBill/Delete_Json")] [HttpGet] - public object Delete_Json(long HItemID) + public object Delete_Json(long HItemID,string user) { DAL.ClsQC_ProcessCheckBill BillOld = new DAL.ClsQC_ProcessCheckBill(); try { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Delete", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + if (BillOld.DeleteBill(HItemID, ref ClsPub.sExeReturnInfo) != true) { objJsonResult.code = "1"; @@ -408,10 +430,20 @@ /// </summary> [Route("QC_ProcessCheckBill/GetProcessCheckBillList")] [HttpGet] - public object GetProcessCheckBillList(string sWhere) + public object GetProcessCheckBillList(string sWhere,string user) { try { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_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_QC_ProcessCheckBillListDetail order by hmainid desc ", "h_v_QC_ProcessCheckBillListDetail"); diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" index 5256e23..8821915 100644 --- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" +++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" @@ -37,9 +37,20 @@ string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); string OperationType = sArray[2].ToString().Trim(); + string user = sArray[3].ToString(); bool bResult; try { + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("QC_FirstPieceCheckBill_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } + msg2 = "[" + msg2.ToString() + "]"; List<Model.ClsQC_FirstPieceCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillMain>>(msg2); DAL.ClsQC_FirstPieceCheckBill BillNew = new DAL.ClsQC_FirstPieceCheckBill(); -- Gitblit v1.9.1