From c9a4ec6445755e1a7b6e56f9b0df7612f7074af3 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Wed, 8 Mar 2023 18:37:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StorageCellServiceImpl.java     | 10 +++++++++-
 .../src/views/acs/device/storageCell/index.vue   | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java
index 42367c9fa..86b6c944a 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java
@@ -48,9 +48,17 @@ public class StorageCellServiceImpl implements StorageCellService {
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         String storage_code = MapUtil.getStr(whereJson, "storage_code");
+        String parent_storage_code = MapUtil.getStr(whereJson, "parent_storage_code");
+        String address = MapUtil.getStr(whereJson, "address");
         String where = "";
         if (StrUtil.isNotEmpty(storage_code)) {
-            where = " and storage_code like '%" + storage_code + "%'";
+            where += " and storage_code like '%" + storage_code + "%'";
+        }
+        if (StrUtil.isNotEmpty(parent_storage_code)) {
+            where += " and parent_storage_code like '%" + parent_storage_code + "%'";
+        }
+        if (StrUtil.isNotEmpty(address)) {
+            where += " and address like '%" + address + "%'";
         }
         WQLObject wo = WQLObject.getWQLObject("acs_storage_cell");
         ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1 = 1 " + where, "update_time desc");
diff --git a/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue b/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue
index bf0d0adc4..e35fd92eb 100644
--- a/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue
@@ -12,6 +12,22 @@
           style="width: 200px;"
           class="filter-item"
         />
+        <el-input
+          v-model="query.parent_storage_code"
+          size="small"
+          clearable
+          placeholder="输入父级货位编码"
+          style="width: 200px;"
+          class="filter-item"
+        />
+        <el-input
+          v-model="query.address"
+          size="small"
+          clearable
+          placeholder="输入agv站点"
+          style="width: 200px;"
+          class="filter-item"
+        />
         <rrOperation />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->