From ebfaee5cff4080a59ee294fced93bbdcf659348b Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 20 十月 2021 22:12:01 +0800
Subject: [PATCH] 用户关联供应商基础资料

---
 WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs |   55 ++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
index 889b21d..8a698fb 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
@@ -23,10 +23,20 @@
 
         [Route("Sc_MouldRepairChangeBill/Get_MouldRepairChangeBillList")]
         [HttpGet]
-        public object Get_MouldRepairChangeBillList(string sWhere)
+        public object Get_MouldRepairChangeBillList(string sWhere,string user)
         {
             try
             {
+                //缂栬緫鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBillList", 1, true, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
                 ds = Sc_GetMouldRepairChangeHouseBill(sWhere);
                 if (ds == null)
                 {
@@ -59,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");
             }
 
@@ -79,17 +89,17 @@
         /// <returns></returns>
         [Route("Sc_MouldRepairChangeBill/set_DeleteBill")]
         [HttpGet]
-        public object set_DeleteBill(string HInterID)
+        public object set_DeleteBill(string HInterID,string user)
         {
-            ////缂栬緫鏉冮檺
-            //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
-            //{
-            //    objJsonResult.code = "0";
-            //    objJsonResult.count = 0;
-            //    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
-            //    objJsonResult.data = null;
-            //    return objJsonResult;
-            //}
+            //缂栬緫鏉冮檺
+            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, true, user))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
 
             string s = "";
             Int64 lngBillKey = 0;
@@ -113,7 +123,7 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                if (oBill.omodel.HChecker != "")
+                if (oBill.omodel.HChecker != ""&& oBill.omodel.HChecker != null)
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -129,7 +139,7 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+                bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
                 if (IsDete)
                 {
                     objJsonResult.code = "1";
@@ -176,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;
@@ -283,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;
@@ -408,12 +418,23 @@
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             string msg2 = sArray[0].ToString();
             string refSav = sArray[1].ToString();
+            string msg3 = sArray[2].ToString();
 
             string UserName = "";
             string s = "";
             ListModels oListModels = new ListModels();
             try
             {
+                //缂栬緫鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Edit", 1, true, msg3))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
                 DLL.ClsSc_MouldRepairChangeBill oBill = new DLL.ClsSc_MouldRepairChangeBill();
                 List<Models.ClsSc_MouldRepairChangeBillMain> lsmain = new List<Models.ClsSc_MouldRepairChangeBillMain>();
                 msg2 = msg2.Replace("\\", "");

--
Gitblit v1.9.1