From cceefca491303b43fec75e7e379d8077cb00d584 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sat, 12 Oct 2024 18:35:30 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=AF=B9=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E9=85=8D=E7=BD=AE=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionAsyncServiceImpl.java       | 4 ++--
 .../impl/DistributionDeliveryListServiceImpl.java        | 3 +++
 .../service/impl/DistributionSignforServiceImpl.java     | 9 ++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index 7e7f88df6..90c28f442 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -1798,7 +1798,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	 * @param deliveryId
 	 */
 	@Override
-	public void sendTrunkineLog(Long deliveryId, Long reservationId, BladeUser user, BasicdataWarehouseEntity warehouse, Integer a) {
+	public void  sendTrunkineLog(Long deliveryId, Long reservationId, BladeUser user, BasicdataWarehouseEntity warehouse, Integer a) {
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(deliveryId);
 		List<DistributionParcelListEntity> distributionParcelListEntities = null;
 		if (1 == a) {
@@ -1809,7 +1809,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		//查询配送司机信息
 		Map<String, Object> driverInfo = distributionDeliveryListMapper.selectDeliveryDriverInfo(distributionDeliveryListEntity.getId());
 		if (Func.isNotEmpty(distributionParcelListEntities)) {
-			Map<String, List<DistributionParcelListEntity>> listMap = distributionParcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getWaybillNumber));
+			Map<String, List<DistributionParcelListEntity>> listMap = distributionParcelListEntities.stream().filter(f->!Objects.isNull(f.getWaybillNumber())).collect(Collectors.groupingBy(DistributionParcelListEntity::getWaybillNumber));
 			listMap.forEach((k, v) -> {
 				StringBuilder builder = new StringBuilder();
 				//统计已装车数量
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 46103a1d7..dd2d1d79c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -4806,7 +4806,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				builder.append("装车" + loadingCount + "件");
 			}
 
+
 			distributionAsyncService.sendTrunkineLog(distributionDeliveryListEntity.getId(), null, AuthUtil.getUser(), warehouseClient.getMyCurrentWarehouse(), 1);
+
+
 			Map mapState = new HashMap();
 			mapState.put("messageId", CommonUtil.getUUID());
 			mapState.put("messageData", distributionDeliveryListEntity.getId());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 5f6cd1e08..12ffaab32 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -693,7 +693,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			return null;
 		}
 		WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
-		Integer isAutoRelease = warehouseConfig.getIsAutoRelease();
+		Integer isAutoRelease = warehouseConfig!=null ? warehouseConfig.getIsAutoRelease():0;
 		if (Integer.parseInt(IsOrNoConstant.no.getValue()) == isAutoRelease) {
 			//进行异常判断拦截
 			//查询是否存在异常
@@ -706,7 +706,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				return R.fail("当前客户存在异常未完成");
 			}
 		}
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
 		DistributionSignforEntity distributionSignfor = this.getById(distributionSignforDTO.getId());
 		Integer loadingNum = distributionSignfor.getLoadedNumber() + distributionSignfor.getLoadedinNumber();
 		Integer signNum = distributionSignfor.getReceivedQuantity() + distributionSignfor.getReceivedinQuantity();
@@ -876,7 +875,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			return R.fail(403, "未授权!!!");
 		}
 		WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
-		Integer isAutoRelease = warehouseConfig.getIsAutoRelease();
+
+		Integer isAutoRelease = warehouseConfig!=null ?  warehouseConfig.getIsAutoRelease() : 0;
 		if (Integer.parseInt(IsOrNoConstant.no.getValue()) == isAutoRelease) {
 			//进行异常判断拦截
 			//查询是否存在异常
@@ -6063,6 +6063,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 //		DistributionTaskVO taskVO = buildDistributionTaskVO(distributionDeliveryListEntity, AuthUtil.getUserId());
 		org.springblade.common.model.DistributionSignforVO distributionLoadVO = new org.springblade.common.model.DistributionSignforVO();
+		if(distributionLoadscanEntityLists.isEmpty()){
+			return null;
+		}
 
 		DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanEntityLists.get(0);
 		distributionLoadVO.setDriverName(distributionLoadscanEntity.getDriverName());