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

王 垚

2021-11-17 ba6d2fff0224e8694c782a7e1154d0abd7a32c20

 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;