From 0339c7b3d12bfdb9f4ab1acc330bb8a35704cd71 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 13 Nov 2024 13:49:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/wmsgoodstag/app/HouseRackPrint.java  |  8 ++++++--
 .../wmsshelfbill/WmsShelfBillService.java          | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/app/HouseRackPrint.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/app/HouseRackPrint.java
index ce195edd31..39ee1867bf 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/app/HouseRackPrint.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/app/HouseRackPrint.java
@@ -14,11 +14,15 @@ public class HouseRackPrint {
      */
     private String qrText;
     /**
-     * 库区名称，名称:xxx
+     * 仓库名称
+     */
+    private String text;
+    /**
+     * 库区名称
      */
     private String text0;
     /**
-     * 仓库名称，竖着的那个文字
+     * 仓库区域
      */
     private String text00;
     /**
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
index 13a2c5d566..4b7150364f 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
@@ -17,6 +17,8 @@ import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsHouseInfoVo;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
+import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone;
+import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneService;
 import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBill;
 import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillService;
 import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsListDetailsVo;
@@ -76,6 +78,8 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
 
     @Autowired
     private WmsInventoryService wmsInventoryService;
+    @Autowired
+    private WmsWarehouseZoneService wmsWarehouseZoneService;
     @Resource
     private BaseGoodsSkuFeign baseGoodsSkuFeign;
 
@@ -1200,11 +1204,19 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                 String locationSid = rack.getLocationSid();
                 WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(warehouseSid);
                 if (null != warehouseInfo) {
-                    print.setText00(warehouseInfo.getWarehouseName());
+                    print.setText(warehouseInfo.getWarehouseName());
                 }
                 WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(locationSid);
                 if (null != wmsWarehouseArea) {
                     print.setText0(wmsWarehouseArea.getAreaName());
+                    if (StringUtils.isNotBlank(wmsWarehouseArea.getZoneSid())) {
+                        WmsWarehouseZone zone = wmsWarehouseZoneService.fetchBySid(wmsWarehouseArea.getZoneSid());
+                        if (null != zone) {
+                            if (StringUtils.isNotBlank(zone.getZoneName())) {
+                                print.setText00(zone.getZoneName());
+                            }
+                        }
+                    }
                 }
                 String[] split = rack.getRackCode().split("-");
                 if (split.length >= 4) {