From c7a15b7cf01bb3692397376eeddcdbf9f776ae29 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 12 Jun 2026 11:37:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=8E=92=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B0=8F=E6=9D=BF=E7=A7=BB=E9=99=A4=20=E5=B7=B2=E9=80=89?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/vo/OrderPageReqVOCopy.java | 3 --- .../module/executor/service/plan/PlanServiceImpl.java | 11 +---------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java index 5b88a1e11..470ff0fb5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java +++ b/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 excludeOrderIdsWhenUnplanAddBoard; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index ff516af54..c1280dc1b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/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 statusList = new ArrayList<>(); - // 未排单添加小板被选入排单的订单，在这里不展示了 - List 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 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);