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 @@