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/sales/dto/SalesLedgerDto.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 05bd888..8180698 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -8,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;
@@ -29,6 +31,7 @@
private String customerName;
private String entryPerson;
private String remarks;
+ private String customerRemarks;
private String attachmentMaterials;
@TableField(exist = false)
@@ -58,4 +61,36 @@
@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;
+
+ @ApiModelProperty("鍙嶅鏍哥被鍨嬶細1=浣滃簾锛�2=閲嶆柊鐢熸垚")
+ private Integer counterReviewType;
+
+ @ApiModelProperty("鍙嶅鏍告弿杩�")
+ private String counterReviewDesc;
}
--
Gitblit v1.9.3