保存优化：结束开料状态下 查询已全部开料订单号范围修正

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);
 
     /**
      * 查询排单板件信息

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)) {

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"