From 712b1df6fdee09bd92388a60a9f5d890d711387b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 19 三月 2026 17:34:24 +0800
Subject: [PATCH] fix:1.入库管理和耗材导出优化 2.仓储物流和耗材物流导出修改 3.首页统计仓储物流和耗材物料两边的数据
---
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