From 733b9e6837365d2817d7e8a0005b2c167c18f77e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 19 六月 2025 17:58:48 +0800
Subject: [PATCH] 1.生产加工 2.煤种id优化
---
main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java | 92 +++++++++++++++++++++++++++++-----------------
1 files changed, 58 insertions(+), 34 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java
index 0a9dcc1..ff10b10 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java
@@ -5,26 +5,21 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.entity.CoalInfo;
+import com.ruoyi.basic.mapper.CoalInfoMapper;
import com.ruoyi.business.dto.ProductionMasterDto;
-import com.ruoyi.business.entity.OfficialInventory;
-import com.ruoyi.business.entity.Production;
-import com.ruoyi.business.entity.ProductionInventory;
-import com.ruoyi.business.entity.ProductionMaster;
-import com.ruoyi.business.mapper.OfficialInventoryMapper;
-import com.ruoyi.business.mapper.ProductionInventoryMapper;
-import com.ruoyi.business.mapper.ProductionMapper;
-import com.ruoyi.business.mapper.ProductionMasterMapper;
+import com.ruoyi.business.entity.*;
+import com.ruoyi.business.mapper.*;
import com.ruoyi.business.service.ProductionMasterService;
-import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.system.mapper.SysUserMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -47,7 +42,9 @@
private final OfficialInventoryMapper officialInventoryMapper;
- private final SysUserMapper sysUserMapper;
+ private final CoalInfoMapper coalInfoMapper;
+
+ private final PendingInventoryMapper pendingInventoryMapper;
@Override
public IPage<ProductionMasterDto> selectPMList(Page page, ProductionMasterDto productionMasterDto) {
@@ -126,8 +123,7 @@
BigDecimal totalEnergyConsumptionCost = BigDecimal.ZERO;
BigDecimal totalTotalCost = BigDecimal.ZERO;
BigDecimal totalEquipmentDepreciation = BigDecimal.ZERO;
- int totalProductionQuantity = 0;
- StringBuilder coalBuilder = new StringBuilder();
+ BigDecimal totalProductionQuantity = BigDecimal.ZERO;
for (Production production : productionMasterDto.getProductionList()) {
totalPurchasePrice = totalPurchasePrice.add(production.getPurchasePrice());
@@ -135,13 +131,14 @@
totalEnergyConsumptionCost = totalEnergyConsumptionCost.add(production.getEnergyConsumptionCost());
totalTotalCost = totalTotalCost.add(production.getTotalCost());
totalEquipmentDepreciation = totalEquipmentDepreciation.add(production.getEquipmentDepreciation());
- totalProductionQuantity += production.getProductionQuantity();
- if (coalBuilder.length() > 0) {
- coalBuilder.append(","); // 鍦ㄥ厓绱犱箣闂存坊鍔犻�楀彿
- }
- coalBuilder.append(production.getCoal());
+ totalProductionQuantity = production.getProductionQuantity().add(totalProductionQuantity);
}
- String coalStr = coalBuilder.toString(); // 鐩存帴鑾峰彇鎷兼帴缁撴灉
+ //鐓ょ瀛楁
+ List<Long> coalIds = productionMasterDto.getProductionList().stream()
+ .map(Production::getCoalId)
+ .collect(Collectors.toList());
+
+ List<CoalInfo> coalInfos = coalInfoMapper.selectList(new LambdaQueryWrapper<CoalInfo>().in(CoalInfo::getId, coalIds));
// 2. 鍒涘缓涓昏〃瀵硅薄
ProductionMaster productionMaster = new ProductionMaster();
@@ -150,18 +147,13 @@
productionMaster.setEquipmentDepreciation(totalEquipmentDepreciation);
productionMaster.setEnergyConsumptionCost(totalEnergyConsumptionCost);
productionMaster.setLaborCost(totalLaborCost);
- productionMaster.setCoal(coalStr);
+ productionMaster.setCoal(coalInfos.stream().map(CoalInfo::getCoal).collect(Collectors.joining(",")));
+ productionMaster.setCoalId(coalIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
Long masterId = productionMasterDto.getId();
productionMaster.setId(masterId);
// 3. 缁熶竴瀛愯〃澶勭悊閫昏緫
- Long producerId = productionMasterDto.getProducerId();
- if (producerId == null) {
- throw new BaseException("璇烽�夋嫨鐢熶骇鑰�");
- }
- SysUser sysUser = sysUserMapper.selectUserById(producerId);
- productionMaster.setProducer(sysUser.getUserName());
if (masterId == null) {
productionMasterMapper.insert(productionMaster);
masterId = productionMaster.getId(); // 鑾峰彇鏂扮敓鎴愮殑ID
@@ -190,22 +182,54 @@
batchInsertProductions(masterId, productionMasterDto.getProductionList());
batchInsertInventories(masterId, productionMasterDto.getProductionInventoryList());
+ //5. 鎻掑叆鍒板緟鍏ュ簱
+ for (Production production : productionMasterDto.getProductionList()) {
+ PendingInventory pendingInventory = new PendingInventory();
+ pendingInventory.setCoalId(production.getCoalId());
+ pendingInventory.setInventoryQuantity(production.getProductionQuantity());
+ pendingInventory.setSupplierName("鐢熶骇鍔犲伐鍏ュ簱");
+ pendingInventory.setTotalPriceIncludingTax(production.getTotalCost());
+ pendingInventory.setPriceIncludingTax(production.getPurchasePrice());
+ }
return 1;
}
// 鎵归噺鎻掑叆鐢熶骇鏁版嵁
private void batchInsertProductions(Long masterId, List<Production> productions) {
- List<Production> insertList = productions.stream()
- .peek(p -> {
- p.setId(null);
- p.setProductionMasterId(masterId);
- })
+ if (productions.isEmpty()) {
+ return;
+ }
+ // 1. 鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑coalId
+ List<Long> coalIds = productions.stream()
+ .map(Production::getCoalId)
+ .filter(Objects::nonNull)
+ .distinct()
.collect(Collectors.toList());
- if (!insertList.isEmpty()) {
- for (Production production : productions) {
+ // 2. 鎵归噺鏌ヨcoalInfo鏁版嵁
+ Map<Long, CoalInfo> coalInfoMap = coalIds.isEmpty() ?
+ Collections.emptyMap() :
+ coalInfoMapper.selectList(new LambdaQueryWrapper<CoalInfo>().in(CoalInfo::getId, coalIds))
+ .stream()
+ .collect(Collectors.toMap(CoalInfo::getId, Function.identity()));
+ if (coalInfoMap.isEmpty()){
+ throw new BaseException("鐓ょ淇℃伅涓嶅瓨鍦�");
+ }
+
+ // 3. 鍑嗗鎵归噺鎻掑叆鏁版嵁
+ List<Production> batchInsertList = productions.stream()
+ .map(production -> {
+ Production p = new Production(); // 鍒涘缓鏂板璞￠伩鍏嶅壇浣滅敤
+ BeanUtils.copyProperties(production, p);
+ // 澶嶅埗蹇呰瀛楁
+ p.setProductionMasterId(masterId);
+ p.setCoalId(production.getCoalId());
+ return p;
+ })
+ .collect(Collectors.toList());
+ if (!batchInsertList.isEmpty()) {
+ for (Production production : batchInsertList) {
production.setId(null);
- production.setProductionMasterId(masterId);
productionMapper.insert(production);
}
}
--
Gitblit v1.9.3