From 0b9e075066b540c5452b667afe617d4463c1cbca Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期二, 19 十月 2021 08:52:32 +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/MJGL/Sc_MouldRepairChangeBillController.cs         |   10 +-
 WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs             |    2 
 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     |    6 
 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 
 15 files changed, 155 insertions(+), 45 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/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 0879ade..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;
@@ -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 ac6c55c..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;
@@ -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;

--
Gitblit v1.9.1