生产详情返回报废数量，重新计算合格数量等值

huminmin

12 小时以前 9dcf20387a41fc71501a5243ee25b74c806b464f

生产详情返回报废数量，重新计算合格数量等值

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

@@ -43,8 +43,16 @@
    @ApiModelProperty(value = "完成进度")
    private BigDecimal completionStatus;

    // 总产出数量
    @ApiModelProperty(value = "总产出数量（包含报废数量）")
    private BigDecimal totalQty;

    @ApiModelProperty(value = "报废数量")
    private BigDecimal scrapQty;

    // 不良数量
    @ApiModelProperty(value = "不良数量")
    private BigDecimal defectiveQuantity;

    @ApiModelProperty(value = "工单类型 正常 /返工返修")
    private String workOrderType;
@@ -63,7 +71,7 @@
    private BigDecimal completeQty;

    @ApiModelProperty(value = "不良率")
    private BigDecimal scrapRate;
    private BigDecimal defectiveRate;

    @ApiModelProperty(value = "状态文本")
    private String statusText;

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

@@ -33,6 +33,12 @@
    @Excel(name = "报废数量")
    private BigDecimal scrapQty = BigDecimal.ZERO;

    // 不良数量
    @ApiModelProperty(value = "不良数量")
    @Excel(name = "不良数量")
    private BigDecimal defectiveQuantity = BigDecimal.ZERO;

    // 合格数量
    @ApiModelProperty(value = "合格数量")
    @Excel(name = "合格数量")
    private BigDecimal qualifiedQty = BigDecimal.ZERO;

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

@@ -50,6 +50,8 @@
    private ProductionProductOutputMapper productionProductOutputMapper;
    @Autowired
    private QualityUnqualifiedMapper qualityUnqualifiedMapper;
    @Autowired
    private QualityInspectMapper qualityInspectMapper;

    @Value("${file.temp-dir}")
    private String tempDir;
@@ -189,20 +191,32 @@
            productWorkOrderDtos.forEach(productWorkOrderDto -> {
                // 查询关联产出表数据
                List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(Wrappers.<ProductionProductMain>lambdaQuery().eq(ProductionProductMain::getWorkOrderId, productWorkOrderDto.getId()));
                // 查询报废数量
                BigDecimal scrapQty = BigDecimal.ZERO;
                // 查询不良数量
                BigDecimal defectiveQuantity = BigDecimal.ZERO;
                if (CollectionUtils.isNotEmpty(productionProductMains)) {
                    // 计算报废数量
                    List<Long> mainIds = productionProductMains.stream().map(ProductionProductMain::getId).collect(Collectors.toList());
                    List<ProductionProductOutput> productionProductOutputs = productionProductOutputMapper.selectList(Wrappers.<ProductionProductOutput>lambdaQuery().in(ProductionProductOutput::getProductMainId, mainIds));
                    List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(Wrappers.<QualityInspect>lambdaQuery().in(QualityInspect::getProductMainId, mainIds));
                   if (CollectionUtils.isNotEmpty(productionProductOutputs)) {
                    scrapQty = productionProductOutputs.stream().map(ProductionProductOutput::getScrapQty).reduce(BigDecimal.ZERO, BigDecimal::add);
                }
                if (productWorkOrderDto.getCompleteQuantity().compareTo(BigDecimal.ZERO) > 0) {
                    productWorkOrderDto.setScrapRate(scrapQty.divide(productWorkOrderDto.getCompleteQuantity(), 4, RoundingMode.HALF_UP));
                   if (CollectionUtils.isNotEmpty(qualityInspects)) {
                        defectiveQuantity = qualityInspects.stream().map(QualityInspect::getDefectiveQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
                   }
                }
                BigDecimal totalQuantity = productWorkOrderDto.getCompleteQuantity().add(scrapQty);
                if (totalQuantity.compareTo(BigDecimal.ZERO) > 0) {
                    productWorkOrderDto.setDefectiveRate(defectiveQuantity.divide(productWorkOrderDto.getCompleteQuantity(), 4, RoundingMode.HALF_UP));
                } else {
                    productWorkOrderDto.setScrapRate(scrapQty.multiply(BigDecimal.valueOf(100)));
                    productWorkOrderDto.setDefectiveRate(defectiveQuantity.multiply(BigDecimal.valueOf(100)));
                }
                productWorkOrderDto.setScrapQty(scrapQty);
                productWorkOrderDto.setCompleteQty(productWorkOrderDto.getCompleteQuantity().subtract(scrapQty));
                productWorkOrderDto.setTotalQty(totalQuantity);
                productWorkOrderDto.setDefectiveQuantity(defectiveQuantity);
                productWorkOrderDto.setCompleteQty(productWorkOrderDto.getCompleteQuantity().subtract(defectiveQuantity));
            });
        }
        return productWorkOrderDtos;

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

@@ -436,6 +436,10 @@
            productionProductMainDtos.forEach(p -> {
                QualityInspect qualityInspect = productMainIdToInspectMap.get(p.getId());
                if (qualityInspect != null) {
                    // 不良数量
                    p.setDefectiveQuantity( qualityInspect.getDefectiveQuantity());
                    // 合格数量 = 报工数量-报废数量-不良数量
                    p.setQualifiedQty(p.getQuantity().subtract(p.getScrapQty()).subtract(p.getDefectiveQuantity()));
                    QualityUnqualified qualityUnqualified = inspectIdToUnqualifiedMap.get(qualityInspect.getId());
                    if (qualityUnqualified != null) {
                        p.setDealResult(qualityUnqualified.getDealResult() == null ? "" : qualityUnqualified.getDealResult());

 src/main/resources/mapper/production/ProductionProductMainMapper.xml

@@ -67,7 +67,6 @@
        ppo.quantity,
        ppo.scrap_qty,
        ppo.other_data,
        (ppo.quantity - ppo.scrap_qty) as qualifiedQty,
        pm.unit
        from
        production_product_main ppm