From 02587806a4fffa89729f9ed7e16b5545b186df6b Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Fri, 29 May 2026 21:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E5=8A=A0=E5=B7=A5=E7=BB=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ordercomponent/OrderComponentServiceImpl.java        | 1 +
 .../cf/imes/module/executor/service/plate/PlateServiceImpl.java  | 1 +
 .../src/main/resources/mapper/orderParts/OrderPartsMapper.xml    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java
index 0df4e8333..91fdab0de 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java
@@ -424,6 +424,7 @@ public class OrderComponentServiceImpl implements OrderComponentService {
                 .in(OrderItemDO::getOrderId, pageReqVO.getOrderIds())
                 .inIfPresent(OrderItemDO::getCompId, queryComponentIds)
                 .in(OrderItemDO::getPartsId, partsIds)
+                .ne(OrderItemDO::getGroupId, 0L)
                 .select(OrderItemDO::getPartsId, OrderItemDO::getCadViewId, OrderItemDO::getGroupId, OrderItemDO::getCompId, OrderItemDO::getNum)
         );
 
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java
index 88b128e93..7228c213c 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java
@@ -1032,6 +1032,7 @@ public class PlateServiceImpl implements PlateService {
                 .eq(OrderItemDO::getOrderId, pageReqVO.getOrderId())
                 .inIfPresent(OrderItemDO::getBodyId, bodyIds)
                 .inIfPresent(OrderItemDO::getGroupId, groupIds)
+                .ne(OrderItemDO::getGroupId, 0L)
                 .in(OrderItemDO::getPartsId, partsIds)
                 .select(OrderItemDO::getPartsId, OrderItemDO::getBodyId, OrderItemDO::getCadViewId, OrderItemDO::getGroupId, OrderItemDO::getCompId, OrderItemDO::getNum)
         );
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml
index 87b13e164..c488d7fcc 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml
@@ -454,6 +454,7 @@
         oi.parts_id != 0
         AND oi.package_id = 0
         AND oi.source_id = 0
+        AND oi.group_id != 0L
         AND op.deleted = false
         AND op.type != '封边条'
         AND oi.order_id IN