feat(all): 车次成本明细报表

1 修改报表逻辑

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java

@@ -72,12 +72,15 @@ public class BillPlanReportListener implements ReportService {
 				}
 				cmpMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 				ltlMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode()))
 					.collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode()));
 				invMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getMallName()) && StrUtil.isNotEmpty(item.getMaterielCode()) && StrUtil.isNotEmpty(item.getIncomingBatch()))
 					.collect(Collectors.groupingBy(item -> item.getMallName() + item.getMaterielCode() + item.getIncomingBatch()));
 			}
 		}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java

@@ -69,12 +69,15 @@ public class BillReViewReportListener implements ReportService {
 			if (CollUtil.isNotEmpty(qualityDeliverEntities)) {
 				cmpMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 				ltlMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode()))
 					.collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode()));
 				invMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 			}
 		}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java

@@ -69,12 +69,15 @@ public class BillSignforReportListener implements ReportService {
 			if (CollUtil.isNotEmpty(qualityDeliverEntities)) {
 				cmpMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 				ltlMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode()))
 					.collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode()));
 				invMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 			}
 		}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java

@@ -288,6 +288,9 @@ public class DeliverFinishReportListener implements ReportService {
 																if (addvaluePackageMap.containsKey(entity.getOrderPackageCode() + "1")) {
 																	stairsNumber = Convert.toInt(addvaluePackageMap.get(entity.getOrderPackageCode() + "1"));
 																}
+																if (!NumberUtil.equals(stairsNumber, 0)) {
+																	stairsNumber = stairsNumber - 1;
+																}
 																// 平移米数
 																Integer translationNumber = 0;
 																if (addvaluePackageMap.containsKey(entity.getOrderPackageCode() + "3")) {
@@ -757,9 +760,12 @@ public class DeliverFinishReportListener implements ReportService {
 												}
 												Set<Long> longs = valueMap.keySet();
 												Integer dkp = 0;
-												if(CollUtil.isNotEmpty(allRouteMap)){
+												if (CollUtil.isNotEmpty(allRouteMap)) {
 													dkp = allRouteMap.keySet().size();
 												}
+												if (!NumberUtil.equals(dkp, 0)) {
+													dkp = dkp - 1;
+												}
 												for (Map.Entry<Long, QualityDeliverEntity> entityEntry : valueMap.entrySet()) {
 													QualityDeliverEntity value2 = entityEntry.getValue();
 													String siteSubsidyCost = priceVO.getSiteSubsidyCost();

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java

@@ -69,12 +69,15 @@ public class LoadingReportListener implements ReportService {
 			if (CollUtil.isNotEmpty(qualityDeliverEntities)) {
 				cmpMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 				ltlMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode()))
 					.collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode()));
 				invMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 			}
 		}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -30,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -80,24 +82,30 @@ public class PlanReportListener implements ReportService {
 				if (CollUtil.isNotEmpty(qualityDeliverEntities)) {
 					cmpMap = qualityDeliverEntities.stream()
 						.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode()))
+						.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 						.collect(Collectors.groupingBy(item -> item.getPlanReservationCode() + item.getOrderPackageCode()));
 					ltlMap = qualityDeliverEntities.stream()
 						.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode()))
+						.filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode()))
 						.collect(Collectors.groupingBy(item -> item.getPlanReservationCode() + item.getCategory() + item.getOrderCode()));
 					invMap = qualityDeliverEntities.stream()
 						.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode()))
+						.filter(item -> StrUtil.isNotEmpty(item.getPlanReservationCode()) && StrUtil.isNotEmpty(item.getMallName()) && StrUtil.isNotEmpty(item.getMaterielCode()))
 						.collect(Collectors.groupingBy(item -> item.getPlanReservationCode() + item.getMallName() + item.getMaterielCode()));
 				} else {
-					// 没有查询到，延迟30秒重新推送
+					// 没有查询到，延迟10秒重新推送
 					factoryDataClient.sendMessage(SendMsg.builder()
 						.exchange(FanoutConstants.distribution.DeliveryAndPlan.EXCHANGE_DELAY)
 						.routingKey(null)
 						.message(msg)
-						.delay(30000)
+						.delay(10000)
 						.build());
 					return;
 				}
 			}
+			Set<String> cmpSet = new HashSet<>();
+			Set<String> ltlSet = new HashSet<>();
+			Set<String> invSet = new HashSet<>();
 			for (ReservationVO reservationVO : reservationVOList) {
 				String reservationCode = reservationVO.getReservationCode();
 				List<PackageData> details = reservationVO.getPackageDataList();
@@ -130,6 +138,9 @@ public class PlanReportListener implements ReportService {
 									sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
 								}
 							}
+							if(StrUtil.isNotEmpty(detail.getPackageCode())){
+								cmpSet.add(reservationCode + detail.getPackageCode());
+							}
 						} else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) {
 							qualityDeliverEntity.setOrderCode(detail.getOrderCode());
 							qualityDeliverEntity.setCategory(detail.getProductName());
@@ -142,6 +153,9 @@ public class PlanReportListener implements ReportService {
 									sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY);
 								}
 							}
+							if(StrUtil.isNotEmpty(detail.getProductName()) && StrUtil.isNotEmpty(detail.getOrderCode())){
+								ltlSet.add(reservationCode + detail.getProductName() + detail.getOrderCode());
+							}
 						} else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.INV)) {
 							qualityDeliverEntity.setBizCode(reservationVO.getReservationCode());
 							qualityDeliverEntity.setIncomingBatch(detail.getPickupBatch());
@@ -165,36 +179,31 @@ public class PlanReportListener implements ReportService {
 									}
 								}
 							}
+							if(StrUtil.isNotEmpty(detail.getMallName()) && StrUtil.isNotEmpty(detail.getMaterialCode())){
+								invSet.add(reservationCode + detail.getMallName() + detail.getMaterialCode());
+							}
 						}
 					}
 				}
-				// 系统中有的包件在当前不存在，则删除
+			}
-				Set<String> cmpSet = details.stream()
+			for (Map.Entry<String, List<QualityDeliverEntity>> entry : cmpMap.entrySet()) {
-					.filter(item -> ObjectUtil.equals(item.getPackageType(), PackageTypeEnums.CMP))
+				String key = entry.getKey();
-					.map(i -> reservationCode + i.getPackageCode()).collect(Collectors.toSet());
+				if (!cmpSet.contains(key)) {
-				for (Map.Entry<String, List<QualityDeliverEntity>> entry : cmpMap.entrySet()) {
+					sendReport(entry.getValue().get(0), BizOperationEnums.DELETE);
-					String key = entry.getKey();
-					if (!cmpSet.contains(key)) {
-						sendReport(entry.getValue().get(0), BizOperationEnums.DELETE);
-					}
 				}
-				Set<String> ltlSet = details.stream().filter(item -> ObjectUtil.equals(item.getPackageType(), PackageTypeEnums.LTL))
+			}
-					.map(i -> reservationCode + i.getProductName() + i.getOrderCode()).collect(Collectors.toSet());
+			for (Map.Entry<String, List<QualityDeliverEntity>> entry : ltlMap.entrySet()) {
-				for (Map.Entry<String, List<QualityDeliverEntity>> entry : ltlMap.entrySet()) {
+				String key = entry.getKey();
-					String key = entry.getKey();
+				if (!ltlSet.contains(key)) {
-					if (!ltlSet.contains(key)) {
+					sendReport(entry.getValue().get(0), BizOperationEnums.DELETE);
-						sendReport(entry.getValue().get(0), BizOperationEnums.DELETE);
-					}
 				}
-				Set<String> invSet = details.stream().filter(item -> ObjectUtil.equals(item.getPackageType(), PackageTypeEnums.INV))
+			}
-					.map(i -> reservationCode + i.getMallName() + i.getMaterialCode()).collect(Collectors.toSet());
+			for (Map.Entry<String, List<QualityDeliverEntity>> entry : invMap.entrySet()) {
-				for (Map.Entry<String, List<QualityDeliverEntity>> entry : invMap.entrySet()) {
+				String key = entry.getKey();
-					String key = entry.getKey();
+				if (!invSet.contains(key)) {
-					if (!invSet.contains(key)) {
+					List<QualityDeliverEntity> value = entry.getValue();
-						List<QualityDeliverEntity> value = entry.getValue();
+					for (QualityDeliverEntity entity : value) {
-						for (QualityDeliverEntity entity : value) {
+						sendReport(entity, BizOperationEnums.DELETE);
-							sendReport(entity, BizOperationEnums.DELETE);
-						}
 					}
 				}
 			}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java

@@ -68,12 +68,15 @@ public class ReViewReportListener implements ReportService {
 			if (CollUtil.isNotEmpty(qualityDeliverEntities)) {
 				cmpMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 				ltlMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode()))
 					.collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode()));
 				invMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 			}
 		}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReportListener.java

@@ -55,6 +55,7 @@ public class ReportListener {
 			try {
 				selectReportService(BillPlanReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("自提任务生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -82,6 +83,7 @@ public class ReportListener {
 			try {
 				selectReportService(BillReViewReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("自提复核生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -109,6 +111,7 @@ public class ReportListener {
 			try {
 				selectReportService(BillSignforReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("自提签收扫描生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -136,6 +139,7 @@ public class ReportListener {
 			try {
 				selectReportService(CarStartReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("发车生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -163,6 +167,7 @@ public class ReportListener {
 			try {
 				selectReportService(ConsigneeArriveReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("配送到达生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -218,6 +223,7 @@ public class ReportListener {
 			try {
 				selectReportService(LoadingReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("装车生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -245,6 +251,7 @@ public class ReportListener {
 			try {
 				selectReportService(PlanReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("配送计划生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -274,6 +281,7 @@ public class ReportListener {
 			try {
 				selectReportService(PlanReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("配送计划生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -301,6 +309,7 @@ public class ReportListener {
 			try {
 				selectReportService(ReservationPlanReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("预约计划生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -328,6 +337,7 @@ public class ReportListener {
 			try {
 				selectReportService(ReturnWarehouseReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("回库生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -355,6 +365,7 @@ public class ReportListener {
 			try {
 				selectReportService(ReViewReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("文员复核生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -382,6 +393,7 @@ public class ReportListener {
 			try {
 				selectReportService(SignforReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("签收扫描生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -409,6 +421,7 @@ public class ReportListener {
 			try {
 				selectReportService(StockReportListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("备货生成明细报表失败: {}", e.getMessage());
 			}
 		}
@@ -437,6 +450,7 @@ public class ReportListener {
 			try {
 				selectReportService(QualityDeliverListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("配送明细基础表处理失败: {}", e.getMessage());
 			}
 		}
@@ -465,6 +479,7 @@ public class ReportListener {
 			try {
 				selectReportService(QualityDeliverAddListener.class).buildReport(msg);
 			} catch (Exception e) {
+				e.printStackTrace();
 				log.error("配送明细基础表Add失败: {}", e.getMessage());
 			}
 		}
@@ -487,6 +502,7 @@ public class ReportListener {
 			String trainNumber = vo.getTrainNumber();
 			qualityDeliverService.carExpenseDispatchDetailFinal(trainNumber);
 		} catch (Exception e) {
+			e.printStackTrace();
 			log.error("生成车辆车次成本报表失败: {}", e.getMessage());
 		}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java

@@ -25,7 +25,6 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -71,13 +70,45 @@ public class ReservationPlanReportListener implements ReportService {
 				}
 				cmpMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 				ltlMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode()))
 					.collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode()));
 				invMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getMallName()) && StrUtil.isNotEmpty(item.getMaterielCode()) && StrUtil.isNotEmpty(item.getIncomingBatch()))
 					.collect(Collectors.groupingBy(item -> item.getMallName() + item.getMaterielCode() + item.getIncomingBatch()));
+				// 移除指定包件
+				if (BizOperationEnums.REMOVE.equals(bizOperation)) {
+					if (CollUtil.isNotEmpty(details)) {
+						for (PackageData detail : details) {
+							if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {
+								if (cmpMap.containsKey(detail.getPackageCode())) {
+									QualityDeliverEntity qualityDeliverEntity = new QualityDeliverEntity();
+									qualityDeliverEntity.setId(cmpMap.get(detail.getPackageCode()).get(0).getId());
+									sendReport(qualityDeliverEntity, BizOperationEnums.DELETE);
+								}
+							}
+							if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) {
+								if (ltlMap.containsKey(detail.getProductName() + detail.getOrderCode())) {
+									QualityDeliverEntity qualityDeliverEntity = new QualityDeliverEntity();
+									qualityDeliverEntity.setId(ltlMap.get(detail.getProductName() + detail.getOrderCode()).get(0).getId());
+									sendReport(qualityDeliverEntity, BizOperationEnums.DELETE);
+								}
+							}
+							if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.INV)) {
+								if (invMap.containsKey(detail.getMallName() + detail.getMaterialCode() + detail.getPickupBatch())) {
+									QualityDeliverEntity qualityDeliverEntity = new QualityDeliverEntity();
+									qualityDeliverEntity.setId(invMap.get(detail.getMallName() + detail.getMaterialCode() + detail.getPickupBatch()).get(0).getId());
+									sendReport(qualityDeliverEntity, BizOperationEnums.DELETE);
+								}
+							}
+						}
+					}
+					return;
+				}
 			}
 		}
 		if (CollUtil.isNotEmpty(details)) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java

@@ -70,12 +70,15 @@ public class SignforReportListener implements ReportService {
 			if (CollUtil.isNotEmpty(qualityDeliverEntities)) {
 				cmpMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 				ltlMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode()))
 					.collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode()));
 				invMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 			}
 		}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java

@@ -65,12 +65,15 @@ public class StockReportListener implements ReportService {
 			if (CollUtil.isNotEmpty(qualityDeliverEntities)) {
 				cmpMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode()))
 					.collect(Collectors.groupingBy(item -> item.getOrderPackageCode()));
 				ltlMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode()))
 					.collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode()));
 				invMap = qualityDeliverEntities.stream()
 					.filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode()))
+					.filter(item -> StrUtil.isNotEmpty(item.getMallName()) && StrUtil.isNotEmpty(item.getMaterielCode()))
 					.collect(Collectors.groupingBy(item -> item.getMallName() + item.getMaterielCode()));
 			}
 		}