From aa49b47d1f969f74a4e31a6fc522ef4cb23b4f81 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 14 Apr 2026 09:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9D=BF=E4=BB=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E7=9F=AD=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/orderItem/OrderItemMapper.xml    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
index c6676b06c..f3ab9ea02 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
@@ -780,7 +780,7 @@
             op.thickness,
             ob.name AS bodyName,
             ob.room_name AS roomName,
-            ob.id AS bodyId,
+            t.body_id AS bodyId,
             t.cad_view_id
             <if test="componentIds != null and componentIds.size() > 0">
                 , t.comp_id
@@ -788,6 +788,7 @@
         FROM order_plate op
         JOIN (
             SELECT plate_id,
+            body_id,
             MIN(cad_view_id) AS cad_view_id
             <if test="componentIds != null and componentIds.size() > 0">
                 , MIN(comp_id) AS comp_id
@@ -806,9 +807,9 @@
                     #{componentId}
                 </foreach>
             </if>
-            GROUP BY plate_id
+            GROUP BY body_id, plate_id
         ) t ON t.plate_id = op.id
-        JOIN order_body ob ON ob.order_id = op.order_id
+        JOIN order_body ob ON ob.id = t.body_id
         <if test="bodyIds != null and bodyIds.size() > 0">
             AND ob.id IN
             <foreach item="bodyId" collection="bodyIds" open="(" separator="," close=")">