Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zzr99

2021-11-25 6e3a6edf27dda15e99e0d0917eea77f561e7a18f

 WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs

File was renamed from WebAPI/Controllers/生产管理/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;