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/quality/service/impl/QualityInspectServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index eecafea..1103268 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -10,6 +10,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
@@ -33,7 +34,7 @@
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
-import com.ruoyi.stock.pojo.StockUninventory;
+import com.ruoyi.stock.support.FinishedProductStockDimensionResolver;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -78,6 +79,9 @@
private ProductOrderMapper productOrderMapper;
@Autowired
private ISysNoticeService sysNoticeService;
+ // 瑙ｆ瀽鎴愬搧鍏ュ簱缁村害銆�
+ @Autowired
+ private FinishedProductStockDimensionResolver finishedProductStockDimensionResolver;
@Override
public int add(QualityInspectDto qualityInspectDto) {
@@ -113,6 +117,9 @@
// 璐ㄦ鎬绘暟
BigDecimal quantity = qualityInspect.getQuantity();
// 鍚堟牸鏁伴噺 = 璐ㄦ鎬绘暟 - 涓嶈壇鏁伴噺
+ if (ObjectUtils.isNull(qualityInspect.getDefectiveQuantity())) {
+ qualityInspect.setDefectiveQuantity(BigDecimal.ZERO);
+ }
BigDecimal productQty = quantity.subtract(qualityInspect.getDefectiveQuantity());
// 鍚堟牸鐜�=鍚堟牸鏁伴噺/璐ㄦ鎬绘暟
BigDecimal productQtyRate = productQty.divide(quantity, 2, RoundingMode.HALF_UP)
@@ -124,15 +131,20 @@
if (productQtyRate.compareTo(productProcess.getQualifiedRate()) < 0) {
// 鏌ヨ鐢熶骇璁㈠崟
ProductionProductMain productionProductMain = productionProductMainMapper.selectById(qualityInspect.getProductMainId());
- ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
- ProductOrder productOrder = productOrderMapper.selectOne(new LambdaQueryWrapper<ProductOrder>().eq(ProductOrder::getId, productWorkOrder.getProductOrderId()));
- if (!ObjectUtils.isNull(productOrder)) {
- // 鍙戦�侀�氱煡缁欑鐞嗗憳
- sysNoticeService.simpleNoticeByUser("璐ㄦ鎻愮ず",
- String.format("%s鐢熶骇璁㈠崟锛�%s宸ュ簭鍚堟牸鐜�%.2f%%浣庝簬鏍囧噯%.2f%%", productOrder.getNpsNo(), productProcess.getName(), productQtyRate, productProcess.getQualifiedRate()),
- Arrays.asList(Long.valueOf(1L)),
- qualityInspect.getInspectType() == 2 ? "/qualityManagement/finalInspection" : "/qualityManagement/processInspection");
+ if (!ObjectUtils.isNull(productionProductMain)) {
+ ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
+ if (!ObjectUtils.isNull(productWorkOrder)) {
+ ProductOrder productOrder = productOrderMapper.selectOne(new LambdaQueryWrapper<ProductOrder>().eq(ProductOrder::getId, productWorkOrder.getProductOrderId()));
+ if (!ObjectUtils.isNull(productOrder)) {
+ // 鍙戦�侀�氱煡缁欑鐞嗗憳
+ sysNoticeService.simpleNoticeByUser("璐ㄦ鎻愮ず",
+ String.format("%s鐢熶骇璁㈠崟锛�%s宸ュ簭鍚堟牸鐜�%.2f%%浣庝簬鏍囧噯%.2f%%", productOrder.getNpsNo(), productProcess.getName(), productQtyRate, productProcess.getQualifiedRate()),
+ Arrays.asList(Long.valueOf(1L)),
+ qualityInspect.getInspectType() == 2 ? "/qualityManagement/finalInspection" : "/qualityManagement/processInspection");
+ }
+ }
}
+
}
}
@@ -148,16 +160,30 @@
qualityUnqualified.setInspectId(qualityInspect.getId());
qualityUnqualifiedMapper.insert(qualityUnqualified);
} else {
- //鍚堟牸鍏ュ簱
+ // 鍚堟牸鍏ュ簱
Integer inspectType = qualityInspect.getInspectType();
- //鐢熶骇鎴愬搧娣诲姞瀹℃牳娴佺▼锛屽崐鎴愬搧涓嶅鏍�
- if (inspectType != null && inspectType.equals(2)) {
- stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(),
- StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), qualityInspect.getId());
+ boolean isFinishedProduct = inspectType != null && inspectType.equals(2); // 鎴愬搧闇�瑕佸鏍�
+ // 鏍规嵁鏄惁鎴愬搧閫夋嫨鍏ュ簱鏂瑰紡
+ String processCategory = null;
+ String voltage = null;
+ if (isFinishedProduct && qualityInspect.getProductMainId() != null) {
+ processCategory = finishedProductStockDimensionResolver.resolveProcessCategory(qualityInspect.getProductMainId());
+ voltage = finishedProductStockDimensionResolver.resolveVoltage(qualityInspect.getProductMainId());
+ }
+ if (isFinishedProduct) {
+ stockUtils.addStock(qualityInspect.getProductModelId(), productQty,
+ StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), qualityInspect.getId(),
+ processCategory, voltage);
} else {
- stockUtils.addStockNoReview(qualityInspect.getProductModelId(), qualityInspect.getQuantity(),
+ stockUtils.addStockNoReview(qualityInspect.getProductModelId(), productQty,
StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), qualityInspect.getId());
}
+
+ // 涓嶈壇鏁伴噺>0鐨勫叆涓嶅悎鏍煎簱瀛�
+ if (qualityInspect.getDefectiveQuantity().compareTo(BigDecimal.ZERO) > 0) {
+ stockUtils.addUnStockNoReview(qualityInspect.getProductModelId(), qualityInspect.getDefectiveQuantity(),
+ StockInUnQualifiedRecordTypeEnum.QUALITYINSPECT_UNSTOCK_IN.getCode(), qualityInspect.getId());
+ }
}
qualityInspect.setInspectState(1);//宸叉彁浜�
return qualityInspectMapper.updateById(qualityInspect);
--
Gitblit v1.9.3