From a47553756d692b71e4b481ddac9fc171f948741a Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Fri, 20 Jun 2025 09:39:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=8E=92=E5=8D=95=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8E=92=E5=8D=95es=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../optimizeplan/OptimizePlanServiceImpl.java   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

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 e1d23c882..5fb019a81 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
@@ -778,18 +778,18 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
 
         AssertUtils.notEmpty(goodsReqVOS,ORDER_GOODS_DATA_ERROR);
 
-        List<Long> ids = goodsReqVOS.stream().map(GoodsReqVO::getId).toList();
+        List<Long> orderGoodsIds = goodsReqVOS.stream().map(GoodsReqVO::getId).toList();
 
         List<OrderDO> orderDOS = orderMapper.selectBatchIds(orderIds);
 
         AssertUtils.notEmpty(orderDOS,THIS_ORDER_PLATE_DATA_ERROR);
 
-        List<PlateDetailRespVO> plateDetailRespVOS = plateMapper.selectNoPlanPlate(orderIds,ids,getUserOrganId());
+        List<PlateDetailRespVO> plateDetailRespVOS = plateMapper.selectNoPlanPlate(orderIds, orderGoodsIds, getUserOrganId());
 
         AssertUtils.notEmpty(plateDetailRespVOS,ORDER_PLATE_ERROR);
 
         // todo 数据结构改后，可以增加排单ID作为筛选，只查为 0 的
-        List<OrderModelDO> orderModelDOS = getOrderModels(orderIds);
+        List<OrderModelDO> orderModelDOS = getOrderModels(orderIds, orderGoodsIds);
 
         AssertUtils.notEmpty(plateDetailRespVOS,ORDER_PLATE_MODEL_DATE_ERROR);
 
@@ -808,7 +808,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
      * @param orderIds
      * @return
      */
-    private List<OrderModelDO> getOrderModels(List<Long> orderIds) {
+    private List<OrderModelDO> getOrderModels(List<Long> orderIds, List<Long> orderGoodsIds) {
         List<OrderModelDO> results = new ArrayList<>();
         try {
             // 查询总数
@@ -819,22 +819,27 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
                                     .field("orderId")
                                     .terms(e -> e.value(orderIds.stream().map(FieldValue::of).toList()))
                             ))
+                            .filter(f -> f.terms(t -> t
+                                    .field("plateGoodsId")
+                                    .terms(e -> e.value(orderGoodsIds.stream().map(FieldValue::of).toList()))
+                            ))
                     ))
                     .build();
             CountResponse totalResponse = elasticsearchClient.count(countRequest);
             long total = totalResponse.count();
 
             // 分页查询
-            int pageNum = PageUtil.totalPage(total, 500);
+            int pageNum = PageUtil.totalPage(total, 1000);
 
             List<FieldValue> searchAfterSortValues = null;
             for (int page = 1; page <= pageNum; page++) {
                 SearchRequest.Builder searchBuilder = new SearchRequest.Builder()
                         .index(ORDER_PLATE_MODEL.getIndex())
-                        .size(500)
+                        .size(1000)
                         .sort(s -> s.field(f -> f.field("id.keyword").order(SortOrder.Asc)))
                         .query(q -> q.bool(b -> b
                                 .filter(f -> f.terms(t -> t.field("orderId").terms(e -> e.value(orderIds.stream().map(FieldValue::of).toList()))))
+                                .filter(f -> f.terms(t -> t.field("plateGoodsId").terms(e -> e.value(orderGoodsIds.stream().map(FieldValue::of).toList()))))
                         ))
                         .source(s -> s
                                 .filter(f -> f