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

YL

2022-01-19 681c617b48ddbc556fdbe6a251161a3b9584adab

 WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs

@@ -93,14 +93,14 @@
        public object set_DeleteBill(string HInterID,string user)
        {
            //编辑权限
            //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, false, user))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "无删除权限！";
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无删除权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            string s = "";
            Int64 lngBillKey = 0;
            try
@@ -192,20 +192,19 @@
        [HttpGet]
        public object set_CheckBill(int HInterID, string CurUserName)
        {
            //string ModRightNameCheck = "Sc_MouldRepairOut_SingleBill_Check";
            DBUtility.ClsPub.CurUserName = CurUserName;
            DLL.ClsSc_MouldRepairChangeBill oBill = new DLL.ClsSc_MouldRepairChangeBill();
            try
            {
                ////审核权限
                //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "审核失败！无权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Check", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //审核前判断是否允许
                string s = "";
                if (!DBUtility.Xt_BaseBillFun.Fun_AllowCheckBill(oBill, ref s))