From d2168fd743de5c8df0e4a53897e8e3180983349f Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 3 Jun 2026 14:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BC=98=E5=8C=96=EF=BC=9A?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=BC=80=E6=96=99=E7=8A=B6=E6=80=81=E4=B8=8B?=
 =?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E5=B7=B2=E5=85=A8=E9=83=A8=E5=BC=80?=
 =?UTF-8?q?=E6=96=99=E8=AE=A2=E5=8D=95=E5=8F=B7=E8=8C=83=E5=9B=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../imes/module/executor/dal/mysql/plate/PlateMapper.java | 2 +-
 .../service/optimizeplan/OptimizePlanServiceImpl.java     | 2 +-
 .../src/main/resources/mapper/plate/PlateMapper.xml       | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java
index 4d2e6a0e8..522602a18 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java
@@ -436,7 +436,7 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
      * @param planId
      * @return
      */
-    List<Long> selectPlanAllCuttedOrderIdList(@Param("planId") Long planId);
+    List<Long> selectPlanAllCuttedOrderIdList(@Param("planId") Long planId, @Param("orderIds") List<Long> orderIds);
 
     /**
      * 查询排单板件信息
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
index 8c2e1c062..469e3f4e4 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
@@ -1886,7 +1886,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
             int updatedCount = plateMapper.updatePlanPlateCutStatus(planId, orderIds, optimizatePlateNoList);
 
             // 查询已全部开料的订单号
-            List<Long> allCuttedOrderIdList = plateMapper.selectPlanAllCuttedOrderIdList(planId);
+            List<Long> allCuttedOrderIdList = plateMapper.selectPlanAllCuttedOrderIdList(planId, orderIds);
 
             // 更新已全部开料和全部打包的订单为生产完成
             if (CollUtil.isNotEmpty(allCuttedOrderIdList)) {
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 6bbf04744..a013b62eb 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
@@ -1564,9 +1564,17 @@
                           FROM order_plate op
                           WHERE op.order_id = o.id
                             AND op.plan_id = #{planId}
+                            AND op.order_id in
+                            <foreach collection="orderIds" item="orderId" open="(" close=")" separator=",">
+                                    #{orderId}
+                            </foreach>
                             AND op.deleted = false
                             AND op.is_cutted in (0, 1))
         AND o.deleted = false
+        AND o.id in
+        <foreach collection="orderIds" item="orderId" open="(" close=")" separator=",">
+            #{orderId}
+        </foreach>
     </select>
 
     <select id="selectPlanPlateInfoPage"