From b85944720c91a3171d57c3921696fafed18b0be0 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 26 Mar 2025 16:05:58 +0800 Subject: [PATCH] =?UTF-8?q?remainBoardList=20=E7=B1=BB=E5=9E=8B=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataobject/goods/OptimizeBoardModelDO.java | 8 ++++++++ .../optimizeplan/OptimizePlanServiceImpl.java | 15 --------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java index a6dc050de..84557c810 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java @@ -12,6 +12,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; @@ -183,4 +184,11 @@ public class OptimizeBoardModelDO extends ESDocument { private List actualGoodsList; + // 处理 remainBoardList = " " 的情况 + public void setRemainBoardList(Object remainBoardList) { + if (remainBoardList instanceof String && ((String) remainBoardList).isEmpty()) { + this.remainBoardList = new ArrayList<>(); + } + } + } 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 719b141aa..aa0be440f 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 @@ -672,11 +672,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { OptimizeBoardModelDO boardModelDO = req.getOptimizeBoardModelDOS().get(0); - if (boardModelDO.getRemainBoardList() == null || (boardModelDO.getRemainBoardList().size() == 1 && boardModelDO.getRemainBoardList().get(0) == null)) { - boardModelDO.setRemainBoardList(new ArrayList<>()); - } - - Long planId = boardModelDO.getPlanId(); @@ -712,16 +707,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { } -// List document = esUtils.getEsDocument(FIELD_PLAN_ID, planId, ORDER_OPTIMIZE_PLATE_MODEL, OptimizeBoardModelDO.class); -// -// List list = document.stream().filter(f -> f.getProcessId() == null).toList(); -// -// if(CollUtil.isNotEmpty(list)){ -// -// esUtils.deleteEsDocument(FIELD_PLAN_ID,planId, ORDER_OPTIMIZE_PLATE_MODEL); -// } - - if(req.getPlanConfigId() != null && req.getProcessId() == null){ esUtils.deleteEsDocument(FIELD_PLAN_ID, FIELD_PLAN_CONFIG_ID, planId, req.getPlanConfigId(), ORDER_OPTIMIZE_PLATE_MODEL); }