From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
index 913280a..b73d629 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -11,6 +11,7 @@
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.MatrixToImageWriter;
import com.ruoyi.production.dto.ProductWorkOrderDto;
+import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductWorkOrderService;
@@ -30,6 +31,7 @@
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
@Service
@@ -44,6 +46,10 @@
private ProductProcessRouteItemMapper productProcessRouteItemMapper;
@Autowired
private ProductProcessMapper productProcessMapper;
+ @Autowired
+ private ProductProcessRouteMapper productProcessRouteMapper;
+ @Autowired
+ private ProductStructureMapper productStructureMapper;
@Autowired
private ProductionProductMainMapper productionProductMainMapper;
@Autowired
@@ -61,6 +67,7 @@
@Override
public IPage<ProductWorkOrderDto> listPage(Page<ProductWorkOrderDto> page, ProductWorkOrderDto productWorkOrder) {
IPage<ProductWorkOrderDto> productWorkOrderDtoIPage = productWorkOrdermapper.pageProductWorkOrder(page, productWorkOrder);
+ Map<String, BigDecimal> bomInputQtyCache = new HashMap<>();
productWorkOrderDtoIPage.getRecords().forEach(record -> {
// 鏄惁鑳芥姤宸ワ細 1. 绗竴涓伐搴忚兘鎶ュ伐 2. 涓婁竴涓伐搴忓凡鎶ュ伐 3. 涔嬪墠鐨勫伐搴忔湭琚殧绂�
Integer currentDragSort = record.getDragSort();
@@ -69,7 +76,7 @@
} else {
// 涓婁竴涓伐搴忔槸鍚﹀凡鎶ュ伐
boolean isPreviousReported = productionProductMainMapper.checkPreviousProcessReported(
- record.getProductRouteId(),
+ record.getId(),
currentDragSort
);
record.setIsCanReport(isPreviousReported);
@@ -94,7 +101,13 @@
}
// 妫�鏌ヤ箣鍓嶇殑宸ュ簭鏄惁鏈夎闅旂鐨勪笉鍚堟牸璁板綍
- List<QualityUnqualified> unqualifiedList = qualityUnqualifiedMapper.selectUnqualifiedByProcessNames(previousProcessNames);
+ List<QualityUnqualified> unqualifiedList = Collections.emptyList();
+ if (CollectionUtils.isNotEmpty(previousProcessNames)) {
+ unqualifiedList = qualityUnqualifiedMapper.selectUnqualifiedByProductOrderAndProcessNames(
+ record.getProductOrderId(),
+ previousProcessNames
+ );
+ }
if (CollectionUtils.isNotEmpty(unqualifiedList)) {
record.setIsCanReport(false);
}
@@ -120,6 +133,62 @@
} else {
record.setActualQualifiedRate((record.getCompleteQuantity().subtract(totalScrapQty)).multiply(BigDecimal.valueOf(100)));
}
+
+ // 鏌ヨ褰撳墠宸ュ崟瀵瑰簲浜у搧缁撴瀯涓殑鏍囧噯鎶曞叆鏁伴噺
+ String bomInputQtyCacheKey = record.getProductRouteId() + "_" + record.getProcessId() + "_" + record.getPlanQuantity();
+ BigDecimal bomInputQty = bomInputQtyCache.get(bomInputQtyCacheKey);
+ if (bomInputQty == null) {
+ bomInputQty = BigDecimal.ZERO;
+ ProductProcessRoute productProcessRoute = productProcessRouteMapper.selectById(record.getProductRouteId());
+ if (productProcessRoute != null && productProcessRoute.getBomId() != null && record.getProcessId() != null) {
+ List<ProductStructureDto> productStructureDtos = productStructureMapper.listBybomAndProcess(
+ productProcessRoute.getBomId(),
+ record.getProcessId()
+ );
+
+ if (CollectionUtils.isEmpty(productStructureDtos)) {
+ bomInputQty = record.getPlanQuantity() == null ? BigDecimal.ZERO : record.getPlanQuantity();
+ } else {
+ Set<Long> parentIds = productStructureDtos.stream()
+ .map(ProductStructureDto::getParentId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+
+ Map<Long, ProductStructureDto> parentMap = new HashMap<>();
+ if (CollectionUtils.isNotEmpty(parentIds)) {
+ parentMap = productStructureMapper.selectByIds(parentIds)
+ .stream()
+ .collect(Collectors.toMap(ProductStructureDto::getId, Function.identity(), (a, b) -> a));
+ }
+
+ BigDecimal planQty = record.getPlanQuantity() == null ? BigDecimal.ZERO : record.getPlanQuantity();
+ for (ProductStructureDto productStructureDto : productStructureDtos) {
+ BigDecimal childQty = productStructureDto.getUnitQuantity();
+ if (childQty == null || childQty.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+
+ BigDecimal parentQty = BigDecimal.ONE;
+ if (productStructureDto.getParentId() != null) {
+ ProductStructureDto parent = parentMap.get(productStructureDto.getParentId());
+ if (parent != null && parent.getUnitQuantity() != null && parent.getUnitQuantity().compareTo(BigDecimal.ZERO) > 0) {
+ parentQty = parent.getUnitQuantity();
+ }
+ }
+
+ if (parentQty.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+
+ bomInputQty = bomInputQty.add(
+ childQty.divide(parentQty, 6, RoundingMode.HALF_UP).multiply(planQty)
+ );
+ }
+ }
+ }
+ bomInputQtyCache.put(bomInputQtyCacheKey, bomInputQty);
+ }
+ record.setBomInputQty(bomInputQty);
});
return productWorkOrderDtoIPage;
}
@@ -231,4 +300,4 @@
}
return productWorkOrderDtos;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3