From b894c24165368edc5621c351cff98e3780a883b8 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 5 Mar 2026 17:48:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=B8=85=E5=8D=95-=E9=83=A8?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E7=8A=B6=E6=80=81=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assemblylist/AssemblyListServiceImpl.java     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java
index 527c8a7d4..ad07b07f6 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java
@@ -90,12 +90,12 @@ public class AssemblyListServiceImpl implements AssemblyListService {
             return getNotProcessComponentList(reqVO, topIds);
         } else if (OrderComponentProcessStatusEnum.UNPROCESSED.equals(orderComponentProcessStatusEnum)) {
             // 未加工
-            return getUnProcessedComponentList(reqVO, topIds);
+            return getUnProcessedComponentList(reqVO, topIds, false);
         } else if (OrderComponentProcessStatusEnum.PROCESSED.equals(orderComponentProcessStatusEnum)) {
             // 已加工
             return getProcessedComponentList(reqVO, topIds);
         } else {
-            return getUnProcessedComponentList(reqVO, topIds);
+            return getUnProcessedComponentList(reqVO, topIds, true);
         }
     }
 
@@ -182,14 +182,14 @@ public class AssemblyListServiceImpl implements AssemblyListService {
      * @param reqVO
      * @return
      */
-    private List<OrderComponentRespVO> getUnProcessedComponentList(OrderDetailComponentListReqVO reqVO, List<Long> topIds) {
+    private List<OrderComponentRespVO> getUnProcessedComponentList(OrderDetailComponentListReqVO reqVO, List<Long> topIds, boolean showAll) {
         // 根据部件的topid查询树上所有已加工节点
         List<OrderComponentDO> topUnProcessedComponentList = orderComponentMapper.selectList(new LambdaQueryWrapperX<OrderComponentDO>()
                 .in(OrderComponentDO::getTopId, topIds)
                 .eq(OrderComponentDO::getOrderId, reqVO.getOrderId())
                 .eqIfPresent(OrderComponentDO::getDeleted, reqVO.isDeleted())
                 .likeIfPresent(OrderComponentDO::getName, reqVO.getName())
-                .ne(OrderComponentDO::getProcessStatus, OrderComponentProcessStatusEnum.PROCESSED.getStatus())
+                .neIfPresent(OrderComponentDO::getProcessStatus, showAll ? null : OrderComponentProcessStatusEnum.PROCESSED.getStatus())
                 .select(OrderComponentDO::getId, OrderComponentDO::getPid, OrderComponentDO::getName, OrderComponentDO::getProcessStatus));
 
         // 计算部件状态
@@ -317,8 +317,9 @@ public class AssemblyListServiceImpl implements AssemblyListService {
 
     /**
      * 逐级对比：当b状态不是已加工时，a的process是false，b的状态才是不加工
-     * @param a
-     * @param b
+     *
+     * @param a 配置
+     * @param b 部件数据
      */
     private void processRecursive(
             OrderComponentTreeCompareVO a,
@@ -327,8 +328,6 @@ public class AssemblyListServiceImpl implements AssemblyListService {
         // 1️⃣ 赋值当前层
         if (ObjectUtil.notEqual(OrderComponentProcessStatusEnum.PROCESSED.getStatus(), b.getProcessStatus())) {
             b.setProcessStatus(a.isProcess() ? OrderComponentProcessStatusEnum.UNPROCESSED.getStatus() : OrderComponentProcessStatusEnum.NOT_PROCESS.getStatus());
-        } else {
-            b.setProcessStatus(a.getProcessStatus());
         }
 
         // 2️⃣ 处理子节点