From 4b9c5b540cd3a5559d7c73d8b56c79c4a8ea79fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Fri, 3 Apr 2026 08:35:58 +0800
Subject: [PATCH] =?UTF-8?q?refactor(in-produce-order):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=85=A5=E5=BA=93=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=AD=90=E9=A1=B9=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除原有的子项过滤和处理流程
- 直接对父项设置齐套标记
- 统一处理物料扫描类型的必扫标识设置
- 简化数据结构处理逻辑
- 提升代码可读性和维护性
---
 .../controller/InProduceOrderController.java  | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

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<InProduceOrderItemVO> children = list.stream()
-                                .filter(child -> Objects.equals(child.getParentId(), it.getId()))
-                                .toList();
+//                        List<InProduceOrderItemVO> 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;