From 5ac4f450b6b4bd726cefb57a626a46c56dbbc42e Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 02 四月 2026 16:01:12 +0800
Subject: [PATCH] fix: BOM导入去除单层限制
---
src/main/java/com/ruoyi/production/service/impl/ProductionSettlementBatchesServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionSettlementBatchesServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionSettlementBatchesServiceImpl.java
index b036f7e..fc9745e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionSettlementBatchesServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionSettlementBatchesServiceImpl.java
@@ -257,8 +257,8 @@
List<Energy> energies = energyService.list();
Map<String, Energy> energyMap = new HashMap<>();
for (Energy energy : energies) {
- if (energy.getEnergyName() != null) {
- energyMap.put(energy.getEnergyName(), energy);
+ if (energy.getEnergyTyep() != null) {
+ energyMap.put(energy.getEnergyTyep(), energy);
}
}
@@ -442,7 +442,7 @@
.flatMap(List::stream)
.collect(Collectors.toList());
- // 鎸� dto 涓殑鍏朵綑鏉′欢鍦ㄥ唴瀛樹腑杩囨护
+ // 鎸� dto 涓殑鍏朵綑鏉′欢杩囨护
if (dto != null) {
if (StringUtils.isNotBlank(dto.getProductType())) {
String targetType = dto.getProductType().trim();
--
Gitblit v1.9.3