mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：首页生产工单接口开发（包括工序进度）优化

Browse Source
This commit is contained in:
zhangxuanming 2025-01-21 11:43:23 +08:00
parent 5d1b0da8f6
commit 72ad3a44cf
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProWorkorderServiceImpl.java
View File

@ -188,13 +188,18 @@ public class ProWorkorderServiceImpl implements IProWorkorderService
// 遍历构造 // 遍历构造
List<ProWorkorderHomeVO> proWorkorders = new ArrayList<>(); List<ProWorkorderHomeVO> proWorkorders = new ArrayList<>();
workorders.stream().forEach(item -> { workorders.forEach(item -> {
ProWorkorderHomeVO proWorkorderHomeVO = new ProWorkorderHomeVO(); ProWorkorderHomeVO proWorkorderHomeVO = new ProWorkorderHomeVO();
BeanUtil.copyProperties(item, proWorkorderHomeVO); BeanUtil.copyProperties(item, proWorkorderHomeVO);
proWorkorders.add(proWorkorderHomeVO);
Long productId = item.getProductId(); Long productId = item.getProductId();
List<ProRouteHomeVO> processes = routeMap.get(productId); List<ProRouteHomeVO> proRouteHomeVOS = routeMap.get(productId);
if (processes != null && processes.size() > 0) { if (proRouteHomeVOS != null && proRouteHomeVOS.size() > 0) {
List<ProRouteHomeVO> processes = new ArrayList<>();
proRouteHomeVOS.forEach(entity -> {
ProRouteHomeVO proRouteHomeVO = new ProRouteHomeVO();
BeanUtil.copyProperties(entity, proRouteHomeVO);
processes.add(proRouteHomeVO);
});
processes.forEach(val -> { processes.forEach(val -> {
val.setTotal(item.getQuantity()); val.setTotal(item.getQuantity());
List<ProFeedback> collect = feedbacks.stream().filter(entity -> List<ProFeedback> 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); BigDecimal reduce = collect.stream().map(ProFeedback::getQuantityFeedback).reduce(BigDecimal.ZERO, BigDecimal::add);
val.setCompleteNumber(reduce); val.setCompleteNumber(reduce);
val.setIncompleteNumber(val.getTotal().subtract(val.getCompleteNumber())); val.setIncompleteNumber(val.getTotal().subtract(val.getCompleteNumber()));
} else {
val.setCompleteNumber(BigDecimal.ZERO);
val.setIncompleteNumber(val.getTotal().subtract(val.getCompleteNumber()));
} }
}); });
proWorkorderHomeVO.setRouteHomg(processes); proWorkorderHomeVO.setRouteHomg(processes);
} }
proWorkorders.add(proWorkorderHomeVO);
}); });
// 构建工单树结构数据 // 构建工单树结构数据