From 72ad3a44cf81d019eef5bfcb5702b525c071e609 Mon Sep 17 00:00:00 2001 From: zhangxuanming <2260476558@qq.com> Date: Tue, 21 Jan 2025 11:43:23 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=A6=96=E9=A1=B5=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=B7=A5=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= =?UTF-8?q?=EF=BC=88=E5=8C=85=E6=8B=AC=E5=B7=A5=E5=BA=8F=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=EF=BC=89=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProWorkorderServiceImpl.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProWorkorderServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProWorkorderServiceImpl.java index 4029776..c50ec37 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProWorkorderServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProWorkorderServiceImpl.java @@ -188,13 +188,18 @@ public class ProWorkorderServiceImpl implements IProWorkorderService // 遍历构造 List proWorkorders = new ArrayList<>(); - workorders.stream().forEach(item -> { + workorders.forEach(item -> { ProWorkorderHomeVO proWorkorderHomeVO = new ProWorkorderHomeVO(); BeanUtil.copyProperties(item, proWorkorderHomeVO); - proWorkorders.add(proWorkorderHomeVO); Long productId = item.getProductId(); - List processes = routeMap.get(productId); - if (processes != null && processes.size() > 0) { + List proRouteHomeVOS = routeMap.get(productId); + if (proRouteHomeVOS != null && proRouteHomeVOS.size() > 0) { + List processes = new ArrayList<>(); + proRouteHomeVOS.forEach(entity -> { + ProRouteHomeVO proRouteHomeVO = new ProRouteHomeVO(); + BeanUtil.copyProperties(entity, proRouteHomeVO); + processes.add(proRouteHomeVO); + }); processes.forEach(val -> { val.setTotal(item.getQuantity()); List collect = feedbacks.stream().filter(entity -> @@ -206,10 +211,14 @@ public class ProWorkorderServiceImpl implements IProWorkorderService BigDecimal reduce = collect.stream().map(ProFeedback::getQuantityFeedback).reduce(BigDecimal.ZERO, BigDecimal::add); val.setCompleteNumber(reduce); val.setIncompleteNumber(val.getTotal().subtract(val.getCompleteNumber())); + } else { + val.setCompleteNumber(BigDecimal.ZERO); + val.setIncompleteNumber(val.getTotal().subtract(val.getCompleteNumber())); } }); proWorkorderHomeVO.setRouteHomg(processes); } + proWorkorders.add(proWorkorderHomeVO); }); // 构建工单树结构数据