托盘货物查询

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());