fix:1.生产按照特定工序更改 2.库存按照型号,工序类别，电压进行筛选 3.销售页面展示电压，类别 4.生产入库按照电压入库

liding

2026-05-20 e0cfecb2b11b3d6ac91394e71c689a30356ead28

 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);