diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
index c44e9ee4f..a66a4d9af 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
@@ -60,6 +60,12 @@ public class OldSystemDataPushConfig {
 		// 阳春仓
 		warehourseIds.add("150");
 
+		//宜昌
+		warehourseIds.add("45");
+
+		// 大竹
+		warehourseIds.add("37");
+
 	}
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
index ae24ab647..cd961fcbf 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
@@ -464,7 +464,10 @@ public class DistributionSignforController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "PC下载签收图片", notes = "传入ids")
 	public void handlePicture(@RequestParam String ids,HttpServletResponse res) {
-		 distributionSignforService.handlePicture(ids,res);
+		if(StringUtils.isNotBlank(ids)){
+			distributionSignforService.handlePicture(ids,res);
+		}
+
 	}
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionClientMessageServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionClientMessageServiceImpl.java
index b6d683dda..f9255258b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionClientMessageServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionClientMessageServiceImpl.java
@@ -78,18 +78,6 @@ public class DistributionClientMessageServiceImpl extends BaseServiceImpl<Distri
 			}
 			for (String s : split) {
 				//修改在库记录的地址
-//				List<DistributionStockArticleEntity> list = distributionStockArticleService.list(Wrappers.<DistributionStockArticleEntity>query().lambda()
-//					.eq(DistributionStockArticleEntity::getId, s)
-//				);
-//				DistributionStockArticleEntity distributionStockArticleEntity = list.get(0);
-//				distributionStockArticleEntity.setCustomerName(distributionClientMessage.getName());
-//				distributionStockArticleEntity.setCustomerTelephone(distributionClientMessage.getPhone());
-//				distributionStockArticleEntity.setCustomerAddress(distributionClientMessage.getAddress());
-//				distributionStockArticleService.updateById(distributionStockArticleEntity);
-//				DistributionClientMessageEntity distributionClientMessageEntity = new DistributionClientMessageEntity();
-//				BeanUtils.copyProperties(distributionClientMessage,distributionClientMessageEntity);
-//				distributionClientMessageEntity.setStockArticleId(s);
-//				this.save(distributionClientMessageEntity);
 				DistributionStockArticleEntity oldStockArticle = distributionStockArticleService.getById(Long.parseLong(s));
 				DistributionStockArticleEntity newStockArticle = new DistributionStockArticleEntity();
 				BeanUtil.copy(oldStockArticle,newStockArticle);
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 623f06dee..5a249cb7b 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
@@ -871,7 +871,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		//添加缓存
 		if (!packageLockIds.isEmpty()){
-			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds);
+			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:");
 			if (Func.isNotEmpty(a)){
 				boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
 				if (flag){
@@ -879,10 +879,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					throw new RuntimeException("该包件正在被操作,请稍后再试!!!");
 				}else {
 					packageLockIds.addAll(a);
-					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:",packageLockIds,60L);
 				}
 			}else {
-				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L);
 			}
 		}
 		//查询已装车件数
@@ -2043,7 +2043,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 		}
 		if (!packageLockIds.isEmpty()){
-			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds);
+			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:");
 			if (Func.isNotEmpty(a)){
 				boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
 				if (flag){
@@ -2051,10 +2051,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					throw new RuntimeException("该包件正在被操作,请稍后再试!!!");
 				}else {
 					packageLockIds.addAll(a);
-					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:",packageLockIds,60L);
 				}
 			}else {
-				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L);
 			}
 		}
 		String msg = getLoadingMsg(distrilbutionloadingscanDTO);
@@ -5526,7 +5526,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			abnormalTotal = abnormalLoadingPack.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum();
 		}
 		if (!packageLockIds.isEmpty()){
-			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds);
+			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" );
 			if (Func.isNotEmpty(a)){
 				boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
 				if (flag){
@@ -5534,10 +5534,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					throw new RuntimeException("该包件正在被操作,请稍后再试!!!");
 				}else {
 					packageLockIds.addAll(a);
-					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L);
 				}
 			}else {
-				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:",packageLockIds,60L);
 			}
 		}
 
@@ -5846,7 +5846,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			str.append("异常").append(abnormalLoadingNum.get() + "件");
 		}
 		if (!packageLockIds.isEmpty()){
-			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds);
+			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:");
 			if (Func.isNotEmpty(a)){
 				boolean aaa = a.stream().anyMatch(any -> packageLockIds.contains(any));
 				if (aaa){
@@ -5854,10 +5854,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					throw new RuntimeException("该包件正在被操作,请稍后再试!!!");
 				}else {
 					packageLockIds.addAll(a);
-					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L);
 				}
 			}else {
-				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:",packageLockIds ,60L);
 			}
 		}
 		return Resp.scanSuccess("装车成功", str.toString());
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 d9a43a593..5b90d2152 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
@@ -2267,10 +2267,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						throw new RuntimeException("该包件正在被操作,请稍后再试!!!");
 					}else {
 						packageLockIds.addAll(a);
-						bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+						bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,60L);
 					}
 				}else {
-					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,60L);
 				}
 			}
 
@@ -2473,7 +2473,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 		//添加缓存
 		if (!packageLockIds.isEmpty()){
-			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds);
+			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:");
 			if (Func.isNotEmpty(a)){
 				boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
 				if (flag){
@@ -2481,10 +2481,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					throw new RuntimeException("该包件正在被操作,请稍后再试!!!");
 				}else {
 					packageLockIds.addAll(a);
-					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L);
 				}
 			}else {
-				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L);
 			}
 		}
 		//维护客户
@@ -2654,6 +2654,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			return R.fail("请联系管理员!!!");
 		}
 		if ((signforEntity.getReceivedQuantity() + signforEntity.getReceivedinQuantity()) <= 0) {
+
 			log.error("signforack############未进行签收上传图片");
 			return Resp.scanFail(12000, "请先进行签收扫描后上传图片", "请先进行签收扫描后上传图片", null);
 		}
@@ -2663,7 +2664,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (ObjectUtils.isNotNull(distributionSignfor.getMap())) {
 			List<DistributionSignPrintEntity> distributionSignPrintList = new ArrayList<>();
 			distributionSignfor.getMap().forEach((k, v) -> {
-				v.stream().forEach(i -> {
+				v.forEach(i -> {
 					DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity();
 					BeanUtils.copyProperties(i, distributionSignPrint);
 					distributionSignPrint.setId(null);
@@ -2932,7 +2933,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 		String s = checkAbnormalSignNum(distrilbutionloadingscanDTO);
 		if (!packageLockIds.isEmpty()){
-			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds);
+			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" );
 			if (Func.isNotEmpty(a)){
 				boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
 				if (flag){
@@ -2940,10 +2941,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					throw new RuntimeException("该包件正在被操作,请稍后再试!!!");
 				}else {
 					packageLockIds.addAll(a);
-					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:",packageLockIds,10L);
 				}
 			}else {
-				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,10L);
 			}
 		}
 		return Resp.scanSuccess("操作成功", s);
@@ -3293,7 +3294,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
 		String str = checkSignNum(distrilbutionloadingscanDTO);
 		if (!packageLockIds.isEmpty()){
-			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds);
+			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" );
 			if (Func.isNotEmpty(a)){
 				boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
 				if (flag){
@@ -3301,10 +3302,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					throw new RuntimeException("该包件正在被操作,请稍后再试!!!");
 				}else {
 					packageLockIds.addAll(a);
-					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:",packageLockIds,60L);
 				}
 			}else {
-				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L);
 			}
 		}
 		return Resp.scanSuccess("签收成功", str);
@@ -4701,7 +4702,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.info(method+"签收包件数>>>>>>>>>>>>>>:{}",signingPackageNum);
 			log.info(method+"签收库存品数>>>>>>>>>>>>>>:{}",signingPackageNum);
 		if (!packageLockIds.isEmpty()){
-			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds);
+			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" );
 			if (Func.isNotEmpty(a)){
 				boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
 				if (flag){
@@ -4709,10 +4710,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					throw new RuntimeException("该包件正在被操作,请稍后再试!!!");
 				}else {
 					packageLockIds.addAll(a);
-					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L);
 				}
 			}else {
-				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,60L);
 			}
 		}
 			LambdaUpdateWrapper<DistributionSignforEntity> set = new UpdateWrapper<DistributionSignforEntity>().lambda()
@@ -5468,7 +5469,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			distributionParcelNumberService.updateById(parcelNumberEntity);
 		});
 		if (!packageLockIds.isEmpty()){
-			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds);
+			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" );
 			if (Func.isNotEmpty(a)){
 				boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
 				if (flag){
@@ -5476,10 +5477,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					throw new RuntimeException("该包件正在被操作,请稍后再试!!!");
 				}else {
 					packageLockIds.addAll(a);
-					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+					bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" ,packageLockIds,10L);
 				}
 			}else {
-				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:" + packageLockIds,packageLockIds,10L);
+				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:",packageLockIds,10L);
 			}
 		}
 		String str = checkSignNum(distrilbutionloadingscanDTO);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index b54c510cd..76b174978 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -1370,6 +1370,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("order_code", orderCode)
 			.eq("warehouse_id", warehouseId)
+			.eq("conditions", 1)
 			.eq("is_deleted", 0);
 		List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
 		Integer incomingNum = 0;
@@ -1549,6 +1550,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 				//查询包件列表
 				List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 					.eq(DistributionParcelListEntity::getOrderCode, s)
+					.eq(DistributionParcelListEntity::getConditions, 1)
 					.eq(DistributionParcelListEntity::getStockArticleId, stockArticleEntity.getId())
 					.eq(DistributionParcelListEntity::getWarehouseId, warehouseId)
 				);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
index 48af8336e..a33d41b3f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
@@ -372,7 +372,8 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		distributionStockListInfo.setId(null);
 		distributionUnpackingDetailsService.save(distributionUnpackingDetails);
 		//对原来的库存品进行数据维护
-		one.setQuantityStock(one.getQuantityStock() - Integer.parseInt(distributionStockListDTO.getPackageNum()));
+		one.setQuantityStock(one.getQuantityStock() - distributionStockListDTO.getUnpackingQuantity());
+		one.setOutboundQuantity(one.getOutboundQuantity() + distributionStockListDTO.getUnpackingQuantity());
 		this.updateById(one);
 		//添加拆包记录
 		distributionUnpackingDetails.setStockArticleId(Optional.ofNullable(one.getStockArticleId()).orElse(null));
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
index cb6323934..dd09dbbd6 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
@@ -398,7 +398,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 	public WarehouseWaybillEntity findByWaybillNo(String waybillNo) {
 		QueryWrapper<WarehouseWaybillEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("waybill_no", waybillNo);
-        return warehouseWaybillMapper.selectOne(queryWrapper);
+		return warehouseWaybillMapper.selectOne(queryWrapper);
 	}
 
 	@Override