From d6c51bc220c1cc59213f92d75511d81128268f0d Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 1 Jun 2026 15:40:00 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A6=85=E9=81=93bug#1595=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9B2=E3=80=81=E8=AE=A2=E5=8D=95=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E9=83=A8=E4=BB=B6?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=BF=87=E6=BB=A4mycat=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/plan/PlanServiceImpl.java         | 11 ++-
 .../resources/mapper/order/OrderMapper.xml    | 67 +++++--------------
 2 files changed, 28 insertions(+), 50 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
index 8b8445a3a..5579ed3b9 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
@@ -1848,8 +1848,14 @@ public class PlanServiceImpl implements PlanService {
                     .set(OrderDO::getVersion, version + 1);
             Integer orderDOStatus = orderDO.getStatus();
             // 更新订单排单状态
-            if (ObjectUtil.equals(orderDOStatus, OrderStatusEnum.SORTED.getStatus())) {
+            if (ObjectUtil.equals(orderDOStatus, OrderStatusEnum.NEW_ORDER.getStatus())) {
                 // 如果订单下已经没有排单板件，更新订单为新单
+                if (num > 0) {
+                    updateWrapper.set(OrderDO::getStatus, OrderStatusEnum.SORTED.getStatus());
+                }
+            }
+            // 如果订单下已经没有排单板件，更新订单为新单
+            if (ObjectUtil.equals(orderDOStatus, OrderStatusEnum.SORTED.getStatus())) {
                 if (num == 0) {
                     updateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus());
                 }
@@ -1859,6 +1865,9 @@ public class PlanServiceImpl implements PlanService {
                 throw new ServiceException(ErrorCodeConstants.CREATE_PLAN_ORDER_UPDATE_CONCURRENCY_ERROR, orderId);
             }
         }
+//        if (1 == 1) {
+//            throw new ServiceException(null);
+//        }
     }
 
     /**
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
index 81b8aaf31..2c00f1452 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
@@ -30,23 +30,25 @@
 
     <select id="selectMainPage" resultType="com.cf.imes.module.executor.dal.dataobject.order.OrderDO">
 
-        SELECT
-        o.*
-
+        SELECT o.*
         FROM orders o
-
         JOIN (
-
-        SELECT
-        root_id
-        FROM (
-
-        SELECT
+        SELECT DISTINCT
         IF(t.parent_id = 0, t.id, t.parent_id) AS root_id
         FROM orders t
 
+        <!-- ✅ 只有需要 processStatus 才 join oc -->
+        <if test="reqVO.processStatus != null">
+            JOIN order_component oc
+            ON oc.order_id = t.id
+            AND oc.deleted = 0
+            AND oc.pid = 0
+            AND oc.organ_id = 1
+        </if>
+
         WHERE 1 = 1
 
+        <!-- ===== 订单条件 ===== -->
         <if test="reqVO.id != null and reqVO.id != ''">
             AND CAST(t.id AS CHAR) LIKE CONCAT('%', #{reqVO.id}, '%')
         </if>
@@ -127,69 +129,36 @@
             AND t.create_time BETWEEN #{reqVO.createTime[0]} AND #{reqVO.createTime[1]}
         </if>
 
-        <!-- 部件装配状态过滤（单选）：加在子订单的过滤条件中 -->
+        <!-- ===== 只有存在 processStatus 才加过滤 ===== -->
         <if test="reqVO.processStatus != null">
+
             <choose>
-                <!-- 0. 不加工 -->
+
                 <when test="reqVO.processStatus == 0">
-                    AND EXISTS (
-                    SELECT 1
-                    FROM order_component oc
-                    WHERE oc.order_id = t.id
-                    AND oc.deleted = 0
-                    AND oc.pid = 0
                     AND oc.extra_process_status = 0
-                    )
                 </when>
 
-                <!-- 1. 未加工 -->
                 <when test="reqVO.processStatus == 1">
-                    AND EXISTS (
-                    SELECT 1
-                    FROM order_component oc
-                    WHERE oc.order_id = t.id
-                    AND oc.deleted = 0
-                    AND oc.pid = 0
                     AND oc.process_status = 1
                     AND oc.extra_process_status IS NULL
-                    )
                 </when>
 
-                <!-- 2. 已加工 -->
                 <when test="reqVO.processStatus == 2">
-                    AND EXISTS (
-                    SELECT 1
-                    FROM order_component oc
-                    WHERE oc.order_id = t.id
-                    AND oc.deleted = 0
-                    AND oc.pid = 0
                     AND oc.process_status = 2
-                    )
                 </when>
 
-                <!-- 3. 部分加工 -->
                 <when test="reqVO.processStatus == 3">
-                    AND EXISTS (
-                    SELECT 1
-                    FROM order_component oc
-                    WHERE oc.order_id = t.id
-                    AND oc.deleted = 0
-                    AND oc.pid = 0
                     AND oc.extra_process_status = 3
-                    )
                 </when>
+
             </choose>
+
         </if>
 
         AND t.deleted = #{reqVO.deleted}
 
         ) tmp
-
-        GROUP BY root_id
-
-        ) root_order
-
-        ON root_order.root_id = o.id
+        ON tmp.root_id = o.id
 
         WHERE o.parent_id = 0