From 47291cc9294a0d31ab61acf13f82c36ba061cb91 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 25 三月 2026 14:48:26 +0800
Subject: [PATCH] feat(approve): 在审批记录中添加发货数量信息

---
 src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
index 8dc3ac4..74276a7 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
@@ -150,7 +150,8 @@
     private WarehouseTreeDto convertToShelfTreeDto(WarehouseGoodsShelves shelf) {
         WarehouseTreeDto dto = new WarehouseTreeDto();
         copyProperties(shelf, dto);
-        dto.setLabel(shelf.getGoodsShelvesName());
+//        dto.setLabel(shelf.getGoodsShelvesName());
+        dto.setLabel(shelf.getName());
         dto.setChildren(new ArrayList<>());
         return dto;
     }
@@ -161,7 +162,8 @@
     private WarehouseTreeDto convertToRowcolTreeDto(WarehouseGoodsShelvesRowcol rowcol) {
         WarehouseTreeDto dto = new WarehouseTreeDto();
         copyProperties(rowcol, dto);
-        dto.setLabel(rowcol.getStorey() + "-" + rowcol.getArrange());
+//        dto.setLabel(rowcol.getStorey() + "-" + rowcol.getArrange());
+        dto.setLabel(rowcol.getRow() + "-" + rowcol.getCol());
         dto.setChildren(new ArrayList<>());
         return dto;
     }

--
Gitblit v1.9.3