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

ch

2022-01-19 a09ff1d01aeebae9037118035f10e06c570b092e

 WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs

@@ -27,7 +27,7 @@
        {
            try
            {
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
@@ -93,23 +93,12 @@
            DLL.ClsGy_EquipFileMain oBill = new DLL.ClsGy_EquipFileMain();
            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
            {
                bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
                if (IsDete)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.RunProc("Delete From Gy_EquipFileBillMain  where HInterID=" + lngBillKey);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功";
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {