From 2c51e2bac7e271f6bd1a7da060e4ffd327d5a8d2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 28 四月 2026 18:06:06 +0800
Subject: [PATCH] feat(production): 更新生产核算逻辑以支持设备和工时计算
---
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