From 8624778eb4c2abccdfeda3534ac5f904e2fb18c0 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 22 Jan 2024 11:18:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=E5=86=85-=E4=B8=8B=E6=9E=B6?=
 =?UTF-8?q?=E8=A7=A3=E6=89=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/service/impl/WarehouseTrayTypeServiceImpl.java  | 4 ++--
 .../service/impl/WarehouseUpdownTypeServiceImpl.java          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
index 943807e80..76c43d115 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
@@ -2127,12 +2127,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 	@Override
 	public void downPackageByOrderPackageCode(String orderPackageCode,String remark,Long warehouseId) {
 		QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsQueryWrapper = new QueryWrapper<>();
-		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
+		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId);
 		trayGoodsQueryWrapper.eq("association_type","3")
 			.eq("association_value",orderPackageCode);
 		WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsQueryWrapper);
 		StringBuffer stringBuffer = new StringBuffer();
-		if (Func.isNotEmpty(trayGoodsEntity)){
+		if (!Objects.isNull(trayGoodsEntity)){
 			Long trayGoodsId = trayGoodsEntity.getId();
 			Long trayTypeId = trayGoodsEntity.getTrayTypeId();
 			Long trayId = trayGoodsEntity.getTrayId();
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index 166845aa7..52d668835 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -1370,7 +1370,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				WarehouseTrayGoodsEntity warehouseTrayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsEntityQueryWrapper);
 				if(!Objects.isNull(warehouseTrayGoodsEntity)){
 					//有托盘，托盘下托
-					warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件下架:同步下托",warehouseId);
+					warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件解托",warehouseId);
 				}
 				continue;
 			}