diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index 613af772..70b2ac3e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -430,18 +430,22 @@ public class InProduceOrderController extends BaseController { datas = new ArrayList<>(); list.stream().filter(it -> Objects.equals(it.getParentId(), 0L)) .forEach(it -> { - List children = list.stream() - .filter(child -> Objects.equals(child.getParentId(), it.getId())) - .toList(); +// List children = list.stream() +// .filter(child -> Objects.equals(child.getParentId(), it.getId())) +// .toList(); Integer type = bomService.getScanType(it.getMaterialNo()); - children.forEach(child -> { - child.setNum(NumberUtil.multiply(child.getNum(), it.getNum())); - child.setQiTao(false); - if (Objects.equals(type, 0)) { - child.setMustScan(false); - } - }); - datas.addAll(children); +// children.forEach(child -> { +// child.setNum(NumberUtil.multiply(child.getNum(), it.getNum())); +// child.setQiTao(false); +// if (Objects.equals(type, 0)) { +// child.setMustScan(false); +// } +// }); +// datas.addAll(children); + it.setQiTao(bomService.isQiTao(it.getMaterialNo())); + if (Objects.equals(type, 0)) { + it.setMustScan(false); + } }); } else { datas = list;