diff --git a/servo/src/main/java/com/yvan/entity/BasLocationVo.java b/servo/src/main/java/com/yvan/entity/BasLocationVo.java
index bb703de..8cfe1c7 100644
--- a/servo/src/main/java/com/yvan/entity/BasLocationVo.java
+++ b/servo/src/main/java/com/yvan/entity/BasLocationVo.java
@@ -52,7 +52,7 @@ public class BasLocationVo {
         // 从 ExecutorItem 中提取信息并赋值给 BasLocationVo
         this.locCode = "AGV_" + executorItem.getId();
         this.locType = executorItem.getT();
-        this.rack = "N/A";
+        this.rack = executorItem.getId();
         this.bay = 0;
         this.level = 0;
         this.cell = 0;
diff --git a/servo/src/main/java/com/yvan/workbench/controller/InvController.java b/servo/src/main/java/com/yvan/workbench/controller/InvController.java
index e9d3994..1da1fa0 100644
--- a/servo/src/main/java/com/yvan/workbench/controller/InvController.java
+++ b/servo/src/main/java/com/yvan/workbench/controller/InvController.java
@@ -275,7 +275,7 @@ public class InvController {
             .where(lccInvLpn.envId.eq(envId));
 
         if (!Strings.isNullOrEmpty(catalogCode)) {
-            selectAction.where(lccBasLocation.catalogCode.eq(catalogCode));
+            selectAction.where(lccBasLocation.catalogCode.in(catalogCode, "N/A"));
         }
 
         var list = selectAction.fetch();