未排单添加小板移除 已选订单过滤逻辑

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java

@@ -114,7 +114,4 @@ public class OrderPageReqVOCopy extends PageParam {
 
     @Schema(description = "厚度")
     private BigDecimal thickness;
-
-    @Schema(description = "未排订单添加小板时需要排除的已选择订单号列表")
-    private List<Long> excludeOrderIdsWhenUnplanAddBoard;
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java

@@ -548,8 +548,6 @@ public class PlanServiceImpl implements PlanService {
         Long organId = getUserOrganId();
 
         List<Integer> statusList = new ArrayList<>();
-        // 未排单添加小板被选入排单的订单，在这里不展示了
-        List<Long> excludeOrderIdsWhenUnplanAddBoard = pageReqVO.getExcludeOrderIdsWhenUnplanAddBoard();
 
         statusList.add(OrderStatusEnum.NEW_ORDER.getStatus());
         statusList.add(OrderStatusEnum.IN_PRODUCTION.getStatus());
@@ -580,8 +578,7 @@ public class PlanServiceImpl implements PlanService {
                 .likeIfPresent(FIELD_CUSTOM_ORDER_NO, pageReqVO.getDefaultId())
                 .likeIfPresent(FIELD_ADDRESS, pageReqVO.getConsigneeAddress())
                 .betweenIfPresent(FIELD_ORDER_DATE, LocalDateTimeUtils.generateTimeSection(pageReqVO.getCreateTime()))
-                .eqIfPresent(FIELD_ORDER_TYPE, pageReqVO.getOrderType())
-                .notInIfPresent(FIELD_ORDER_ID, excludeOrderIdsWhenUnplanAddBoard);
+                .eqIfPresent(FIELD_ORDER_TYPE, pageReqVO.getOrderType());
 
         Integer pageSize = pageReqVO.getPageSize();
         PageDTO<OrderRespVOCopy> page = new PageDTO<>(pageReqVO.getPageNo(), pageSize);
@@ -602,12 +599,6 @@ public class PlanServiceImpl implements PlanService {
 
         // 订单分组查询子单
         if (CollUtil.isNotEmpty(mainOrderList)) {
-            // 未排单添加小板，当主单列表存在要排除的订单id时，把这个订单的num设置为0不参与后续未排小板查询
-            mainOrderList.forEach(e -> {
-                if (CollUtil.isNotEmpty(excludeOrderIdsWhenUnplanAddBoard) && excludeOrderIdsWhenUnplanAddBoard.contains(e.getOrderId())) {
-                    e.setNum(0);
-                }
-            });
 
             // 主单id列表
             Long[] mainOrderIds = mainOrderList.stream().map(OrderRespVOCopy::getOrderId).toArray(Long[]::new);