From 3db3cc4fcaecb836d72ce973952bf414e50a6b3e Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 24 Jun 2026 17:00:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E9=85=8D=E4=BB=B6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=93=81=E7=89=8C=E3=80=81=E5=8E=82=E5=AE=B6?=
 =?UTF-8?q?=E3=80=81=E9=A2=9C=E8=89=B2=E3=80=81=E9=95=BF=E5=AE=BD=E5=8E=9A?=
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, 7 insertions(+)

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 9911005e6..b7a2c8e60 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
@@ -866,6 +866,12 @@
         op.name,
         op.model,
         op.spec,
+        op.brand,
+        op.factory,
+        op.color,
+        op.width,
+        op.length,
+        op.thickness,
         ob.name AS bodyName,
         ob.room_name AS roomName,
         ob.id AS bodyId,
@@ -885,6 +891,7 @@
             </if>
             FROM order_item
             WHERE order_id = #{orderId} and parts_id != 0 and source_id = 0
+            and ((group_id is null and comp_id is null) or group_id = 0)
             <if test="bodyIds != null and bodyIds.size() > 0">
                 AND body_id IN
                 <foreach item="bodyId" collection="bodyIds" open="(" separator="," close=")">