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

zzr99

2021-11-25 6e3a6edf27dda15e99e0d0917eea77f561e7a18f

 WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs

File was renamed from WebAPI/Controllers/生产管理/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;
@@ -357,7 +357,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (BillOld.omodel.HChecker != "")
                if (oBill.omodel.HChecker != "")
                {
                    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;