推送老系统BUG修复

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());
+					}
+				}
 			}
 
 		}

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);