From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面,新增一个编辑按钮,可以对已审核的订单进行单价修 改。 3.新增反审核按钮,对已审核的订单进行反审核,反审核之后会保存当前订 单的数据快照,便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。

---
 src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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..f57293d 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
@@ -2,10 +2,12 @@
 
 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;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -15,19 +17,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,7 +43,8 @@
     @ApiModelProperty(value = "鐘舵��")
     private String status;
     @ApiModelProperty(value = "鎶ヤ环鎬婚噾棰�")
-    private Double totalAmount;
+    @Excel(name = "鎶ヤ环閲戦")
+    private BigDecimal totalAmount;
 
     @ApiModelProperty(value = "澶囨敞")
     private String remark;

--
Gitblit v1.9.3