diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs index 049325ba..816242a6 100644 --- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs @@ -253,7 +253,27 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro int data = 0; if (!string.IsNullOrEmpty(id)) { - data = proWorkplanService.DeleteWorkorder(id); + // 查询所有生产工单,根据生产计划ID + List lstWorkorder = proWorkplanService.GetWorkorderListById(id); + + if (lstWorkorder != null && lstWorkorder.Count == 1) + { + string isArrange = "0"; + + // 排产状态非空 + if (!string.IsNullOrEmpty(lstWorkorder[0].Isarrange)) + { + isArrange = lstWorkorder[0].Isarrange; + } + + // 排产状态为 0 ,可执行删除 + if ("0".Equals(isArrange)) + { + data = proWorkplanService.DeleteWorkorder(id); + } + else data = 2; + } + } return ToResponse(new ApiResult(200, "success", data)); diff --git a/ZR.Service/mes/pro/IService/IProWorkplanService.cs b/ZR.Service/mes/pro/IService/IProWorkplanService.cs index d0565dbc..d36708bc 100644 --- a/ZR.Service/mes/pro/IService/IProWorkplanService.cs +++ b/ZR.Service/mes/pro/IService/IProWorkplanService.cs @@ -34,6 +34,13 @@ namespace ZR.Service.mes.pro.IService /// public List GetWorkorderList(string id); + /// + /// 根据工单ID,获取工单 + /// + /// + /// + public List GetWorkorderListById(string id); + public int AddWorkorder(ProWorkorder proWorkorder); public int UpdateWorkorder(ProWorkorder proWorkorder); diff --git a/ZR.Service/mes/pro/ProWorkplanService.cs b/ZR.Service/mes/pro/ProWorkplanService.cs index c9842456..d9281cb7 100644 --- a/ZR.Service/mes/pro/ProWorkplanService.cs +++ b/ZR.Service/mes/pro/ProWorkplanService.cs @@ -60,6 +60,11 @@ namespace ZR.Service.mes.pro return Context.Queryable().Where(it => it.FkProPlanId == id).ToList(); } + public List GetWorkorderListById(string id) + { + return Context.Queryable().Where(it => it.Id == id).ToList(); + } + public int AddWorkorder(ProWorkorder proWorkorder) {