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/SalesLedger.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 695a17c..c3dd0d2 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,15 +1,17 @@
package com.ruoyi.sales.pojo;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.Date;
-
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;
+import java.util.Date;
+import java.util.List;
/**
* 閿�鍞彴璐﹀璞� sales_ledger
@@ -37,7 +39,7 @@
/**
* 瀹㈡埛鍚堝悓鍙�
*/
- @Excel(name = "瀹㈡埛鍚堝悓鍙�")
+ @Excel(name = "瀹㈡埛鍚堝悓鍙�", type = Excel.Type.IMPORT)
private String customerContractNo;
@@ -89,6 +91,12 @@
private String remarks;
/**
+ * 瀹㈡埛澶囨敞
+ */
+ @Excel(name = "瀹㈡埛澶囨敞")
+ private String customerRemarks;
+
+ /**
* 闄勪欢鏉愭枡锛屽瓨鍌ㄦ枃浠跺悕绛夌浉鍏充俊鎭�
*/
private String attachmentMaterials;
@@ -136,11 +144,54 @@
@TableField(value = "delivery_date")
private LocalDate deliveryDate;
+ /**
+ * 鍙戣揣鐘舵�侊細1-鏈彂璐э紝2-瀹℃壒涓紝3-瀹℃壒涓嶉�氳繃锛�4-瀹℃壒閫氳繃锛�5-宸插彂璐э紝6-閮ㄥ垎鍙戣揣锛堝鎵爜鍒嗘壒鍙戣揣鏈弧鍗曪級
+ */
+ @ApiModelProperty("鍙戣揣鐘舵�侊細1-鏈彂璐э紝2-瀹℃壒涓紝3-瀹℃壒涓嶉�氳繃锛�4-瀹℃壒閫氳繃锛�5-宸插彂璐э紝6-閮ㄥ垎鍙戣揣")
+ private Integer deliveryStatus;
+
+ /**
+ * 鍏ュ簱鐘舵�侊細0-鏈叆搴擄紝1-閮ㄥ垎鍏ュ簱锛�2-宸插叆搴�
+ */
+ @ApiModelProperty("鍏ュ簱鐘舵�侊細0-鏈叆搴擄紝1-閮ㄥ垎鍏ュ簱锛�2-宸插叆搴�")
+ private Integer stockStatus;
+
@TableField(exist = false)
@ApiModelProperty(value = "浜よ揣澶╂暟宸�")
private Integer deliveryDaysDiff;
@TableField(exist = false)
+ //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
private Boolean isFh;
-}
+ @TableField(exist = false)
+ //鏄惁鍙紪杈�
+ private Boolean isEdit;
+
+ @TableField(exist = false)
+ @ApiModelProperty("璁㈠崟浜у搧鎬绘暟閲�")
+ private BigDecimal productTotalQuantity = BigDecimal.ZERO;
+
+ @TableField(exist = false)
+ @ApiModelProperty("璁㈠崟浜у搧鎬婚潰绉�(銕�)")
+ private BigDecimal productTotalArea = BigDecimal.ZERO;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鍛戒腑鐨勯攢鍞骇鍝佸垪琛�")
+ private List<SalesLedgerProduct> matchedProducts;
+
+ /**
+ * 瀹℃牳鐘舵�侊細0-鏈鏍革紝1-宸插鏍革紝2-鍙嶅
+ */
+ @ApiModelProperty("瀹℃牳鐘舵��")
+ private Integer reviewStatus;
+
+ @ApiModelProperty("鍙嶅鏃堕棿")
+ private LocalDateTime counterReviewTime;
+
+ @ApiModelProperty("鍙嶅浜�")
+ private String counterReviewPerson;
+
+ @ApiModelProperty("鍙嶅浜篒d")
+ private Long counterReviewPersonId;
+}
\ No newline at end of file
--
Gitblit v1.9.3