From b6ea511f0ef537073bead4eefe7c0a90ccbe9aeb Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 24 Apr 2025 15:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E6=97=A7=E4=BB=B6=E4=B8=8A=E6=9E=B6=E7=A1=AE=E8=AE=A4=E7=9A=84?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wmsoldinventory/WmsOldInventoryService.java    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
index 8809fdfd38..a41cd71a6b 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
@@ -11,6 +11,8 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory;
@@ -69,6 +71,9 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
     @Autowired
     private AsBusrepairBillFeign asBusrepairBillFeign;
 
+    @Autowired
+    private WmsWarehouseInfoService wmsWarehouseInfoService;
+
     public PagerVo<WmsOldInventoryVo> listPage(PagerQuery<WmsOldInventoryQuery> pagerQuery) {
         WmsOldInventoryQuery query = pagerQuery.getParams();
         QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>();
@@ -594,6 +599,7 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             AsBusrepairInventorybillDetail asBusrepairInventorybillDetail = asBusrepairInventorybillDetailFeign.getOldDetailsByOldGoodsId(wmsBusrepairInventorybillDetailOldApp.getGoodsID()).getData();
             WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsBusrepairInventorybillDetailOldApp.getWarehouseRackCode());
             String kcSid = wmsInventoryService.selByGoodsIdAndRackSid(wmsBusrepairInventorybillDetailOldApp.getGoodsID(), wmsWarehouseRack.getSid());
+            WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(wmsWarehouseRack.getWarehouseSid());
             if (StringUtils.isNotBlank(kcSid)){
                 WmsUpdateCountQuery wmsUpdateCountQuery = new WmsUpdateCountQuery();
                 wmsUpdateCountQuery.setSid(kcSid);
@@ -619,8 +625,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
                 dto.setManufacturerName(asBusrepairInventorybillDetail.getManufacturerName());
                 dto.setUnit(asBusrepairInventorybillDetail.getUnit());
                 dto.setCount(asBusrepairInventorybillDetail.getCount().toString());
-                dto.setWarehouseSid(asBusrepairInventorybillDetail.getWarehouseSid());
-                dto.setWarehouseName(asBusrepairInventorybillDetail.getWarehouseName());
+                dto.setWarehouseSid(warehouseInfo.getSid());
+                dto.setWarehouseName(warehouseInfo.getWarehouseName());
                 dto.setWarehouseRackSid(wmsWarehouseRack.getSid());
                 dto.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
                 dto.setFirstInDate(DateUtil.today());
@@ -659,8 +665,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             wmsInventoryRecord.setCurrentCount(asBusrepairInventorybillDetail.getCount());
             wmsInventoryRecord.setUnit(asBusrepairInventorybillDetail.getUnit());
             wmsInventoryRecord.setCount(asBusrepairInventorybillDetail.getCount());
-            wmsInventoryRecord.setWarehouseSid(asBusrepairInventorybillDetail.getWarehouseSid());
-            wmsInventoryRecord.setWarehouseName(asBusrepairInventorybillDetail.getWarehouseName());
+            wmsInventoryRecord.setWarehouseSid(warehouseInfo.getSid());
+            wmsInventoryRecord.setWarehouseName(warehouseInfo.getWarehouseName());
             wmsInventoryRecord.setWarehouseRackSid(wmsWarehouseRack.getSid());
             wmsInventoryRecord.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
             SysUserVo sysUserVo = sysUserFeign.fetchBySid(wmsOldGroundConfirm.getCreateBySid()).getData();