Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

13 小时以前 bb78ea38792502cbff36c9a4486b7b12e1940615

Merge remote-tracking branch 'origin/dev_New' into dev_New

 src/main/java/com/ruoyi/production/controller/ProductOrderController.java

@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;

@RequestMapping("productOrder")
@@ -51,9 +52,31 @@
    @Log(title = "生产订单", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ProductOrderDto productOrderDto) {
        List<ProductOrderDto> list;
        list = productOrderService.pageProductOrder(new Page<>(1, -1), productOrderDto).getRecords();
        ExcelUtil<ProductOrderDto> util = new ExcelUtil<ProductOrderDto>(ProductOrderDto.class);
        List<ProductOrderDto> list = productOrderService.pageProductOrder(new Page<>(1, -1), productOrderDto).getRecords();

        if (list != null && !list.isEmpty()) {
            list.forEach(item -> {
                // 判空
                if (item.getQuantity() == null || item.getCompleteQuantity() == null) {
                    item.setCompletionStatus(BigDecimal.ZERO);
                    return;
                }

                // 判零
                if (item.getQuantity().compareTo(BigDecimal.ZERO) == 0) {
                    item.setCompletionStatus(BigDecimal.ZERO);
                    return;
                }
                BigDecimal progress = item.getCompleteQuantity()
                        .divide(item.getQuantity(), 4, BigDecimal.ROUND_HALF_UP)
                        .multiply(new BigDecimal(100))
                        .setScale(2, BigDecimal.ROUND_HALF_UP);

                item.setCompletionStatus(progress);
            });
        }

        ExcelUtil<ProductOrderDto> util = new ExcelUtil<>(ProductOrderDto.class);
        util.exportExcel(response, list, "生产订单数据");
    }


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

@@ -39,8 +39,8 @@
    @Excel(name = "工艺路线编号")
    private String processRouteCode;

    @ApiModelProperty(value = "完成状态")
    @Excel(name = "完成状态")
    @ApiModelProperty(value = "完成进度")
    @Excel(name = "完成进度", suffix = "%")
    private BigDecimal completionStatus;

    @ApiModelProperty(value = "BOM编号")