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

yuan

7 小时以前 472d3a889984e88e17524431b48d17f19da57ad6

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

 src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java

@@ -63,4 +63,5 @@
    @ApiModelProperty(value = "投入总量(kg)")
    private BigDecimal totalInvestment;

    private BigDecimal inspectedQuantity;
}

 src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java

@@ -178,6 +178,13 @@
                    inspectType = 2;
                    process = null;
                }
                ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
                ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
                if (productOrder == null) {
                    throw new RuntimeException("生产订单不存在");
                }


                Product product = productMapper.selectById(productModel.getProductId());
                QualityInspect qualityInspect = new QualityInspect();
                qualityInspect.setProductId(product.getId());
@@ -190,6 +197,9 @@
                qualityInspect.setInspectType(inspectType);
                qualityInspect.setProductMainId(productionProductMain.getId());
                qualityInspect.setProductModelId(productModel.getId());
                qualityInspect.setBatchNo(productOrder.getBatchNo());
                qualityInspect.setInspectedQuantity(dto.getInspectedQuantity());
                qualityInspect.setManufacturingTeam(productOrder.getManufacturingTeam());
                qualityInspectMapper.insert(qualityInspect);
                List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(product.getId(), inspectType, process);
                if (qualityTestStandard.size() > 0) {

 src/main/java/com/ruoyi/quality/pojo/QualityInspect.java

@@ -157,4 +157,8 @@
    private String workOrderNo;
    @TableField(exist = false)
    private String purchaseContractNo;

    private String BatchNo;
    private BigDecimal inspectedQuantity;
    private String manufacturingTeam;
}