1.bug修复

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()
-			.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()
 			.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);
 		}