fix: 修复空指针异常

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

@@ -198,7 +198,7 @@ public class ClerkCheckPushDataQueueHandler {
 
 			Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(">>>>> 推送老系统签收信息报错",e);
 		}
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

@@ -1561,10 +1561,10 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			if (Func.isNotEmpty(distributionReservationStockarticleEntities)) {
 				log.info(">>>brand 进入 长度 {} ", distributionReservationStockarticleEntities);
 
-
 				//存在订单
 				List<Long> orderIds = distributionReservationStockarticleEntities.stream().filter(f -> f.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
 
+				if (ObjectUtils.isNotNull(orderIds) && !orderIds.isEmpty()){
 					log.info(">>>brand 进入  orderIds {} ", orderIds);
 
 					List<DistributionStockArticleEntity> distributionStockArticleEntities = distributionStockArticleService.listByIds(orderIds);
@@ -1578,6 +1578,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 						brand = handkeBrandsPackageList(split, distributionStockArticleEntities, warehouseName, distributionReservationEntity.getId(), distributionDeliveryListEntity.getOrderCode(), warehouseId);
 					}
 					log.info(">>>brand 进入   {} ", brand);
+				}
 
 			}
 
@@ -1810,8 +1811,11 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				//统计已装车数量
 				WarehouseWaybillEntity byWaybillNo = waybillClient.findByWaybillNo(k);
 				AddWaybillTrackDTO addWaybillTrackDTO = new AddWaybillTrackDTO();
+				if(ObjectUtils.isNotNull(byWaybillNo)){
 					addWaybillTrackDTO.setWaybillId(byWaybillNo.getId());
 					addWaybillTrackDTO.setWaybillNo(byWaybillNo.getWaybillNo());
+				}
+
 				if (1 == a) {
 					int sum = v.stream().filter(p -> OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(p.getOrderPackageLoadingStatus())).mapToInt(DistributionParcelListEntity::getQuantity).sum();
 					addWaybillTrackDTO.setTrackType("90");

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -6334,6 +6334,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			return null;
 		}
 		return aftersalesAbnormalPackageVOS;
+
+
+
 	}
 
 	@Override