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-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

混单创建排单逻辑修复

Browse Source
This commit is contained in:
gaoqr
2026-06-10 11:09:18 +08:00
parent e27d47f3b2
commit 1fbb66e9a2
1 changed files with 16 additions and 90 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/service/plan/PlanServiceImpl.java
+16 -90
View File
@@ -1479,43 +1479,6 @@ public class PlanServiceImpl implements PlanService {
computeOrderInfo(orderIds); computeOrderInfo(orderIds);
} }
public static Map<String, List<Long>> groupByMaterialAndThickness(List<SavePlanPlateList.GoodsItemList> items) {
Map<String, List<Long>> groupedItems = new HashMap<>();
for (SavePlanPlateList.GoodsItemList item : items) {
// 将 material 和 thickness 组合成键
String key = item.getMaterial() + "|" + item.getThickness();
// 如果键不存在，初始化一个新的列表
groupedItems.putIfAbsent(key, new ArrayList<>());
// 添加当前项的 id 到对应的分组
groupedItems.get(key).add(item.getId());
}
return groupedItems;
}
public static Map<String, List<Long>> groupByThickness(List<SavePlanPlateList.GoodsItemList> items) {
Map<String, List<Long>> groupedItems = new HashMap<>();
for (SavePlanPlateList.GoodsItemList item : items) {
// 将 material 和 thickness 组合成键
String key = item.getThickness().toString();
// 如果键不存在，初始化一个新的列表
groupedItems.putIfAbsent(key, new ArrayList<>());
// 添加当前项的 id 到对应的分组
groupedItems.get(key).add(item.getId());
}
return groupedItems;
}
public static Map<String, List<Long>> groupByMaterialAndThicknessFilterLessThanOne(List<SavePlanPlateList.GoodsItemList> items) { public static Map<String, List<Long>> groupByMaterialAndThicknessFilterLessThanOne(List<SavePlanPlateList.GoodsItemList> items) {
Map<String, List<Long>> groupedItems = new HashMap<>(); Map<String, List<Long>> groupedItems = new HashMap<>();
@@ -1559,35 +1522,18 @@ public class PlanServiceImpl implements PlanService {
} }
public static Map<String, List<Long>> groupByMaterialAndThicknessEqualToOne(List<SavePlanPlateList.GoodsItemList> items) { /**
* 混单情况下不用混单的材质按goodsCode商品编码分组
*
* @param items
* @return
*/
public static Map<String, List<Long>> groupByGoodsCodeEqualToOne(List<SavePlanPlateList.GoodsItemList> items) {
Map<String, List<Long>> groupedItems = new HashMap<>(); Map<String, List<Long>> groupedItems = new HashMap<>();
for (SavePlanPlateList.GoodsItemList item : items) { for (SavePlanPlateList.GoodsItemList item : items) {
// 将 material 和 thickness 组合成键 // 将 material 和 thickness 组合成键
// String key = item.getMaterial() + "|" + item.getThickness(); String key = item.getGoodsId();
// 如果键不存在，初始化一个新的列表
groupedItems.putIfAbsent(item.getId().toString(), new ArrayList<>() {{
add(item.getId());
}});
// 添加当前项的 id 到对应的分组
// groupedItems.get(key).add(item.getId());
}
// 只留混单的材质
// groupedItems.entrySet().removeIf(entry -> entry.getValue().size() > 1);
return groupedItems;
}
public static Map<String, List<Long>> groupByThicknessEqualToOne(List<SavePlanPlateList.GoodsItemList> items) {
Map<String, List<Long>> groupedItems = new HashMap<>();
for (SavePlanPlateList.GoodsItemList item : items) {
// 将 material 和 thickness 组合成键
String key = item.getThickness().toString();
// 如果键不存在，初始化一个新的列表 // 如果键不存在，初始化一个新的列表
groupedItems.putIfAbsent(key, new ArrayList<>()); groupedItems.putIfAbsent(key, new ArrayList<>());
@@ -1596,15 +1542,9 @@ public class PlanServiceImpl implements PlanService {
groupedItems.get(key).add(item.getId()); groupedItems.get(key).add(item.getId());
} }
// 只留混单的材质
groupedItems.entrySet().removeIf(entry -> entry.getValue().size() > 1);
return groupedItems; return groupedItems;
} }
public static Map<String, List<Long>> groupByMaterialAndThicknessAndColorAndBrand(List<SavePlanPlateList.GoodsItemList> items) { public static Map<String, List<Long>> groupByMaterialAndThicknessAndColorAndBrand(List<SavePlanPlateList.GoodsItemList> items) {
Map<String, List<Long>> groupedItems = new HashMap<>(); Map<String, List<Long>> groupedItems = new HashMap<>();
@@ -1643,37 +1583,23 @@ public class PlanServiceImpl implements PlanService {
// 有选实际大板的小板加大板创建排单 // 有选实际大板的小板加大板创建排单
getCreatePlanMultipleGoodsList(planActualGoodsLists, plateItemList, planDOS, processId, processName, loginUser); getCreatePlanMultipleGoodsList(planActualGoodsLists, plateItemList, planDOS, processId, processName, loginUser);
// 没有选择实际大板的创建排单
if(MixConfigTypeEnum.SAMEMATERIALANDTHICKNESS.equals(mixedType)){
// 筛选出材质和厚度相同的大板
grouped = groupByMaterialAndThicknessEqualToOne(goodsItemList);
}else { // 不用混单的材质按goodsCode商品编码分组
grouped = groupByGoodsCodeEqualToOne(goodsItemList);
grouped = groupByThicknessEqualToOne(goodsItemList); if (CollUtil.isNotEmpty(grouped)) {
}
if(CollUtil.isNotEmpty(grouped)) {
createPlanAndPlateDataList(grouped, plateItemList, planDOS, processId, processName, loginUser, PlanTypeEnum.ORDERPLAN.getType()); createPlanAndPlateDataList(grouped, plateItemList, planDOS, processId, processName, loginUser, PlanTypeEnum.ORDERPLAN.getType());
} }
}else { } else {
// 不用混单的材质按goodsCode商品编码分组
if(MixConfigTypeEnum.SAMEMATERIALANDTHICKNESS.equals(mixedType)){ grouped = groupByGoodsCodeEqualToOne(goodsItemList);
// 筛选出材质和厚度相同的大板
grouped = groupByMaterialAndThickness(goodsItemList);
}else {
// 筛选出厚度相同的大板
grouped = groupByThickness(goodsItemList);
if (CollUtil.isNotEmpty(grouped)) {
createPlanAndPlateDataList(grouped, plateItemList, planDOS, processId, processName, loginUser, PlanTypeEnum.ORDERPLAN.getType());
} }
createPlanAndPlateDataList(grouped, plateItemList, planDOS, processId, processName, loginUser, PlanTypeEnum.ORDERPLAN.getType());
} }
planDOS.forEach(f->f.setFilter(f.getType().equals(PlanTypeEnum.MIXEDORDERPLAN.getType()) ? mixedType : 0)); planDOS.forEach(f->f.setFilter(f.getType().equals(PlanTypeEnum.MIXEDORDERPLAN.getType()) ? mixedType : 0));