From 571d5b02dfd976493138fb54409cd5309d4a690f Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 15 Mar 2024 20:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=98=E7=9B=98=E8=A3=85=E8=BD=A6BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 ddcc77a78..40495df6a 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
@@ -5084,7 +5084,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 			TrayTypeDataVO trayTypeDataVO = warehouseTrayTypeClient.selectListByTrayCode(c.getTrayCode());
 			if (Func.isNotEmpty(trayTypeDataVO)) {
-				String trayName = trayTypeDataVO.getTrayName();
+				String trayName = trayTypeDataVO.getTrayCode();
 				c.setTrayName(trayName);
 				List<WarehouseTrayGoodsEntity> goodsLsit = trayTypeDataVO.getGoodsLsit();
 				if (Func.isNotEmpty(goodsLsit)) {
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 ce6263211..e6c011e6f 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
@@ -2893,7 +2893,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		TrayTypeDataVO trayTypeDataVO = new TrayTypeDataVO();
 		trayTypeDataVO.setTrayTypeId(trayTypeId);
 		trayTypeDataVO.setType(type);
-		trayTypeDataVO.setTrayCode(trayTypeEntity.getTrayCode());
+		trayTypeDataVO.setTrayCode(basicdataTrayEntity.getPalletName());
 		trayTypeDataVO.setTrayNum(trayTypeEntity.getTotalNum());
 		trayTypeDataVO.setName(trayTypeEntity.getFilterValue());
 		trayTypeDataVO.setOrderTotalNum(trayTypeEntity.getOrderTotalNum());