From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态(回款完成,未完成) 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制,过时后状态改为已过期

---
 src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
index 72c4f00..b22e6a3 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,19 +16,24 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     @ApiModelProperty(value = "鎶ヤ环鍗曠紪鍙�")
+    @Excel(name = "鎶ヤ环鍗曠紪鍙�")
     private String quotationNo;
     @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+    @Excel(name = "瀹㈡埛鍚嶇О")
     private String customer;
 
     @ApiModelProperty(value = "涓氬姟鍛�")
+    @Excel(name = "涓氬姟鍛�")
     private String salesperson;
     @ApiModelProperty(value = "鎶ヤ环鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鎶ヤ环鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate quotationDate;
     @ApiModelProperty(value = "鏈夋晥鏈熻嚦")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鏈夋晥鏈熻嚦", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate validDate;
     @ApiModelProperty(value = "浠樻鏂瑰紡")
     private String paymentMethod;
@@ -36,6 +42,7 @@
     @ApiModelProperty(value = "鐘舵��")
     private String status;
     @ApiModelProperty(value = "鎶ヤ环鎬婚噾棰�")
+    @Excel(name = "鎶ヤ环閲戦")
     private Double totalAmount;
 
     @ApiModelProperty(value = "澶囨敞")

--
Gitblit v1.9.3