From c32b95b334c6177d4f67e124d73c19b01d444b31 Mon Sep 17 00:00:00 2001
From: lizw-2015 <1183409807@qq.com>
Date: Tue, 29 Jul 2025 19:08:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(inventory):=20=E5=A2=9E=E5=8A=A0=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在库存查询界面添加环境筛选选项
- 后端增加根据环境 ID筛选的功能
- 更新请求模型，添加 envId 字段
---
 .../yvan/workbench/controller/DeviceManager.java   | 23 ++++++++++++----------
 .../workbench/model/request/QueryInvLpnReq.java    |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java b/servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java
index 34b57a2..50c8ee9 100644
--- a/servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java
+++ b/servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java
@@ -52,23 +52,26 @@ public class DeviceManager {
 
     public static Page<LinkedHashMap<String, Object>> queryInvLpn(QueryInvLpnReq req) {
         SQLQuery<LinkedHashMap<String, Object>> query = QUERY_DSL.select(QueryDslUtils.linkedMap(lccInvLpn, lccBasLocation, lccBasContainer))
-                .from(lccInvLpn)
-                .innerJoin(lccBasLocation).on(
-                        lccInvLpn.locCode.eq(lccBasLocation.locCode).and(
-                                lccBasLocation.envId.eq(lccBasLocation.envId)
-                        )
+            .from(lccInvLpn)
+            .innerJoin(lccBasLocation).on(
+                lccInvLpn.locCode.eq(lccBasLocation.locCode).and(
+                    lccBasLocation.envId.eq(lccBasLocation.envId)
                 )
-                .innerJoin(lccBasContainer).on(
-                        lccInvLpn.lpn.eq(lccInvLpn.lpn).and(
-                                lccBasContainer.envId.eq(lccInvLpn.envId)
-                        )
-                ).orderBy(lccInvLpn.lpn.asc());
+            )
+            .innerJoin(lccBasContainer).on(
+                lccInvLpn.lpn.eq(lccInvLpn.lpn).and(
+                    lccBasContainer.envId.eq(lccInvLpn.envId)
+                )
+            ).orderBy(lccInvLpn.lpn.asc());
         if (StringUtils.isNotBlank(req.getLpn())) {
             query.where(lccInvLpn.lpn.eq(req.getLpn().trim()));
         }
         if (StringUtils.isNotBlank(req.getLocCode())) {
             query.where(lccInvLpn.locCode.eq(req.getLocCode().trim()));
         }
+        if (req.getEnvId() != null) {
+            query.where(lccInvLpn.envId.eq(req.getEnvId()));
+        }
         return QueryDslUtils.queryByPage(query, QueryByPage.getCurrent());
     }
 
diff --git a/servo/src/main/java/com/yvan/workbench/model/request/QueryInvLpnReq.java b/servo/src/main/java/com/yvan/workbench/model/request/QueryInvLpnReq.java
index 74f623e..5f07cc9 100644
--- a/servo/src/main/java/com/yvan/workbench/model/request/QueryInvLpnReq.java
+++ b/servo/src/main/java/com/yvan/workbench/model/request/QueryInvLpnReq.java
@@ -12,4 +12,5 @@ public class QueryInvLpnReq {
     private String lpn;
     /** 库存位置 */
     private String locCode;
+    private Long envId;
 }