diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/CuttingStatusRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/CuttingStatusRespVO.java index 8cffe2935..3afcdbca4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/CuttingStatusRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/CuttingStatusRespVO.java @@ -30,7 +30,7 @@ public class CuttingStatusRespVO { @NotNull(message = "开料状态不能为空") private Integer cutedType; -// @Schema(description = "取消开料的大板编号") -// private List goodsNo; + @Schema(description = "取消开料的大板编号") + private List goodsNo; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/RemainBoardInfo.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/RemainBoardInfo.java index 2c599aede..444665f48 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/RemainBoardInfo.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/RemainBoardInfo.java @@ -128,6 +128,8 @@ public class RemainBoardInfo { private Boolean isTwoFaceProcess; + private Integer cutedType; + } 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 48e2c284b..0dfc95aa8 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 @@ -399,7 +399,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { Long planId = respVO.getPlanId(); List goodsIds = respVO.getGoodsId(); - + List goodsNo = respVO.getGoodsNo(); if(goodsIds.isEmpty()){ return; @@ -424,33 +424,27 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List remainBoardInfos = parseArray(remainBoardInfo, RemainBoardInfo.class); - - List boardInfos = remainBoardInfos.stream().filter(f -> goodsIds.contains(f.getGoodsId())).toList(); - - - List boardInfos2 = remainBoardInfos.stream().filter(f -> !goodsIds.contains(f.getGoodsId())).toList(); - List planNo = new ArrayList<>(); - boardInfos.forEach(f->{ + remainBoardInfos.forEach(f->{ - f.setCutedType(respVO.getCutedType()); - f.getPlaceBoardList().forEach(p->{ - planNo.addAll(p.getBlocks().stream().map(RemainBoardInfo.Blocks::getBlockId).toList()); - }); + if(goodsIds.contains(f.getGoodsId())){ + f.getPlaceBoardList().forEach(p->{ + + if(goodsNo.contains(p.getBoardId())) { + p.setCutedType(respVO.getCutedType()); + planNo.addAll(p.getBlocks().stream().map(RemainBoardInfo.Blocks::getBlockId).toList()); + } + }); + + } }); - List remainBoardInfos2 = new ArrayList<>(); - - remainBoardInfos2.addAll(boardInfos2); - remainBoardInfos2.addAll(boardInfos); - - // 更新开料相关的数据 HashMap objectObjectHashMap = new HashMap<>(); - objectObjectHashMap.put("remainBoardInfo", toJsonString(remainBoardInfos2)); + objectObjectHashMap.put("remainBoardInfo", toJsonString(remainBoardInfos)); objectObjectHashMap.put("updateTime",simpleDateFormat.format(date)); try { @@ -468,6 +462,8 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { f.setIsCutted(respVO.getCutedType()); }); + plateMapper.updateBatch(plateDOS); + // // List plateDOS = getPlanGoodsPlateList(goodsNo,planDO,optimizeBoardModelDOS);