From e0cfecb2b11b3d6ac91394e71c689a30356ead28 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 09:29:28 +0800
Subject: [PATCH] fix:1.生产按照特定工序更改 2.库存按照型号,工序类别，电压进行筛选 3.销售页面展示电压，类别 4.生产入库按照电压入库
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 fa1f4ed..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)
@@ -153,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