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/purchase/dto/TicketRegistrationDto.java |   42 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 41 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
index 1bdd771..b5243eb 100644
--- a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
@@ -1,12 +1,27 @@
 package com.ruoyi.purchase.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.purchase.pojo.TicketRegistration;
+import com.ruoyi.sales.pojo.CommonFile;
 import com.ruoyi.sales.pojo.SalesLedgerProduct;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDate;
 import java.util.List;
 
+/**
+ * 鏉ョエ鐧昏琛�
+ */
+
 @Data
-public class TicketRegistrationDto {
+@TableName("ticket_registration")
+@EqualsAndHashCode(callSuper = true)
+public class TicketRegistrationDto extends TicketRegistration {
 
     /**
      * 涓婚敭ID
@@ -29,6 +44,14 @@
     private String salesContractNo;
 
     /**
+     * 寮�绁ㄦ棩鏈�
+     */
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate entryDate;
+
+    /**
      * 瀹㈡埛鍚嶇О
      */
     private String customerName;
@@ -37,6 +60,13 @@
      * 涓氬姟鍛�
      */
     private String businessPerson;
+
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private LocalDate enterDate;
 
     /**
      * 涓氬姟鍛榠d
@@ -52,4 +82,14 @@
 
     private Long salesContractNoId;
     private String supplierName;
+
+    private List<String> tempFileIds;
+    private List<CommonFile> CommonFiles;
+
+    private String fileName;
+
+    @TableField(exist = false)
+    private String createdAtStart;
+    @TableField(exist = false)
+    private String createdAtEnd;
 }

--
Gitblit v1.9.3