From 41a614138ec2e7cd5c3b988c62ae17f55dd08854 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 26 Apr 2024 15:34:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB=E7=BB=9FBU?=
 =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../receiver/ClerkCheckPushDataQueueHandler.java       | 10 +++++++++-
 .../impl/DistributionDeliveryListServiceImpl.java      |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java
index 8491a8ccb..3bdc8ab10 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java
@@ -235,7 +235,15 @@ public class ClerkCheckPushDataQueueHandler {
 			if (ObjectUtils.isNotNull(user)) {
 				assert user != null;
 				signPushDataUnitDTO.setAdministratorsName(user.getName());
-				signPushDataUnitDTO.setAdministratorsPhone(user.getPhone());
+				if (ObjectUtils.isNotEmpty(user.getPhone())){
+					signPushDataUnitDTO.setAdministratorsPhone(user.getPhone());
+				}else {
+					if (ObjectUtils.isNotEmpty(user.getAccount())){
+						signPushDataUnitDTO.setAdministratorsPhone(user.getAccount());
+					}else {
+						log.info("用户无电话号码且账号信息为空>>用户名称:{}",user.getName());
+					}
+				}
 			}
 
 		}
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 3640f3a32..a57e6d52d 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
@@ -2058,6 +2058,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					DisStockListDetailEntity disStockListDetailEntity = disStockListDetailEntities.get(0);
 					disStockListDetailEntity.setStockLockingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 					disStockListDetailService.updateById(disStockListDetailEntity);
+					//维护包件装车状态
+					boolean update = distributionParcelListService.update(
+						Wrappers.<DistributionParcelListEntity>update().lambda()
+							.eq(DistributionParcelListEntity::getOrderPackageCode, disStockListDetailEntity.getStockPackageCode())
+							.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
+							.eq(DistributionParcelListEntity::getMaterialCode, disStockListDetailEntity.getSku())
+					);
+					log.info(">>>>>>>>>>>>>>>>>>>装车修改库存品包件>装车包件码:{},",disStockListDetailEntity.getStockPackageCode());
 					DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = getDistributionLoadscaninvnEntity(distrilbutionloadingscanDTO, distributionDeliverySelfEntity, disStockListDetailEntities);
 					packageLockIds.add(distributionLoadscaninvnEntity.getInventoryPackageId());
 					distributionLoadscaninvnService.save(distributionLoadscaninvnEntity);