From d3b35339e6d4419811c5caf692bec47c1ee1331f Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 15 Mar 2024 20:44:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=98=E7=9B=98=E8=B4=A7=E7=89=A9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WarehouseTrayTypeServiceImpl.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 e6c011e6f..a738cef38 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,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		TrayTypeDataVO trayTypeDataVO = new TrayTypeDataVO();
 		trayTypeDataVO.setTrayTypeId(trayTypeId);
 		trayTypeDataVO.setType(type);
-		trayTypeDataVO.setTrayCode(basicdataTrayEntity.getPalletName());
+		if(Func.isNotBlank(basicdataTrayEntity.getPalletName())){
+			trayTypeDataVO.setTrayCode(basicdataTrayEntity.getPalletName());
+		}else {
+			trayTypeDataVO.setTrayCode(basicdataTrayEntity.getPalletCode());
+
+		}
 		trayTypeDataVO.setTrayNum(trayTypeEntity.getTotalNum());
 		trayTypeDataVO.setName(trayTypeEntity.getFilterValue());
 		trayTypeDataVO.setOrderTotalNum(trayTypeEntity.getOrderTotalNum());