diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsHouseInfoVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsHouseInfoVo.java index ab00dbe8f9..24495b4b87 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsHouseInfoVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsHouseInfoVo.java @@ -17,4 +17,6 @@ public class WmsHouseInfoVo { private String warehouseRackSid;//库位sid private String warehouseRackCode; private String warehouseRackName; + private String warehouseZoneSid;//区域 + private String warehouseZoneName; } 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 5c2b55e688..23a2fddbb2 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 @@ -15,6 +15,8 @@ import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaService; import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService; +import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone; +import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneService; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import org.springframework.beans.factory.annotation.Autowired; @@ -38,7 +40,8 @@ public class WmsWarehouseRackService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); WmsWarehouseRackQuery query = pq.getParams(); @@ -262,6 +265,14 @@ public class WmsWarehouseRackService extends MybatisBaseService