Browse Source

1.bug修复

visual
zhenghaoyu 3 months ago
parent
commit
dd03a98dc9
  1. 6
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

6
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@ -3027,7 +3027,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
Map<String, Long> orderCodeCounts = importOrderNoPackageExcelDTOS.stream() Map<String, Long> orderCodeCounts = importOrderNoPackageExcelDTOS.stream()
.collect(Collectors.groupingBy(a->(a.getOrderCode()+"&"+a.getFirsts()), Collectors.counting())); .collect(Collectors.groupingBy(a->(a.getOrderCode()+"&"+a.getMaterialName()), Collectors.counting()));
Set<String> duplicateOrderCodes = orderCodeCounts.entrySet().stream() Set<String> duplicateOrderCodes = orderCodeCounts.entrySet().stream()
.filter(entry -> entry.getValue() > 1) .filter(entry -> entry.getValue() > 1)
@ -3035,8 +3035,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
.collect(Collectors.toSet()); .collect(Collectors.toSet());
if(!duplicateOrderCodes.isEmpty()){ if(!duplicateOrderCodes.isEmpty()){
log.warn("#################importCustomizedOuPai: 订单号品类重复 {}",duplicateOrderCodes); log.warn("#################importCustomizedOuPai: 订单号物料重复 {}",duplicateOrderCodes);
return R.fail(405, "包条码重复"+duplicateOrderCodes); return R.fail(405, "订单号物料重复"+duplicateOrderCodes);
} }

Loading…
Cancel
Save