From 39b870a95055976844486a3164ec14cf7e8ef202 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 29 Jun 2026 17:33:41 +0800
Subject: [PATCH] =?UTF-8?q?getOrderSource=E8=8E=B7=E5=8F=96=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E6=9D=BF=E4=BB=B6?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/planitem/PlanItemMapper.xml    | 12 +++++++-----
 .../src/main/resources/mapper/plate/PlateMapper.xml | 13 +++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
index 6fc140535..856440797 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
@@ -484,9 +484,7 @@
         ob.name as bodyName,
         ob.room_name as roomName,
         og.name as processGroupName,
-        og.group_type_name as processGroupTypeName,
-        oc.name as componentName,
-        oc.id as componentId
+        og.group_type_name as processGroupTypeName
 
         FROM order_plate op
 
@@ -496,8 +494,7 @@
         AND op.goods_id = ogs.id
         left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id
         join order_body ob on ob.organ_id = op.organ_id and ob.order_id = op.order_id and ob.id = oi.body_id
-        join order_group og on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = oi.group_id
-        join order_component oc on oc.organ_id = op.organ_id and oc.order_id = op.order_id and oc.id = oi.comp_id
+        left join order_group og on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = oi.group_id
 
         WHERE op.organ_id = #{organId}
         and op.order_id in
@@ -506,6 +503,11 @@
         </foreach>
         AND op.deleted = false
         AND op.plan_id = #{planId}
+        AND (
+        (oi.group_id is not null and oi.group_id != 0)
+        or
+        (oi.group_id is null and oi.comp_id is null)
+        )
     </select>
 
     <select id="selectIsCuttingPlate" resultType="java.lang.Long">
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
index a427fbc65..e02e05498 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
@@ -413,21 +413,22 @@
         ob.name as bodyName,
         ob.room_name,
         og.name as processGroupName,
-        og.group_type_name as processGroupTypeName,
-        oc.name as componentName,
-        oc.id as componentId
+        og.group_type_name as processGroupTypeName
 
         from order_plate op
             join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id
             left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id
             join order_body ob on ob.organ_id = op.organ_id and ob.order_id = op.order_id and ob.id = oi.body_id
-            join order_group og on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = oi.group_id
-            join order_component oc on oc.organ_id = op.organ_id and oc.order_id = op.order_id and oc.id = oi.comp_id
+            left join order_group og on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = oi.group_id
 
         where op.organ_id = #{organId}
           and op.deleted = false
           and op.order_id = #{orderId}
-
+          and (
+            (oi.group_id is not null and oi.group_id != 0)
+                or
+            (oi.group_id is null and oi.comp_id is null)
+            )
     </select>