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/production/dto/SalesLedgerWorkDto.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
index a32bd62..d118171 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
@@ -4,6 +4,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -14,6 +15,7 @@
  */
 @Data
 @ApiModel
+@EqualsAndHashCode(callSuper = true)
 public class SalesLedgerWorkDto extends SalesLedgerProductDto{
 
     private Long id;
@@ -65,6 +67,14 @@
     @ApiModelProperty(value = "宸ュ簭")
     @Excel(name = "宸ュ簭")
     private String process;
+
+
+    /**
+     * 浜х嚎
+     */
+    @ApiModelProperty(value = "浜х嚎")
+    @Excel(name = "浜х嚎")
+    private String productionLine;
     /**
      * 鎺掍骇鏃ユ湡
      */
@@ -101,11 +111,25 @@
     private String loss;
 
     /**
+     * 缁戝畾鏈哄櫒
+     */
+    @ApiModelProperty(value = "缁戝畾鏈哄櫒")
+    @Excel(name = "缁戝畾鏈哄櫒")
+    private String speculativeTradingName;
+
+    /**
      * 鍙e懗鍒嗙被
      */
     @ApiModelProperty(value = "鍙e懗鍒嗙被")
     @Excel(name = "鍙e懗鍒嗙被")
     private String type;
 
+    /**
+     * 棰嗙敤
+     */
+    @ApiModelProperty(value = "棰嗙敤")
+    @Excel(name = "棰嗙敤")
+    private String receive;
+
 
 }

--
Gitblit v1.9.3