From cda57123aaddf9d14a15decbe432fb9e26629101 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 28 四月 2026 16:27:59 +0800
Subject: [PATCH] feat: 石灰与生石灰一起统计
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index acd2b54..bbf7427 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -3296,7 +3296,7 @@
dayDto.setFlyAsh(dayDto.getFlyAsh().add(qty));
} else if ("鐭宠啅".equals(materialName)) {
dayDto.setGypsum(dayDto.getGypsum().add(qty));
- } else if ("鐭崇伆".equals(materialName)) {
+ } else if ("鐭崇伆".equals(materialName) || "鐢熺煶鐏�".equals(materialName)) {
dayDto.setLime(dayDto.getLime().add(qty));
}
dayDto.setTotal(dayDto.getTotal().add(qty));
@@ -3442,7 +3442,7 @@
BigDecimal totalAmount = BigDecimal.ZERO;
BigDecimal cumulativeAmount = BigDecimal.ZERO;
- Set<String> targetMaterials = new HashSet<>(Arrays.asList("绮夌叅鐏�", "鐭宠啅", "鐭崇伆"));
+ Set<String> targetMaterials = new HashSet<>(Arrays.asList("绮夌叅鐏�", "鐭宠啅", "鐭崇伆", "鐢熺煶鐏�"));
for (ProductionProductInput input : allInputs) {
String materialName = skuToMaterialNameMap.get(input.getProductId());
@@ -3520,6 +3520,9 @@
for (ProductionProductInput input : allInputs) {
String materialName = skuToMaterialNameMap.get(input.getProductId());
+ if ("鐢熺煶鐏�".equals(materialName)) {
+ materialName = "鐭崇伆";
+ }
if (materialName == null || !countMap.containsKey(materialName)) continue;
BigDecimal qty = UnitUtils.convertValueToTon(input.getQuantity(), input.getUnit());
@@ -3734,6 +3737,9 @@
String label = dictCodeToLabelMap.get(dictCode);
String materialName = skuToMaterialNameMap.get(input.getProductId());
if (materialName == null) continue;
+ if ("鐢熺煶鐏�".equals(materialName)) {
+ materialName = "鐭崇伆";
+ }
BigDecimal qty = UnitUtils.convertValueToTon(input.getQuantity(), input.getUnit());
--
Gitblit v1.9.3