From 24b02347e8e2594e0ebff9dd6b4f2ae48bd711e2 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 18 Sep 2024 09:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8C=BA=E5=9F=9F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java   | 1 +
 .../wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java | 3 +++
 .../wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java   | 1 +
 .../wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java
index 2f95de1bf6..7c9f985221 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java
@@ -14,6 +14,7 @@ public class WmsWarehouseAreaQuery implements Query {
     private String code;//编码
     private String warehouseSid;//仓库
     private String areaTypeSid;//库区类型
+    private String zoneSid;//区域类型
 
     @ApiModelProperty("菜单路由")
     private String menuUrl;
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java
index 536e030259..e1a7e4ab26 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java
@@ -95,6 +95,9 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
         if (StringUtils.isNotBlank(query.getWarehouseSid())) {
             qw.eq("b.sid", query.getWarehouseSid());
         }
+        if (StringUtils.isNotBlank(query.getZoneSid())) {
+            qw.eq("z.sid", query.getZoneSid());
+        }
         if (StringUtils.isNotBlank(query.getAreaTypeSid())) {
             qw.eq("c.sid", query.getAreaTypeSid());
         }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java
index 28d64b0c24..9720e169bd 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java
@@ -14,6 +14,7 @@ public class WmsWarehouseRackQuery implements Query {
     private String code;//编码
     private String warehouseSid;//仓库
     private String areaTypeSid;//库区类型
+    private String zoneSid;//区域类型
     @ApiModelProperty("菜单路由")
     private String menuUrl;
     @ApiModelProperty("组织全路径sid")
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
index ad4cdcf6a6..5c2b55e688 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
@@ -91,6 +91,9 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
         if (StringUtils.isNotBlank(query.getWarehouseSid())) {
             qw.eq("c.sid", query.getWarehouseSid());
         }
+        if (StringUtils.isNotBlank(query.getZoneSid())) {
+            qw.eq("z.sid", query.getZoneSid());
+        }
         qw.ne("a.isDelete", "1");
         IPage<WmsWarehouseRack> page = PagerUtil.queryToPage(pq);
         IPage<WmsWarehouseRackVo> pagging = baseMapper.listPage(page, qw);