From 7ca2c3c2ec900ef3eafd40a504abb6b625e2712e Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 10 Nov 2023 11:23:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=98=E7=9B=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml  | 3 +++
 .../service/impl/DistributionStockupServiceImpl.java         | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
index 17a4eba76..c69ebd65d 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
@@ -84,6 +84,9 @@
             <if test="po.palletCode !=null and po.palletCode != ''">
                and tray.pallet_code like concat('%',#{po.palletCode},'%')
             </if>
+            <if test="po.palletName !=null and po.palletName != ''">
+               and tray.pallet_name like concat('%',#{po.palletName},'%')
+            </if>
         </where>
             order by tray.create_time  desc
     </select>
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 c9fee32af..8c3e0d416 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
@@ -1808,7 +1808,7 @@ 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());
@@ -1820,8 +1820,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			if(ObjectUtils.isNull(warehouseId)){
 				throw new ServiceException("预约信息不存在，无法备货！");
 			}
+			String  trayCode= stockupDTO.getTrayBarCode() ;
 			//货位下架
-			R r = warehouseUpdownTypeClient.downPackage(collect,warehouseId );
+			R r = warehouseUpdownTypeClient.downTray(trayCode,warehouseId );
 			if(r.getCode() != 200){
 				throw new ServiceException("下架失败！！");
 			}