From 79027042e5080db784c1de2630ee42edf0aa73be Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 26 Nov 2024 11:06:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=862?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml | 5 ++++-
 .../wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java | 1 +
 .../biz/base/wmswarehousearea/WmsWarehouseAreaService.java   | 3 +++
 .../wms/biz/base/wmswarehousearea/WmsWarehouseAreaVo.java    | 4 +++-
 .../base/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java    | 2 ++
 .../wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml | 5 ++++-
 .../wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java    | 2 ++
 .../wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml | 5 ++++-
 .../wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java | 1 +
 .../biz/base/wmswarehouserack/WmsWarehouseRackService.java   | 4 ++++
 .../wms/biz/base/wmswarehouserack/WmsWarehouseRackVo.java    | 3 +++
 .../wms/biz/base/wmswarehousezone/WmsWarehouseZoneMapper.xml | 5 ++++-
 .../wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java    | 2 ++
 13 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml
index 4b41d6bc9e..bfaf4f8e3f 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml
@@ -6,12 +6,15 @@
 
     <select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo">
         select
-        a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName,z.zoneName
+        a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName,z.zoneName,
+        b.warehouseTypeValue,s.`name` as deptName,
+        so.`name` as createOrgName
         from wms_warehouse_area a
         left join wms_warehouse_info b on b.sid=a.warehouseSid
         left join wms_warehouse_zone z on z.sid=a.zoneSid
         left join wms_warehouse_area_type c on c.sid =a.areaTypeSid
         LEFT JOIN anrui_portal.sys_organization as s ON b.useOrgSid = s.sid
+        LEFT JOIN anrui_portal.sys_organization as so ON b.createOrgSid = so.sid
         <where>
             ${ew.sqlSegment}
         </where>
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 7c9f985221..9d67ab38eb 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
@@ -15,6 +15,7 @@ public class WmsWarehouseAreaQuery implements Query {
     private String warehouseSid;//仓库
     private String areaTypeSid;//库区类型
     private String zoneSid;//区域类型
+    private String warehouseTypeValue;//区域类型
 
     @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 e1a7e4ab26..adf71a4d78 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.getWarehouseTypeValue())) {
+            qw.eq("b.warehouseTypeValue", query.getWarehouseTypeValue());
+        }
         if (StringUtils.isNotBlank(query.getZoneSid())) {
             qw.eq("z.sid", query.getZoneSid());
         }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaVo.java
index ef1b96c880..c2aec38ed9 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaVo.java
@@ -34,6 +34,8 @@ public class WmsWarehouseAreaVo implements Vo {
     private String zoneName;//区域名称
     private String areaTypeName;//货区类型名称
     private String userSid;
-
+    private String warehouseTypeValue;
+    private String deptName;
+    private String createOrgName;
 
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java
index d2f1602d27..c24dd081d7 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java
@@ -28,4 +28,6 @@ public class WmsWarehouseAreaTypeVo implements Vo {
     private String createOrgSid;//创建组织sid
     private String orgPath;
     private String userSid;
+    private String deptName;
+    private String createOrgName;
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml
index 90f16bd89d..9460cceda3 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml
@@ -6,10 +6,13 @@
 
     <select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoVo">
         SELECT
-        w.*
+        w.*,
+               s.`name` as deptName,
+               so.`name` as createOrgName
         FROM
         wms_warehouse_info as w
         LEFT JOIN anrui_portal.sys_organization as s ON w.useOrgSid = s.sid
+        LEFT JOIN anrui_portal.sys_organization as so ON w.createOrgSid = so.sid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java
index 8dec53b2c2..bb0a9f04c6 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java
@@ -45,4 +45,6 @@ public class WmsWarehouseInfoVo implements Vo {
     private String useOrgSid;//创建组织sid
     private String createOrgSid;//创建组织sid
     private List<WmsWarehouseExtendVo> wmsWarehouseExtendVos;
+    private String deptName;
+    private String createOrgName;
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml
index ef9a9249c4..cffd0c0e58 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml
@@ -6,12 +6,15 @@
 
     <select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo">
         select
-        a.*,b.areaName as locationName ,c.warehouseName as warehouseName,z.zoneName
+        a.*,b.areaName as locationName ,c.warehouseName as warehouseName,z.zoneName,c.warehouseTypeValue,
+        s.`name` as deptName,
+        so.`name` as createOrgName
         from wms_warehouse_rack a
         left join wms_warehouse_area b on b.sid =a.locationSid
         left join wms_warehouse_info c on c.sid = a.warehouseSid
         left join wms_warehouse_zone z on z.sid = a.zoneSid
         LEFT JOIN anrui_portal.sys_organization as s ON c.useOrgSid = s.sid
+        LEFT JOIN anrui_portal.sys_organization as so ON c.createOrgSid = so.sid
         <where>
             ${ew.sqlSegment}
         </where>
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 9720e169bd..835c099ce7 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
@@ -15,6 +15,7 @@ public class WmsWarehouseRackQuery implements Query {
     private String warehouseSid;//仓库
     private String areaTypeSid;//库区类型
     private String zoneSid;//区域类型
+    private String warehouseTypeValue;
     @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 23a2fddbb2..3c886d699e 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
@@ -97,6 +97,10 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
         if (StringUtils.isNotBlank(query.getZoneSid())) {
             qw.eq("z.sid", query.getZoneSid());
         }
+        if (StringUtils.isNotBlank(query.getWarehouseTypeValue())) {
+            qw.eq("c.warehouseTypeValue", query.getWarehouseTypeValue());
+        }
+
         qw.ne("a.isDelete", "1");
         IPage<WmsWarehouseRack> page = PagerUtil.queryToPage(pq);
         IPage<WmsWarehouseRackVo> pagging = baseMapper.listPage(page, qw);
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackVo.java
index 0e782a3696..09b2355167 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackVo.java
@@ -32,4 +32,7 @@ public class WmsWarehouseRackVo implements Vo {
     private String userSid;
     private String zoneSid;//区域sid
     private String zoneName;//区域名称
+    private String warehouseTypeValue;
+    private String deptName;
+    private String createOrgName;
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneMapper.xml
index e72671165d..ca3f0ec40c 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneMapper.xml
@@ -15,10 +15,13 @@
 
     <select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneVo">
         select
-        a.*,b.warehouseName as warehouseName,b.warehouseTypeValue as warehouseTypeValue
+        a.*,b.warehouseName as warehouseName,b.warehouseTypeValue as warehouseTypeValue,
+        s.`name` as deptName,
+        so.`name` as createOrgName
         from wms_warehouse_zone a
         left join wms_warehouse_info b on b.sid=a.warehouseSid
         LEFT JOIN anrui_portal.sys_organization as s ON b.useOrgSid = s.sid
+        LEFT JOIN anrui_portal.sys_organization as so ON b.createOrgSid = so.sid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java
index 3d2d5db966..6ee6a02622 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java
@@ -24,4 +24,6 @@ public class WmsWarehouseZoneVo implements Vo {
     private String unit;//计量单位
     private String warehouseName;//仓库名称
     private String warehouseTypeValue;//仓库类型
+    private String deptName;
+    private String createOrgName;
 }