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/basic/pojo/Customer.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 8a35b2b..19a0d01 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -1,6 +1,7 @@
package com.ruoyi.basic.pojo;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@@ -28,6 +29,12 @@
private Long id;
/**
+ * 鍦板尯ID
+ */
+ @ApiModelProperty("鍦板尯ID")
+ private Long regionsId;
+
+ /**
* 瀹㈡埛鍚嶇О
*/
@Excel(name = "瀹㈡埛鍚嶇О")
@@ -38,16 +45,16 @@
/**
* 璺熻繘绋嬪害
*/
- @Excel(name = "璺熻繘绋嬪害")
+// @Excel(name = "璺熻繘绋嬪害")
@TableField(exist = false)
private String followUpLevel;
/**
* 璺熻繘鏃堕棿
*/
- @Excel(name = "璺熻繘鏃堕棿")
+// @Excel(name = "璺熻繘鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@TableField(exist = false)
- private LocalDateTime followUpTime;
+ private Date followUpTime;
@Excel(name = "瀹㈡埛鍒嗙被")
private String customerType;
@@ -79,7 +86,7 @@
/**
* 鑱旂郴鐢佃瘽
*/
- @Excel(name = "鑱旂郴鐢佃瘽")
+ @Excel(name = "鑱旂郴鐢佃瘽", cellType = Excel.ColumnType.STRING)
private String contactPhone;
/**
@@ -92,7 +99,7 @@
* 缁存姢鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "缁存姢鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "缁存姢鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date maintenanceTime;
@TableField(fill = FieldFill.INSERT)
@@ -115,4 +122,5 @@
@ApiModelProperty(value = "寮�鎴疯鍙�")
@Excel(name = "寮�鎴疯鍙�")
private String bankCode;
+
}
--
Gitblit v1.9.3