fix(quality): 中间工序报工质检都不入库

zss

2026-08-17 c6f3e3c081009b4503b9c666dfe8d6643b1d2bfb

 src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java

@@ -1,7 +1,6 @@
package com.ruoyi.quality.service.impl;


import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -16,6 +15,7 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
@@ -24,15 +24,19 @@
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
import com.ruoyi.quality.mapper.QualityUnqualifiedMapper;
import com.ruoyi.quality.mapper.QualityUnqualifiedOrderMapper;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectParam;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.pojo.QualityUnqualifiedOrder;
import com.ruoyi.stock.pojo.StockInRecord;
import com.ruoyi.stock.service.StockInRecordService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.pojo.StockInRecord;
import com.ruoyi.stock.service.StockInRecordService;
import com.ruoyi.stock.service.StockInventoryService;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
@@ -67,6 +71,8 @@
    private QualityTestStandardMapper qualityTestStandardMapper;

    private QualityUnqualifiedMapper qualityUnqualifiedMapper;

    private QualityUnqualifiedOrderMapper qualityUnqualifiedOrderMapper;

    private SalesLedgerProductMapper salesLedgerProductMapper;

@@ -127,8 +133,8 @@
            qualityInspect.setUnqualifiedQuantity(BigDecimal.ZERO);
        }

        // 合格直接入库
        if(qualityInspect.getQualifiedQuantity().compareTo(BigDecimal.ZERO) > 0){
        // 合格直接入库(过程检不入库)
        if(qualityInspect.getQualifiedQuantity().compareTo(BigDecimal.ZERO) > 0 && qualityInspect.getInspectType()!=1){
            //仅添加入库记录
            StockInventoryDto stockInventoryDto = new StockInventoryDto();
            //如果是采购质检合格入库选用CUSTOMIZATION_UNSTOCK_OUT,其余合格入库选用QUALITYINSPECT_STOCK_IN
@@ -161,6 +167,26 @@
            qualityUnqualified.setDefectivePhenomena(text + "这些指标中存在不合格");//不合格现象
            qualityUnqualified.setInspectId(qualityInspect.getId());
            qualityUnqualifiedMapper.insert(qualityUnqualified);

            // 自动创建不合格品处理单，流入新模块
            QualityUnqualifiedOrder order = new QualityUnqualifiedOrder();
            order.setUnqualifiedId(qualityUnqualified.getId());
            order.setUnqualifiedProcess(qualityInspect.getInspectType() + 1);
            order.setUnqualifiedQuantity(qualityInspect.getUnqualifiedQuantity());
            order.setQuantity(qualityInspect.getQuantity());
            order.setProductModelId(qualityInspect.getProductModelId());
            order.setInspectorName(qualityInspect.getCheckName());
            if (qualityInspect.getCheckTime() != null) {
                order.setInspectDate(new java.util.Date(qualityInspect.getCheckTime().getTime()));
            }
            order.setSupplierName(qualityInspect.getSupplier());
            order.setSpecificationModel(qualityInspect.getModel());
            order.setProblemDescription(qualityInspect.getDefectivePhenomena());
            order.setStatus(0);
            String orderNo = OrderUtils.countTodayByCreateTime(
                    qualityUnqualifiedOrderMapper, "BHG", "order_no", LocalDateTime.now());
            order.setOrderNo(orderNo);
            qualityUnqualifiedOrderMapper.insert(order);
        }

        qualityInspect.setInspectState(1);//已提交