From d1ff6d3f77431b15feb72688a280f80b89fb68d6 Mon Sep 17 00:00:00 2001 From: zzr99 <1940172413@qq.com> Date: 星期五, 21 一月 2022 17:30:51 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs index 0541d52..91200a4 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs @@ -29,7 +29,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -78,7 +78,6 @@ string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc"; return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList"); } - } #endregion @@ -93,7 +92,7 @@ public object set_DeleteBill(string HInterID,string user) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -187,7 +186,7 @@ try { //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -294,7 +293,7 @@ try { //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -480,11 +479,12 @@ string UserName = ""; string s = ""; + long mouldid; ListModels oListModels = new ListModels(); try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg4)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, false, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -595,7 +595,7 @@ i++; oItemSub.HEntryID = i; - + mouldid = oItemSub.HMaterID; //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭 //oItemSub.HManagerID = 0; //璐熻矗浜篒D @@ -629,6 +629,8 @@ } if (bResult) { + string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "; + oCn.RunProc(sql); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; @@ -663,7 +665,7 @@ { //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍� //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Check", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Check", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; -- Gitblit v1.9.1