llj
2025-10-13 1c6d93e7299e068b85e1c945ed9b14d0f9795b40
智云MES测试记录20250923
2个文件已修改
48 ■■■■ 已修改文件
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
@@ -379,6 +379,24 @@
                }
                else
                {
                    string s = "";
                    if (BillOld.ShowBill(oBill.omodel.HInterID, ref s) == false)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据有误!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    //判断是否可编辑
                    if (oBill.omodel.HChecker != "" && oBill.omodel.HChecker != null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据已经被审核,不允许修改!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                if (bResult)
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -24,7 +24,7 @@
        /// <returns></returns>
        [Route("Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList")]
        [HttpGet]
        public object GetEquipMaintainPlanBillList(string sWhere,string user)
        public object GetEquipMaintainPlanBillList(string sWhere, string user)
        {
            try
            {
@@ -278,6 +278,25 @@
                }
                else
                {
                    string s = "";
                    if (BillOld.ShowBill(oBill.omodel.HInterID, ref s) == false)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据有误!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    //判断是否可编辑
                    if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据已经被审核,不允许修改!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                if (bResult)
@@ -315,7 +334,7 @@
        /// <returns></returns>
        [Route("Sb_EquipMaintainPlanBill/DeltetEquipMaintainPlanBillList")]
        [HttpGet]
        public object DeltetEquipMaintainPlanBillList(string HInterID,string user)
        public object DeltetEquipMaintainPlanBillList(string HInterID, string user)
        {
            if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainPlanBill_Delete", 1, false, user))
            {
@@ -509,7 +528,7 @@
        [HttpGet]
        public object Sb_EquipMaintainPlanBill_PlanList(string HInterID, string HDate)
        {
            DataSet ds,ds1;
            DataSet ds, ds1;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -690,7 +709,7 @@
                        objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    }
                }
                oCN.Commit();//提交事务
@@ -785,7 +804,7 @@
                        objJsonResult.Message = "关闭失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    }
                }
                else
                {
@@ -851,6 +870,5 @@
        #endregion
        #endregion
    }
}