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

zss

2 天以前 9904ea0defbad1159c6cacce916b106741aa2d70

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

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

@@ -1,12 +1,15 @@
package com.ruoyi.production.dto;

import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDate;

@Data
@ExcelIgnoreUnannotated
@@ -46,4 +49,9 @@

    @ApiModelProperty(value = "交期偏差")
    private Integer deliveryDaysDiff;

    @ApiModelProperty(value = "交期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate deliveryDate;
}

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

@@ -22,7 +22,8 @@
        ppr.process_route_code,
        pb.bom_no,
        ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
        DATEDIFF(sl.delivery_date, CURDATE()) AS delivery_days_diff
        DATEDIFF(sl.delivery_date, CURDATE()) AS delivery_days_diff,
        sl.delivery_date
        from product_order po
        left join sales_ledger sl on po.sales_ledger_id = sl.id
        left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id