Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -1440,8 +1440,12 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 		AdvanceEntity advanceEntity = null;
 		WayBillEntity wayBillEntity = null;
 		List<AdvanceEntity> advanceList = advanceClient.getAdvanceList(orderCode);
+		//把advanceList中的所有totalNum求和
+		for (AdvanceEntity entity : advanceList) {
+			total += entity.getTotal();
+		}
+
 		for (AdvanceEntity entity : advanceList) {
-			total = total + entity.getTotal();
 			String waybillNo = entity.getWaybillNo();
 			if(StringUtil.isNotBlank(waybillNo)){
 				WayBillEntity wb = wayBillClient.getByWaybillNo(waybillNo);

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

@@ -1142,6 +1142,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		List<PacakgeDetailExcelDTO> pacakgeDetailExcelDTOS = EasyExcel.read(inputStream).head(PacakgeDetailExcelDTO.class).sheet(0).headRowNumber(2).doReadSync();
 		//排除pacakgeDetailExcelDTOS中的orderPackageCode为空的元素
 		pacakgeDetailExcelDTOS = pacakgeDetailExcelDTOS.stream().filter(item -> StringUtil.isNotBlank(item.getOrderPackageCode())).collect(Collectors.toList());
+		//把importStandardOuPaiDTOS中orderPackageCode相同的元素去重
+		pacakgeDetailExcelDTOS = pacakgeDetailExcelDTOS.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(PacakgeDetailExcelDTO::getOrderPackageCode))), ArrayList::new));
+
 		//把pacakgeDetailExcelDTOS转成以orderPacakgeCode为一个Set集合
 		Set<String> pacakgeDetailExcelDTOSet = pacakgeDetailExcelDTOS.stream().map(PacakgeDetailExcelDTO::getOrderPackageCode).collect(Collectors.toSet());
 
@@ -1494,6 +1497,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		//排除pacakgeDetailExcelDTOS中的orderPackageCode为空的元素
 		importCustomizedOuPaiDTOS = importCustomizedOuPaiDTOS.stream().filter(item -> StringUtil.isNotBlank(item.getOrderPackageCode())).collect(Collectors.toList());
+		//把importStandardOuPaiDTOS中orderPackageCode相同的元素去重
+		importCustomizedOuPaiDTOS = importCustomizedOuPaiDTOS.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ImportCustomizedOuPaiDTO::getOrderPackageCode))), ArrayList::new));
+
 		//把pacakgeDetailExcelDTOS转成以orderPacakgeCode为一个Set集合
 		Set<String> importCustomizedOuPaiDTOSet = importCustomizedOuPaiDTOS.stream().map(ImportCustomizedOuPaiDTO::getOrderPackageCode).collect(Collectors.toSet());
 
@@ -1773,6 +1779,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		//排除importStandardOuPaiDTOS中的orderPackageCode为空的元素
 		importStandardOuPaiDTOS = importStandardOuPaiDTOS.stream().filter(item -> StringUtil.isNotBlank(item.getOrderPackageCode())).collect(Collectors.toList());
+		//把importStandardOuPaiDTOS中orderPackageCode相同的元素去重
+		importStandardOuPaiDTOS = importStandardOuPaiDTOS.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ImportStandardOuPaiDTO::getOrderPackageCode))), ArrayList::new));
+
+
 		//把importStandardOuPaiDTOS转成以orderPacakgeCode为一个Set集合
 		Set<String> importStandardOuPaiDTOSet = importStandardOuPaiDTOS.stream().map(ImportStandardOuPaiDTO::getOrderPackageCode).collect(Collectors.toSet());
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -4190,8 +4190,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		AdvanceEntity advanceEntity = null;
 		WayBillEntity wayBillEntity = null;
 		List<AdvanceEntity> advanceList = advanceClient.getAdvanceList(orderCode);
+		//把advanceList中的所有totalNum求和
+		for (AdvanceEntity entity : advanceList) {
+			total += entity.getTotal();
+		}
+
 		for (AdvanceEntity entity : advanceList) {
-			total = total + entity.getTotal();
 			String waybillNo = entity.getWaybillNo();
 			if(StringUtil.isNotBlank(waybillNo)){
 				WayBillEntity wb = wayBillClient.getByWaybillNo(waybillNo);
@@ -4206,6 +4210,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			}
 		}
 
+
 		if(Objects.isNull(advanceEntity)){
 			log.warn("#################saveOrderInfo: 暂存单信息不存在 orderCode={}",orderCode);
 			throw new CustomerException(403,"暂存单信息不存在");