From 0e420d68f407fde240709ac1800da20b0bb99490 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 16:06:16 +0800
Subject: [PATCH] feat:反审核操作。可以对已审核的订单进行反审核,反审核的时候可以选择作废还是重新生成一条,并记录反审核描述。选择作废的话则不生成新增订单。选择重新生成的话则跳转到新增台账页面对反审核的销售产品进行编辑保存重新生成一条新增的订单。反审核的订单即使是发货了还是可以反审核,并且需要将对应的入库、出库、发货进行作废。

---
 src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 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 055f2a8..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;
     /**
      * 鎺掍骇鏃ユ湡
      */
@@ -86,5 +96,40 @@
     @Excel(name = "鐘舵��", readConverterExp = "1=寰呯敓浜�,2=鐢熶骇涓�,3=宸叉姤宸�")
     private String statusName;
 
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty(value = "澶囨敞")
+    @Excel(name = "澶囨敞")
+    private String remark;
+
+    /**
+     * 鎹熻��
+     */
+    @ApiModelProperty(value = "鎹熻��")
+    @Excel(name = "鎹熻��")
+    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