From 1db36d34d9be09afbd85ca08d75af7080abeb9ee Mon Sep 17 00:00:00 2001 From: "xiaowei.song" Date: Thu, 16 Nov 2023 09:41:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=20=E6=A0=B9=E6=8D=AE=E8=AE=A1=E5=88=92ID?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/mes/pro/ProWorkplanController.cs | 10 +++++++--- ZR.Service/mes/pro/IService/IProWorkplanService.cs | 2 +- ZR.Service/mes/pro/ProWorkplanService.cs | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs index 816242a6..d6dc1f28 100644 --- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs @@ -105,7 +105,7 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro if (!string.IsNullOrEmpty(id)) { - lst = proWorkplanService.GetWorkorderList(id); + lst = proWorkplanService.GetWorkorderListByPlanId(id); } return ToResponse(new ApiResult(200, "success", lst)); @@ -136,17 +136,21 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro List lstWorkplan = proWorkplanService.GetProWorkplanById(workPlanId); // 查询所有生产工单 - List lstWorkorder = proWorkplanService.GetWorkorderList(workorderId); + List lstWorkorder = proWorkplanService.GetWorkorderListByPlanId(workPlanId); // 计算所有工单的数量和，生产计划的数量：比较 if(lstWorkplan!=null && lstWorkplan.Count==1) { int countWorkplan = int.Parse(lstWorkplan[0].ActualplanNumber.Trim()); + + // 计算已有工单的计划数 int countWorkorder = 0; foreach (ProWorkorder item in lstWorkorder) { countWorkorder += item.Actualnumber.GetValueOrDefault(); } + + // 再加上当前订单计划数 countWorkorder += proWorkorder.Actualnumber.GetValueOrDefault(); // 计划数>0 计划数要大于等于当前工单总数 @@ -186,7 +190,7 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro string isArrange = "0"; // 查询所有生产工单，根据生产计划ID - List lstWorkorder = proWorkplanService.GetWorkorderList(workPlanId); + List lstWorkorder = proWorkplanService.GetWorkorderListByPlanId(workPlanId); // 找到要更新的工单，要判断当前工单状态 ProWorkorder currentWorkorder = null; diff --git a/ZR.Service/mes/pro/IService/IProWorkplanService.cs b/ZR.Service/mes/pro/IService/IProWorkplanService.cs index d36708bc..fe371233 100644 --- a/ZR.Service/mes/pro/IService/IProWorkplanService.cs +++ b/ZR.Service/mes/pro/IService/IProWorkplanService.cs @@ -32,7 +32,7 @@ namespace ZR.Service.mes.pro.IService /// /// /// - public List GetWorkorderList(string id); + public List GetWorkorderListByPlanId(string id); /// /// 根据工单ID，获取工单 diff --git a/ZR.Service/mes/pro/ProWorkplanService.cs b/ZR.Service/mes/pro/ProWorkplanService.cs index d9281cb7..1aa6cbc0 100644 --- a/ZR.Service/mes/pro/ProWorkplanService.cs +++ b/ZR.Service/mes/pro/ProWorkplanService.cs @@ -55,7 +55,7 @@ namespace ZR.Service.mes.pro return Context.Deleteable().In(id).ExecuteCommand(); } - public List GetWorkorderList(string id) + public List GetWorkorderListByPlanId(string id) { return Context.Queryable().Where(it => it.FkProPlanId == id).ToList(); }