From 7843524451f58c0931fa2cc963b9a82ce3940670 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 10 Nov 2023 02:52:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionStockupServiceImpl.java  | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index 2e5a18e76..91f285049 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -1758,23 +1758,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			return Resp.scanFail("备货失败", "备货失败！");
 		} else {
 			List<DistributionStockEntity> list1 = new ArrayList<>();
-			String collect = voList.stream().map(DistributionStockPackageVO::getPacketBarCode).collect(Collectors.joining(","));
-			Long warehouseId ;
-			if(one.getStockUpType().equals("3")){
-				DistrilbutionBillLadingEntity distrilbutionBillLadingEntity = distrilbutionBillLadingMapper.selectById(stockupDTO.getReservationId());
-				warehouseId = distrilbutionBillLadingEntity.getWarehouseId();
-			}else{
-				DistributionReservationEntity byId1 = distributionReservationService.getById(stockupDTO.getReservationId());
-				warehouseId = byId1.getWarehouseId();
-			}
-			if(ObjectUtils.isNull(warehouseId)){
-				throw new ServiceException("预约信息不存在，无法备货！");
-			}
-			//货位下架
-			R r = warehouseUpdownTypeClient.downPackage(collect,warehouseId );
-			if(r.getCode() != 200){
-				throw new ServiceException("下架失败！！");
-			}
 			voList.forEach(i -> {
 				//查询是否已备货
 				DistributionParcelListEntity byId = distributionParcelListService.getById(i.getParcelListId());
@@ -1825,6 +1808,23 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					list1.add(distributionStock);
 				}
 			});
+			String collect = voList.stream().map(DistributionStockPackageVO::getPacketBarCode).collect(Collectors.joining(","));
+			Long warehouseId ;
+			if(one.getStockUpType().equals("3")){
+				DistrilbutionBillLadingEntity distrilbutionBillLadingEntity = distrilbutionBillLadingMapper.selectById(stockupDTO.getReservationId());
+				warehouseId = distrilbutionBillLadingEntity.getWarehouseId();
+			}else{
+				DistributionReservationEntity byId1 = distributionReservationService.getById(stockupDTO.getReservationId());
+				warehouseId = byId1.getWarehouseId();
+			}
+			if(ObjectUtils.isNull(warehouseId)){
+				throw new ServiceException("预约信息不存在，无法备货！");
+			}
+			//货位下架
+			R r = warehouseUpdownTypeClient.downPackage(collect,warehouseId );
+			if(r.getCode() != 200){
+				throw new ServiceException("下架失败！！");
+			}
 			//TODO 其他操作
 			//添加扫描记录