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/dto/SalesLedgerDto.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index aeea446..23f9293 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.sales.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -7,6 +8,8 @@
import lombok.Data;
import java.time.LocalDate;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -18,20 +21,70 @@
private String projectName;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date entryDate;
+
+ private String entryDateStart;
+ private String entryDateEnd;
+
+
private String salesman;
private Long customerId;
private String customerName;
private String entryPerson;
private String remarks;
+ private String customerRemarks;
private String attachmentMaterials;
+
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate issueDate;
+
+ @TableField(exist = false)
+ private String invoiceNo;
+ @TableField(exist = false)
+ private String createUser;
+
+
private Boolean hasChildren = false;
private List<SalesLedgerProduct> productData;
+ private List<SalesLedgerProductDto> productDtoData;
private List<String> tempFileIds;
private List<CommonFile> SalesLedgerFiles;
- private Integer Type;
+ private Integer type;
@ApiModelProperty(value = "绛捐鏃ユ湡")
private LocalDate executionDate;
private Boolean status;
+
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ private String paymentMethod;
+
+ @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ private LocalDate deliveryDate;
+
+ @ApiModelProperty(value = "鍙戣揣鐘舵�侊細1-鏈彂璐э紝2-瀹℃壒涓紝3-瀹℃壒涓嶉�氳繃锛�4-瀹℃壒閫氳繃锛�5-宸插彂璐э紝6-閮ㄥ垎鍙戣揣")
+ private Integer deliveryStatus;
+
+ @ApiModelProperty(value = "鍏ュ簱鐘舵��")
+ private Integer stockStatus;
+
+ @ApiModelProperty(value = "浜у搧瀹�")
+ private BigDecimal width;
+
+ @ApiModelProperty(value = "浜у搧楂�")
+ private BigDecimal height;
+ /**
+ * 瀹℃牳鐘舵�侊細0-鏈鏍革紝1-宸插鏍革紝2-鍙嶅
+ */
+ @ApiModelProperty("瀹℃牳鐘舵�侊紙鍗曞�兼煡璇級")
+ private Integer reviewStatus;
+
+ @ApiModelProperty("瀹℃牳鐘舵�佸垪琛紙澶氶�夋煡璇細0-鏈鏍革紝1-宸插鏍革紝2-鍙嶅锛�")
+ private List<Integer> reviewStatusList;
+
+ @ApiModelProperty("鍙嶅鏃堕棿")
+ private LocalDateTime counterReviewTime;
+
+ @ApiModelProperty("鍙嶅浜�")
+ private String counterReviewPerson;
}
--
Gitblit v1.9.3