From 8c16f4a6539d696075cb6df4b2b1d6bb0a77334e Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 27 Nov 2024 16:26:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml  | 4 +++-
 .../yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaVo.java | 1 +
 .../wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml  | 4 +++-
 .../yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackVo.java | 1 +
 4 files changed, 8 insertions(+), 2 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 bfaf4f8e3f..85b26e54c2 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
@@ -24,7 +24,9 @@
                a.createBySid           as userSid,
                b.warehouseName         as warehouseName,
                c.warehouseAreaTypeName as areaTypeName,
-               z.zoneName as zoneName
+               z.zoneName as zoneName,
+               b.warehouseTypeKey,
+               b.warehouseTypeValue
         from wms_warehouse_area a
                  left join wms_warehouse_info b on b.sid = a.warehouseSid
                  left join wms_warehouse_area_type c on c.sid = a.areaTypeSid
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 c2aec38ed9..0356647cd3 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
@@ -35,6 +35,7 @@ public class WmsWarehouseAreaVo implements Vo {
     private String areaTypeName;//货区类型名称
     private String userSid;
     private String warehouseTypeValue;
+    private String warehouseTypeKey;
     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 cffd0c0e58..954cefc201 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
@@ -21,7 +21,9 @@
     </select>
     <select id="initialization" resultType="com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo">
         select
-            a.*,a.createBySid as userSid,b.areaName as locationName ,c.warehouseName as warehouseName,z.zoneName as zoneName
+            a.*,a.createBySid as userSid,b.areaName as locationName ,c.warehouseName as warehouseName,z.zoneName as zoneName,
+            c.warehouseTypeKey,
+            c.warehouseTypeValue
         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
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 09b2355167..f1fa442a23 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
@@ -33,6 +33,7 @@ public class WmsWarehouseRackVo implements Vo {
     private String zoneSid;//区域sid
     private String zoneName;//区域名称
     private String warehouseTypeValue;
+    private String warehouseTypeKey;
     private String deptName;
     private String createOrgName;
 }