From dd03a98dc93b8835ba857548e1e2bf7d950ecf76 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 25 Oct 2024 11:59:59 +0800 Subject: [PATCH] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/trunkline/service/impl/OpenOrderServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 8e414ba13..407aa47d1 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -3027,7 +3027,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Map orderCodeCounts = importOrderNoPackageExcelDTOS.stream() - .collect(Collectors.groupingBy(a->(a.getOrderCode()+"&"+a.getFirsts()), Collectors.counting())); + .collect(Collectors.groupingBy(a->(a.getOrderCode()+"&"+a.getMaterialName()), Collectors.counting())); Set duplicateOrderCodes = orderCodeCounts.entrySet().stream() .filter(entry -> entry.getValue() > 1) @@ -3035,8 +3035,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { .collect(Collectors.toSet()); if(!duplicateOrderCodes.isEmpty()){ - log.warn("#################importCustomizedOuPai: 订单号品类重复 {}",duplicateOrderCodes); - return R.fail(405, "包条码重复"+duplicateOrderCodes); + log.warn("#################importCustomizedOuPai: 订单号物料重复 {}",duplicateOrderCodes); + return R.fail(405, "订单号物料重复"+duplicateOrderCodes); }