diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportVo.java
index d48b8b47..383a08f8 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportVo.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierarrivalreport/SupplierArrivalReportVo.java
@@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* @author wangpengfei
* @date 2023/4/19 13:41
@@ -27,20 +29,28 @@ public class SupplierArrivalReportVo implements Vo {
private String loanAmount;
//订单金额
@ApiModelProperty("订单金额")
- private String orderAmount;
+ private BigDecimal orderAmount;
//实际到货
@ApiModelProperty("实际到货")
- private String actualArrival;
+ private BigDecimal actualArrival;
+ //实际到货数量
+ private String actualArrivalNumber;
//在途
@ApiModelProperty("在途")
- private String transit;
+ private BigDecimal transit;
+ //在途数量
+ private String transitNumber;
//销售渠道
private String storeName;
//订单到货价值
private String orderArrivalAmount;
//超出
- private String exceed;
-
-
+ private BigDecimal exceed;
+ //数量
+ private String number;
+ //商品名
+ private String proName;
+ //是否延期
+ private String logo;
}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportMapper.xml
index bb203035..6d2bfe96 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportMapper.xml
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsalesreport/GdSalesReportMapper.xml
@@ -50,7 +50,8 @@
-