Merge branch 'dev' into pre-production

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)) {

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -2893,7 +2893,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		TrayTypeDataVO trayTypeDataVO = new TrayTypeDataVO();
 		trayTypeDataVO.setTrayTypeId(trayTypeId);
 		trayTypeDataVO.setType(type);
-		trayTypeDataVO.setTrayCode(trayTypeEntity.getTrayCode());
+		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());