From 325cfc75ab814b3a409955616297d6c0828a31f1 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 13 Nov 2024 16:22:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/base/wmswarehouserack/WmsHouseInfoVo.java   |  2 ++
 .../wmswarehouserack/WmsWarehouseRackService.java   | 13 ++++++++++++-
 .../inventory/wmsinventory/WmsInventoryService.java |  6 +++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

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<WmsWarehouseRack
     private WmsWarehouseInfoService wmsWarehouseInfoService;
     @Autowired
     private WmsWarehouseAreaService wmsWarehouseAreaService;
-
+    @Autowired
+    private WmsWarehouseZoneService wmsWarehouseZoneService;
     public ResultBean<PagerVo<WmsWarehouseRackVo>> listPage(PagerQuery<WmsWarehouseRackQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WmsWarehouseRackQuery query = pq.getParams();
@@ -262,6 +265,14 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
             if (null != wmsWarehouseArea) {
                 info.setWareAreaSid(wmsWarehouseArea.getSid());
                 info.setWareAreaName(wmsWarehouseArea.getAreaName());
+                if (StringUtils.isNotBlank(wmsWarehouseArea.getZoneSid())) {
+                    WmsWarehouseZone wmsWarehouseZone = wmsWarehouseZoneService.fetchBySid(wmsWarehouseArea.getZoneSid());
+                    if (null != wmsWarehouseZone) {
+                     info.setWarehouseZoneName(wmsWarehouseZone.getZoneName());
+                     info.setWarehouseZoneSid(wmsWarehouseZone.getSid());
+                    }
+                }
+
             }
         } else {
             return rb;
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
index 287c2f60db..78a305f59f 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
@@ -585,6 +585,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         String houseName = "";
         String areaName = "";
         String rackName = "";
+        String zoneName = "";
         if (null != infoVo) {
             if (StringUtils.isNotBlank(infoVo.getWarehouseName())) {
                 houseName = infoVo.getWarehouseName();
@@ -595,7 +596,10 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             if (StringUtils.isNotBlank(infoVo.getWarehouseRackName())) {
                 rackName = infoVo.getWarehouseRackName();
             }
-            vo.setHouseName(houseName + "-" + areaName + "-" + rackName);
+            if (StringUtils.isNotBlank(infoVo.getWarehouseZoneName())) {
+                zoneName = infoVo.getWarehouseZoneName();
+            }
+            vo.setHouseName(houseName + "-" + zoneName + "-" + areaName);
             if (StringUtils.isNotBlank(infoVo.getWarehouseRackCode())) {
                 vo.setHouseAddress(infoVo.getWarehouseRackCode());
             }