mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-13 13:22:07 +08:00
remainBoardList 类型处理逻辑更改
This commit is contained in:
+8
@@ -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> actualGoodsList;
|
||||
|
||||
|
||||
// 处理 remainBoardList = " " 的情况
|
||||
public void setRemainBoardList(Object remainBoardList) {
|
||||
if (remainBoardList instanceof String && ((String) remainBoardList).isEmpty()) {
|
||||
this.remainBoardList = new ArrayList<>();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
-15
@@ -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<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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user