From 08c1b3e715dd645b8c3f3f88f7983fbab2503823 Mon Sep 17 00:00:00 2001 From: YL <YL@LAPTOP-SE03PLUR> Date: 星期二, 19 十月 2021 15:52:48 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs | 6 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 12 +- WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs | 14 +- WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs | 2 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 49 +++++-- WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs | 10 WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs | 6 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 6 WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs | 6 WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs | 10 WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs | 6 WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs | 6 WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 10 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 4 Pub_Class/CustomerCls/ClsPub.cs | 110 ++++++++++++++++++ WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs | 8 WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs | 4 WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs | 34 ++-- 18 files changed, 215 insertions(+), 88 deletions(-) diff --git a/Pub_Class/CustomerCls/ClsPub.cs b/Pub_Class/CustomerCls/ClsPub.cs index 093a9b1..e18a52c 100644 --- a/Pub_Class/CustomerCls/ClsPub.cs +++ b/Pub_Class/CustomerCls/ClsPub.cs @@ -814,6 +814,116 @@ } } + public static bool Security_Log_second(string gnsy, int LogTF, bool Msg, string CurUserName) + { + //gnsy 鍔熻兘绱㈠紩,妯″潡 + //usercode 褰撳墠鐢ㄦ埛浠g爜 + //LogTF 1鍒ゆ柇鏉冮檺骞跺啓鏃ュ織锛�2鍙啓鏃ュ織锛�3鍙垽鏂潈闄� + //Msg 娌℃湁鏉冮檺鏃� 鏄惁鎻愮ず妗� + string UserID = CurUserName; + try + { + ClsSqlHelper oCn = new ClsSqlHelper(); + DataSet Ds = new DataSet(); + DataSet DsUser = new DataSet(); + DataSet DsJS = new DataSet();//瑙掕壊 + long ModID = 0; + bool HavRight = false; + //鎵惧埌妯″潡鏉冮檺 + Ds = oCn.RunProcReturn("select * from xt_xtgnb where gnsy='" + gnsy.Trim() + "'", "xt_xtgnb"); + if (Ds.Tables[0].Rows.Count == 0) + { + if (Msg == true) + { + return false; + //MessageBox.Show("娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒", "鎻愮ず"); + } + return false; + } + else + { + ModID = ClsPub.isLong(Ds.Tables[0].Rows[0]["ID"].ToString()); //杩斿洖妯″潡 + } + if (LogTF == 1 || LogTF == 3)//闇�瑕佸垽鏂潈闄� + { + //鏍规嵁鐢ㄦ埛鍚嶇О鍒ゆ柇鏉冮檺 + DsUser = oCn.RunProcReturn("select * from gy_czygl where czymc='" + UserID.Trim() + "'", "gy_czygl"); + if (DsUser.Tables[0].Rows.Count == 0) + { + if (Msg == true) + { + return false; + //MessageBox.Show("娌℃湁鎵惧埌褰撳墠鎿嶄綔鍛橈紒", "鎻愮ず"); + } + return false; + } + //鏍规嵁鐢ㄦ埛鍚嶇О鍒ゆ柇鏉冮檺 + if ((bool)DsUser.Tables[0].Rows[0]["ManagerFlag"]) //鏄惁绠$悊鍛� + { + HavRight = true; + } + else + { + if (DsUser.Tables[0].Rows[0]["AuthorityID"].ToString().Trim().Substring((int)ModID - 1, 1) == "1") + { + HavRight = true; + } + else + { + //鑾峰彇鐢ㄦ埛缁� 骞跺惊鐜垽鏂潈闄� + //鍒ゆ柇瑙掕壊鏄惁鏈夋潈闄� + DsJS = oCn.RunProcReturn("select isnull(AuthorityID,'') AuthorityID from System_UserGroupinfo a inner join System_UserGroup b on a.GroupID=b.GroupID " + + " Where a.USERID='" + UserID.Trim() + "'", "gy_czygl"); + if (DsJS == null) + { + HavRight = false; + } + else + { + HavRight = false; + for (int i = 0; i < DsJS.Tables[0].Rows.Count; i++) + { + if (ClsPub.isStrNull(DsJS.Tables[0].Rows[i]["AuthorityID"]).Length > ModID) + { + if (DsJS.Tables[0].Rows[i]["AuthorityID"].ToString().Trim().Substring((int)ModID - 1, 1) == "1") + { + HavRight = true; + break; + } + } + } + + } + } + } + + if (HavRight == false) + { + if (Msg == true) + { + return false; + //MessageBox.Show("鎮ㄦ病鏈夋潈闄�,璇蜂笌绠$悊鍛樿仈绯伙紒", "鎻愮ず"); + } + } + } + //闇�瑕佸啓鍏ユ棩蹇� + if ((LogTF == 1 && HavRight) || LogTF == 2) + { + Add_Log(Ds.Tables[0].Rows[0]["id"].ToString().Trim(), gnsy + "," + Ds.Tables[0].Rows[0]["gnmc"].ToString().Trim(), CurUserName); + } + return HavRight; + } + catch (Exception e) + { + if (Msg == true) + { + return false; + //MessageBox.Show("鍒ゆ柇鏉冮檺鏃跺彂鐜伴敊璇�,璇蜂笌绠$悊鍛樿仈绯伙紒", "鎻愮ず"); + } + return false; + } + } + //鍒ゆ柇鏄兘瀛樺湪鏉冮檺,骞跺啓鍏ユ棩蹇� public static bool Security_Log(string gnsy, int LogTF, bool Msg, string CurUserName, ClsSqlHelper oCn) { diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs index 97f9cf9..0db5c60 100644 --- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs @@ -373,12 +373,12 @@ } if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere, "h_v_Gy_MouldFileList"); + ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere+ "order by 鏃ユ湡 desc", "h_v_Gy_MouldFileList"); } else { string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere + "order by 鏃ユ湡 desc"; ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList"); } if (ds == null || ds.Tables[0].Rows.Count == 0) @@ -425,12 +425,12 @@ { if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere, "h_v_Gy_CheckToolsFileMainList"); + ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere+ "order by 鏃ユ湡 desc", "h_v_Gy_CheckToolsFileMainList"); } else { string sql1 = "select * from h_v_Gy_CheckToolsFileMainList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere + "order by 鏃ユ湡 desc"; ds = oCN.RunProcReturn(sql, "h_v_Gy_CheckToolsFileMainList"); } if (ds == null || ds.Tables[0].Rows.Count == 0) @@ -473,12 +473,12 @@ { if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere, "h_v_IF_BarCodeBillList"); + ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere+ "order by 鏃ユ湡 desc", "h_v_IF_BarCodeBillList"); } else { string sql1 = "select * from h_v_IF_BarCodeBillList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere + "order by 鏃ユ湡 desc"; ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList"); } if (ds == null || ds.Tables[0].Rows.Count == 0) diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs index 964cfac..f35ce97 100644 --- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs +++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs @@ -41,22 +41,11 @@ string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList"); } - if (ds == null || ds.Tables[0].Rows.Count == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; - objJsonResult.data = ds.Tables[0]; - return objJsonResult; - } + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; } catch (Exception e) { @@ -68,6 +57,34 @@ } } + /// <summary> + /// 閲囪喘璁㈠崟 鍒嗛厤 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Cg_POOrderBill/distribut")] + [HttpPost] + public object distribut(string Hmainid, string HSupplierId) + { + try + { + string sql = $"update銆�Cg_POOrderBillMain銆� set HBusinessStatus = 2 ,HEmpID ={Hmainid} where HInterID in ({HSupplierId})"; + oCN.RunProc(sql); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鎿嶄綔鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } // diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs index 37e6306..23c5b43 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs @@ -481,7 +481,7 @@ //} //鍒ゆ柇鏉冮檺 - if (!ClsPub.Security_Log("MES_StationEntrustInBill_Edit", 1, true, CurUserName)) + if (!ClsPub.Security_Log_second("MES_StationEntrustInBill_Edit", 1, true, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -745,7 +745,7 @@ { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustInBill_Delete", 1, true, HDeleteMan)) + if (!DBUtility.ClsPub.Security_Log_second("MES_StationEntrustInBill_Delete", 1, true, HDeleteMan)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs index aafe991..f59c1fd 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs @@ -88,7 +88,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepInBillList", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBillList", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -219,7 +219,7 @@ ListModels oListModels = new ListModels(); try { - if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepInBill_Edit", 1, true, msg4)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Edit", 1, true, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -352,7 +352,7 @@ public object DeltetMouldMoveStockStepInBill(string HInterID,string user) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepInBill_Delete", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Delete", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs index 18b9656..345f3ec 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs @@ -88,7 +88,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepOutBillList", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBillList", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -119,11 +119,11 @@ string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepOutBill where (璋冨嚭缁勭粐='" + Organization + "' or 璋冨叆缁勭粐='" + Organization + "')"); if (sWhere == null || sWhere.Equals("")) { - return new SQLHelper.ClsCN().RunProcReturn(sql1, "h_v_Sc_MouldMoveStockStepOutBill"); + return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldMoveStockStepOutBill"); } else { - string sql = sql1 + sWhere; + string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc"; return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutBill"); } @@ -220,7 +220,7 @@ ListModels oListModels = new ListModels(); try { - if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepOutBill_Edit", 1, true, msg4)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Edit", 1, true, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -353,7 +353,7 @@ public object DeltetMouldMoveStockStepOutBil(string HInterID,string user) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepOutBill_Delete", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Delete", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs index 63ede87..b833c56 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs @@ -88,7 +88,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherOutBillList", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBillList", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -218,7 +218,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherOutBill_Edit", 1, true, msg4)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Edit", 1, true, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -351,7 +351,7 @@ public object DeltetMouldOtherOutBill(string HInterID,string user) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBill_Delete", 1, true,user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherInBill_Delete", 1, true,user)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs index c53cc3a..c4b5b1d 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs @@ -28,7 +28,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBillList", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -92,7 +92,7 @@ public object set_DeleteBill(string HInterID,string user) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Delete", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -186,7 +186,7 @@ try { //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -293,7 +293,7 @@ try { //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -478,7 +478,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Edit", 1, true, msg4)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs index b626274..3008bcc 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs @@ -88,7 +88,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdMoveBillList", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBillList", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -220,7 +220,7 @@ ListModels oListModels = new ListModels(); try { - if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdMoveBill_Edit", 1, true, msg4)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Edit", 1, true, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -353,7 +353,7 @@ public object DeltetMouldProdMoveBilll(string HInterID,string user) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdMoveBill_Delete", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Delete", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs index f847731..8a698fb 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs @@ -28,7 +28,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairChangeBillList", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBillList", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -69,12 +69,12 @@ { if (sWhere == null || sWhere.Equals("")) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairChangeBillList " + sWhere, "h_v_Sc_MouldRepairChangeBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairChangeBillList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Sc_MouldRepairChangeBillList"); } else { string sql1 = "select * from h_v_Sc_MouldRepairChangeBillList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc"; return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairChangeBillList"); } @@ -92,7 +92,7 @@ public object set_DeleteBill(string HInterID,string user) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairChangeBill_Delete", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -186,7 +186,7 @@ try { ////瀹℃牳鏉冮檺 - //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; @@ -293,7 +293,7 @@ try { ////瀹℃牳鏉冮檺 - //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; @@ -426,7 +426,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairChangeBill_Edit", 1, true, msg3)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Edit", 1, true, msg3)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs index 2039340..e92fe3e 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs @@ -31,7 +31,7 @@ if (ds == null) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairOut_SingleBillList", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBillList", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -91,7 +91,7 @@ public object set_DeleteBill(string HInterID,string user) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairOut_SingleBill_Delete", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Delete", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -192,7 +192,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairOut_SingleBill_Edit", 1, true, msg4)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Edit", 1, true, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -380,7 +380,7 @@ try { //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -487,7 +487,7 @@ try { //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs index 7c75a5d..c7f92e8 100644 --- a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs +++ b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs @@ -28,7 +28,7 @@ try { //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -135,7 +135,7 @@ try { //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -238,7 +238,7 @@ public object set_DeleteBill(string HInterID,string user) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapInBill_Delete", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Delete", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -324,7 +324,7 @@ try { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapRequestBillList", 1, true, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapRequestBillList", 1, true, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs index 87a6e09..57df213 100644 --- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs +++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs @@ -223,7 +223,7 @@ public object DeltetEquipDotCheckBillList(string HInterID) { //缂栬緫鏉冮檺 - //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) + //if (!DBUtility.ClsPub.Security_Log_second("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs index b79de9e..d1e3917 100644 --- a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs +++ b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs @@ -326,7 +326,7 @@ public object DeltetMouldLifeChangeBill(string HInterID) { //缂栬緫鏉冮檺 - //if (!DBUtility.ClsPub.Security_Log("Sc_ICMOReportBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) + //if (!DBUtility.ClsPub.Security_Log_second("Sc_ICMOReportBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; @@ -420,7 +420,7 @@ try { //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs index 67934a1..d44c377 100644 --- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs +++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs @@ -205,7 +205,7 @@ { DBUtility.ClsPub.CurUserName = UserName; //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -292,7 +292,7 @@ try { //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -476,7 +476,7 @@ string refSav = sArray[2].ToString(); DBUtility.ClsPub.CurUserName = UserName; //淇濆瓨鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs index 7e97691..9c88759 100644 --- a/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs +++ b/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs @@ -200,7 +200,7 @@ { DBUtility.ClsPub.CurUserName = UserName; //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("MES_MESEndWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -287,7 +287,7 @@ try { //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -432,7 +432,7 @@ DBUtility.ClsPub.CurUserName = UserName; //淇濆瓨鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("MES_MESEndWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs index 1d74b02..0f5460d 100644 --- a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs +++ b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs @@ -192,7 +192,7 @@ { DBUtility.ClsPub.CurUserName = UserName; //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("MES_MESStopWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -280,7 +280,7 @@ try { //瀹℃牳鏉冮檺 - if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -425,7 +425,7 @@ DBUtility.ClsPub.CurUserName = UserName; //淇濆瓨鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("MES_MESStopWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName)) + if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs index b4bf9a6..a3de72c 100644 --- a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs +++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs @@ -71,7 +71,7 @@ public static DataSet Sc_CheckToolsRepairWorkBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsRepairWorkBillList ", "h_v_Sc_CheckToolsRepairWorkBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsRepairWorkBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsRepairWorkBillList"); } @@ -123,7 +123,7 @@ public static DataSet Sc_CheckToolsDotCheckPlanBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckPlanBillList ", "h_v_Sc_CheckToolsDotCheckPlanBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckPlanBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsDotCheckPlanBillList"); } #endregion @@ -171,7 +171,7 @@ public static DataSet Sc_CheckToolsMaintainBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsMaintainBillList ", "h_v_Sc_CheckToolsMaintainBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsMaintainBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsMaintainBillList"); } #endregion @@ -280,7 +280,7 @@ public static DataSet Sc_MouldDotCheckPlanBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckPlanBillList ", "h_v_Sc_MouldDotCheckPlanBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckPlanBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldDotCheckPlanBillList"); } #endregion @@ -328,7 +328,7 @@ public static DataSet Sc_MouldDotCheckBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 "+sWhere+" ", "h_v_Sc_MouldDotCheckBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 "+sWhere+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldDotCheckBillList"); } #endregion @@ -377,7 +377,7 @@ public static DataSet Sc_CheckToolsMaintainPlanBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsMaintainPlanBillList ", "h_v_Sc_CheckToolsMaintainPlanBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsMaintainPlanBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsMaintainPlanBillList"); } #endregion @@ -426,7 +426,7 @@ public static DataSet Sc_MouldMaintainPlanBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainPlanBillList ", "h_v_Sc_MouldMaintainPlanBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainPlanBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldMaintainPlanBillList"); } #endregion @@ -573,7 +573,7 @@ public static DataSet Sc_CheckToolsRepairCheckBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsRepairCheckBillList ", "h_v_Sc_CheckToolsRepairCheckBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsRepairCheckBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsRepairCheckBillList"); } #endregion @@ -689,7 +689,7 @@ public static DataSet Sc_CheckToolsConkBookBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsConkBookBillList ", "h_v_Sc_CheckToolsConkBookBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsConkBookBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsConkBookBillList"); } #endregion @@ -738,7 +738,7 @@ public static DataSet Sc_CheckToolsDotCheckBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckBillList ", "h_v_Sc_CheckToolsDotCheckBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsDotCheckBillList"); } #endregion @@ -787,7 +787,7 @@ public static DataSet Sc_GetMoveStockBillList(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MoveStockBillList ", "h_v_IF_MoveStockBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MoveStockBillList order by 鏃ユ湡 desc", "h_v_IF_MoveStockBillList"); } #endregion @@ -835,7 +835,7 @@ public static DataSet Sc_GetMateOutBillList(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBillList ", "h_v_IF_MateOutBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBillList order by 鏃ユ湡 desc", "h_v_IF_MateOutBillList"); } #endregion @@ -884,7 +884,7 @@ public static DataSet Sc_GetSellOutBillList(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList ", "h_v_IF_SellOutBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList order by 鏃ユ湡 desc", "h_v_IF_SellOutBillList"); } #endregion @@ -933,7 +933,7 @@ public static DataSet Sc_GetOtherOutBillList(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_OtherOutBillList ", "h_v_Kf_OtherOutBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_OtherOutBillList order by 鏃ユ湡 desc", "h_v_Kf_OtherOutBillList"); } #endregion @@ -1031,7 +1031,7 @@ public static DataSet Sc_GetPOStockInBill(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POStockInBillList ", "h_v_IF_POStockInBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POStockInBillList order by 鏃ユ湡 desc", "h_v_IF_POStockInBillList"); } #endregion @@ -1081,7 +1081,7 @@ public static DataSet Sc_GetProductInBill(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductInBillList ", "h_v_IF_ProductInBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductInBillList order by 鏃ユ湡 desc", "h_v_IF_ProductInBillList"); } #endregion @@ -1130,7 +1130,7 @@ public static DataSet Sc_GetOtherInBill(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_OtherInBillList ", "h_v_Kf_OtherInBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_OtherInBillList order by 鏃ユ湡 desc ", "h_v_Kf_OtherInBillList"); } #endregion -- Gitblit v1.9.1