From 06750806f27c62295d6ebb49a7dc17dc4d5b8b0e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 26 九月 2025 17:52:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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