完善区域管理

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;

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

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")

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