Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

yuan

13 小时以前 e529b1dd89b5f2927457a284e660d489b9aa8cc8

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

@@ -15,6 +15,12 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.mapper.ProductOrderMapper;
import com.ruoyi.production.mapper.ProductWorkOrderMapper;
import com.ruoyi.production.mapper.ProductionProductMainMapper;
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.production.pojo.ProductionProductMain;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
@@ -61,6 +67,13 @@

    private ProductModelMapper productModelMapper;

    private ProductionProductMainMapper productionProductMainMapper;

    private ProductWorkOrderMapper productWorkOrderMapper;

    private ProductOrderMapper productOrderMapper;


    @Override
    public int add(QualityInspectDto qualityInspectDto) {
        QualityInspect qualityInspect = new QualityInspect();
@@ -88,6 +101,20 @@
    @Override
    public int submit(QualityInspect inspect) {
        QualityInspect qualityInspect = qualityInspectMapper.selectById(inspect.getId());
        ProductionProductMain productionProductMain = productionProductMainMapper.selectById(qualityInspect.getProductMainId());

        String batchNo;
        String customer;
        if (productionProductMain != null) {
            ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
            ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
            batchNo = productOrder.getBatchNo();
            customer = "长治市轴承制造有限公司";
        } else {
            batchNo = qualityInspect.getBatchNo();
            customer = qualityInspect.getSupplier();
        }

        //提交前必须判断是否合格
        if (ObjectUtils.isNull(qualityInspect.getCheckResult())) {
            throw new RuntimeException("请先判断是否合格");
@@ -104,7 +131,9 @@
            qualityUnqualifiedMapper.insert(qualityUnqualified);
        } else {
            //合格直接入库
            stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), qualityInspect.getId());
            stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(),
                    qualityInspect.getId(), batchNo, customer
            );
        }
        qualityInspect.setInspectState(1);//已提交
        return qualityInspectMapper.updateById(qualityInspect);