From f023d78a73c32d87cf3f490b2dfb7c53205aad48 Mon Sep 17 00:00:00 2001
From: luoyifan <luoyifan@qq.com>
Date: Mon, 7 Jul 2025 21:31:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=91=E8=A7=86=20InvUpdat?=
 =?UTF-8?q?e,=203D=20=E6=A8=A1=E5=9E=8B=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 servo/src/main/java/com/yvan/entity/BasLocationVo.java               | 2 +-
 servo/src/main/java/com/yvan/workbench/controller/InvController.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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