Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

remainBoardList 类型处理逻辑更改

Browse Source
This commit is contained in:
liuzhaotian
2025-03-26 16:05:58 +08:00
parent 1267ce6c63
commit b85944720c
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/goods/OptimizeBoardModelDO.java
+8
View File
@@ -12,6 +12,7 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -183,4 +184,11 @@ public class OptimizeBoardModelDO extends ESDocument {
private List<ActualGoodsList> actualGoodsList; private List<ActualGoodsList> actualGoodsList;
// 处理 remainBoardList = " " 的情况
public void setRemainBoardList(Object remainBoardList) {
if (remainBoardList instanceof String && ((String) remainBoardList).isEmpty()) {
this.remainBoardList = new ArrayList<>();
}
}
} }
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
-15
View File
@@ -672,11 +672,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
OptimizeBoardModelDO boardModelDO = req.getOptimizeBoardModelDOS().get(0); 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(); Long planId = boardModelDO.getPlanId();
@@ -712,16 +707,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
} }
// 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){ if(req.getPlanConfigId() != null && req.getProcessId() == null){
esUtils.deleteEsDocument(FIELD_PLAN_ID, FIELD_PLAN_CONFIG_ID, planId, req.getPlanConfigId(), ORDER_OPTIMIZE_PLATE_MODEL); esUtils.deleteEsDocument(FIELD_PLAN_ID, FIELD_PLAN_CONFIG_ID, planId, req.getPlanConfigId(), ORDER_OPTIMIZE_PLATE_MODEL);
} }