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/warehouse/pojo/DocumentationBorrowManagement.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
index b71d4a2..76262fe 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@@ -12,6 +13,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
/**
@@ -20,7 +22,8 @@
*/
@TableName(value ="documentation_borrow_management")
@Data
-@ApiModel(value = "鏂囨。鍊熼槄-褰掕繕琛�")
+@ApiModel(value = "鏂囨。鍊熼槄琛�")
+@EqualsAndHashCode(callSuper = true)
public class DocumentationBorrowManagement extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
@@ -37,15 +40,17 @@
private Long documentationId;
/**
- * 鍊熼槄浜篿d
+ * 鍊熼槄浜�
*/
- @ApiModelProperty(value = "鍊熼槄浜篿d")
- private Long borrowerId;
+ @ApiModelProperty(value = "鍊熼槄浜�")
+ @Excel(name = "鍊熼槄浜�")
+ private String borrower;
/**
- * 褰掕繕浜篿d
+ * 褰掕繕浜�
*/
- @ApiModelProperty(value = "褰掕繕浜篿d")
- private Long returnerId;
+ @ApiModelProperty(value = "褰掕繕浜�")
+ @Excel(name = "褰掕繕浜�")
+ private String returner;
/**
* 鍊熼槄鐩殑
@@ -60,25 +65,25 @@
@ApiModelProperty(value = "鍊熼槄鏃ユ湡")
@Excel(name = "鍊熼槄鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDateTime borrowDate;
+ private LocalDate borrowDate;
/**
* 搴斿綊杩樻棩鏈�
*/
@ApiModelProperty(value = "搴斿綊杩樻棩鏈�")
@Excel(name = "搴斿綊杩樻棩鏈�", dateFormat = "yyyy-MM-dd", width = 30)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime dueReturnDate;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate dueReturnDate;
/**
* 瀹為檯褰掕繕鏃ユ湡
*/
@ApiModelProperty(value = "瀹為檯褰掕繕鏃ユ湡")
@Excel(name = "瀹為檯褰掕繕鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime returnDate;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate returnDate;
/**
* 鍊熼槄鐘舵��
--
Gitblit v1.9.3