liding
昨天 61ad48645e045591a0e82df746faba8f70d75674
fix:1.质检增加批号和供应商(区分质检和不质检)
已修改2个文件
15 ■■■■ 文件已修改
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -230,6 +230,7 @@
        QualityInspect qualityInspect = new QualityInspect();
        qualityInspect.setInspectType(0);
        qualityInspect.setSupplier(purchaseLedger.getSupplierName());
        qualityInspect.setBatchNo(saleProduct.getBatchNo());
        qualityInspect.setPurchaseLedgerId(purchaseLedger.getId());
        qualityInspect.setProductId(saleProduct.getProductId());
        qualityInspect.setProductName(saleProduct.getProductCategory());
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -99,8 +99,19 @@
    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("请先判断是否合格");
@@ -117,9 +128,8 @@
            qualityUnqualifiedMapper.insert(qualityUnqualified);
        } else {
            //合格直接入库
            String customer = "长治市轴承制造有限公司";
            stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(),
                    qualityInspect.getId(),productOrder.getBatchNo(),customer
                    qualityInspect.getId(), batchNo, customer
            );
        }
        qualityInspect.setInspectState(1);//已提交