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

优化生产修改开料状态接口参数修改

Browse Source
This commit is contained in:
liuzhaotian
2025-01-10 18:03:45 +08:00
parent e059c62d2b
commit 5b77c599ee
3 changed files with 19 additions and 21 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/controller/admin/plan/saveOptimize/CuttingStatusRespVO.java
+2 -2
View File
@@ -30,7 +30,7 @@ public class CuttingStatusRespVO {
@NotNull(message = "开料状态不能为空") @NotNull(message = "开料状态不能为空")
private Integer cutedType; private Integer cutedType;
// @Schema(description = "取消开料的大板编号") @Schema(description = "取消开料的大板编号")
// private List<Long> goodsNo; private List<Integer> goodsNo;
} }
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/RemainBoardInfo.java
+2
View File
@@ -128,6 +128,8 @@ public class RemainBoardInfo {
private Boolean isTwoFaceProcess; private Boolean isTwoFaceProcess;
private Integer cutedType;
} }
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+12 -16
View File
@@ -399,7 +399,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
Long planId = respVO.getPlanId(); Long planId = respVO.getPlanId();
List<String> goodsIds = respVO.getGoodsId(); List<String> goodsIds = respVO.getGoodsId();
List<Integer> goodsNo = respVO.getGoodsNo();
if(goodsIds.isEmpty()){ if(goodsIds.isEmpty()){
return; return;
@@ -424,33 +424,27 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
List<RemainBoardInfo> remainBoardInfos = parseArray(remainBoardInfo, RemainBoardInfo.class); List<RemainBoardInfo> remainBoardInfos = parseArray(remainBoardInfo, RemainBoardInfo.class);
List<RemainBoardInfo> boardInfos = remainBoardInfos.stream().filter(f -> goodsIds.contains(f.getGoodsId())).toList();
List<RemainBoardInfo> boardInfos2 = remainBoardInfos.stream().filter(f -> !goodsIds.contains(f.getGoodsId())).toList();
List<String> planNo = new ArrayList<>(); List<String> planNo = new ArrayList<>();
boardInfos.forEach(f->{ remainBoardInfos.forEach(f->{
if(goodsIds.contains(f.getGoodsId())){
f.setCutedType(respVO.getCutedType());
f.getPlaceBoardList().forEach(p->{ f.getPlaceBoardList().forEach(p->{
if(goodsNo.contains(p.getBoardId())) {
p.setCutedType(respVO.getCutedType());
planNo.addAll(p.getBlocks().stream().map(RemainBoardInfo.Blocks::getBlockId).toList()); planNo.addAll(p.getBlocks().stream().map(RemainBoardInfo.Blocks::getBlockId).toList());
}
}); });
}
}); });
List<RemainBoardInfo> remainBoardInfos2 = new ArrayList<>();
remainBoardInfos2.addAll(boardInfos2);
remainBoardInfos2.addAll(boardInfos);
// 更新开料相关的数据 // 更新开料相关的数据
HashMap<String, Object> objectObjectHashMap = new HashMap<>(); HashMap<String, Object> objectObjectHashMap = new HashMap<>();
objectObjectHashMap.put("remainBoardInfo", toJsonString(remainBoardInfos2)); objectObjectHashMap.put("remainBoardInfo", toJsonString(remainBoardInfos));
objectObjectHashMap.put("updateTime",simpleDateFormat.format(date)); objectObjectHashMap.put("updateTime",simpleDateFormat.format(date));
try { try {
@@ -468,6 +462,8 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
f.setIsCutted(respVO.getCutedType()); f.setIsCutted(respVO.getCutedType());
}); });
plateMapper.updateBatch(plateDOS);
// //
// List<PlateDO> plateDOS = getPlanGoodsPlateList(goodsNo,planDO,optimizeBoardModelDOS); // List<PlateDO> plateDOS = getPlanGoodsPlateList(goodsNo,planDO,optimizeBoardModelDOS);