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); }); // 构建工单树结构数据