From 1267ce6c63dad143feba643d6f7eecad34ab41e0 Mon Sep 17 00:00:00 2001
From: liuzhaotian <liu2655477224@163.com>
Date: Wed, 26 Mar 2025 15:22:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8D=95=E4=BC=98=E5=8C=96=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E8=A1=A5=E5=85=A8?=
 =?UTF-8?q?=EF=BC=8CremainBoardList=20=E7=B1=BB=E5=9E=8B=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../optimizeplan/OptimizePlanServiceImpl.java | 96 ++++++++++++-------
 1 file changed, 60 insertions(+), 36 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 43388fd36..719b141aa 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
@@ -25,7 +25,6 @@ import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.common.util.Assert.AssertUtils;
 import com.cf.imes.framework.common.util.object.BeanUtils;
-import com.cf.imes.framework.es.core.dal.ESDocument;
 import com.cf.imes.framework.es.core.service.ESDocumentService;
 import com.cf.imes.framework.mybatis.core.query.QueryWrapperX;
 import com.cf.imes.framework.security.core.LoginUser;
@@ -673,6 +672,11 @@ 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();
 
 
@@ -687,7 +691,61 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
 
         AssertUtils.notEmpty(planDO,ORDER_PLAN_DATE_ERROR);
 
-        boardModelDO.setProcessId(req.getProcessId());
+
+        if(req.getProcessId() != null){
+
+            boardModelDO.setProcessId(req.getProcessId());
+
+            if(!planDO.getProcessId().equals(req.getProcessId())) {
+
+                planDO.setProcessId(req.getProcessId());
+                planMapper.updateById(planDO);
+
+            }
+
+            esUtils.deleteEsDocument(FIELD_PLAN_ID, FIELD_PROCESS_ID, planId, req.getProcessId(), ORDER_OPTIMIZE_PLATE_MODEL);
+
+        }else {
+
+            boardModelDO.setProcessId(planDO.getProcessId());
+
+        }
+
+
+//        List<OptimizeBoardModelDO> document = esUtils.getEsDocument(FIELD_PLAN_ID, planId, ORDER_OPTIMIZE_PLATE_MODEL, OptimizeBoardModelDO.class);
+//
+//        List<OptimizeBoardModelDO> 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);
+        }
+
+
+        List<PlateDO> plateDOS = planItemMapper.selectOrderPlanPlateListByPlanId(planId,getUserOrganId());
+
+        if(CollUtil.isNotEmpty(plateDOS)) {
+
+            plateDOS.forEach(f -> {
+                f.setIsOptimized(true);
+            });
+
+            plateMapper.updateBatch(plateDOS);
+        }
+
+
+
+        // 保存优化后的大板数据
+        esUtils.saveEsDocument(ORDER_OPTIMIZE_PLATE_MODEL, Collections.singletonList(boardModelDO));
+
+
+        // ES文档数据刷新
+        esUtils.refresh(ORDER_OPTIMIZE_PLATE_MODEL);
 
 
 
@@ -718,40 +776,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
 //        }
 
 
-        List<PlateDO> plateDOS = planItemMapper.selectOrderPlanPlateListByPlanId(planId,getUserOrganId());
-
-        if(CollUtil.isNotEmpty(plateDOS)) {
-
-            plateDOS.forEach(f -> {
-                f.setIsOptimized(true);
-            });
-
-            plateMapper.updateBatch(plateDOS);
-        }
-
-        if(!planDO.getProcessId().equals(req.getProcessId())) {
-
-            planDO.setProcessId(req.getProcessId());
-            planMapper.updateById(planDO);
-
-            List<OptimizeBoardModelDO> document = esUtils.getEsDocument(FIELD_PLAN_ID, planId, ORDER_OPTIMIZE_PLATE_MODEL, OptimizeBoardModelDO.class);
-
-            if(CollUtil.isNotEmpty(document)) {
-                List<Long> list = document.stream().filter(f -> f.getProcessId() != null).map(m -> m.getProcessId()).toList();
-
-                if(CollUtil.isNotEmpty(list)) {
-                    esUtils.deleteEsDocument(FIELD_PLAN_ID, FIELD_PROCESS_ID, planId, req.getProcessId(), ORDER_OPTIMIZE_PLATE_MODEL);
-                }
-            }
-        }
-        // 保存优化后的大板数据
-        esUtils.saveEsDocument(ORDER_OPTIMIZE_PLATE_MODEL, Collections.singletonList(boardModelDO));
-
-
-        // ES文档数据刷新
-        esUtils.refresh(ORDER_OPTIMIZE_PLATE_MODEL);
-
-
     }