From c449e6b6b206e340ae5f07d9b9e679a54cf57fa4 Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Mon, 13 Apr 2026 09:01:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(store):=20=E6=B7=BB=E5=8A=A0=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jnpf/service/impl/StoreAreaServiceImpl.java   |  7 +++++++
 .../java/jnpf/model/store/StoreAreaPagination.java     |  3 +++
 .../jnpf-web/src/views/example/storearea/index.vue     | 10 +++++-----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/StoreAreaServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/StoreAreaServiceImpl.java
index 34a9dc4..7ea32ed 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/StoreAreaServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/StoreAreaServiceImpl.java
@@ -34,6 +34,7 @@ public class StoreAreaServiceImpl extends ServiceImpl<StoreAreaMapper, StoreArea
     @Resource
     private StoreHouseService storeHouseService;
 
+    // ... existing code ...
     @Override
     public List<StoreAreaEntity> getList(StoreAreaPagination storeAreaPagination) {
         LambdaQueryWrapper<StoreAreaEntity> storeAreaWrapper = new LambdaQueryWrapper<>();
@@ -53,6 +54,12 @@ public class StoreAreaServiceImpl extends ServiceImpl<StoreAreaMapper, StoreArea
         if (ObjectUtil.isNotEmpty(storeAreaPagination.getStoreHouseId())) {
             storeAreaWrapper.eq(StoreAreaEntity::getStoreHouseId, storeAreaPagination.getStoreHouseId());
         }
+        if (ObjectUtil.isNotEmpty(storeAreaPagination.getStoreHouseName())) {
+            storeAreaWrapper.apply(
+                    "EXISTS (SELECT 1 FROM tba_store_house h WHERE h.id = store_house_id AND h.f_delete_mark = 0 AND h.store_house_name LIKE {0})",
+                    "%" + storeAreaPagination.getStoreHouseName() + "%"
+            );
+        }
         storeAreaWrapper.eq(StoreAreaEntity::getDeleteMark, 0);
         storeAreaWrapper.orderByDesc(StoreAreaEntity::getCreatorTime);
         List<StoreAreaEntity> storeAreaList;
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/store/StoreAreaPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/store/StoreAreaPagination.java
index 23841db..1dda350 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/store/StoreAreaPagination.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/store/StoreAreaPagination.java
@@ -40,6 +40,9 @@ public class StoreAreaPagination extends Pagination {
     @Schema(description = "仓库id")
     private Integer storeHouseId;
 
+    @Schema(description = "仓库名称")
+    private String storeHouseName;
+
     @Schema(description = "仓库类型")
     private String storeType;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/storearea/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/storearea/index.vue
index bec36f5..36e2bf4 100644
--- a/jnpf-java-boot/jnpf-web/src/views/example/storearea/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/example/storearea/index.vue
@@ -10,11 +10,11 @@
               </JnpfSelect>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="6">-->
-<!--            <el-form-item label="仓库名称">-->
-<!--              <el-input v-model="query.storeHouseName" placeholder="请输入" clearable></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <el-col :span="6">
+            <el-form-item label="仓库名称">
+              <el-input v-model="query.storeHouseName" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="状态">
               <JnpfSelect v-model="query.enabledStatus" placeholder="请选择" clearable :options="enabledStatusOptions"