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/device/pojo/MaintenanceTask.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
index 512ce58..0c1ff1e 100644
--- a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
+++ b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
@@ -56,7 +56,7 @@
private LocalDateTime lastExecutionTime;
@ApiModelProperty(value = "鏄惁婵�娲�")
- private boolean isActive;
+ private Integer isActive;
@ApiModelProperty(value = "澶囨敞")
@Excel(name = "澶囨敞")
@@ -68,6 +68,21 @@
@ApiModelProperty(value = "褰曞叆浜�")
@Excel(name = "褰曞叆浜�")
private String registrant;
+
+ @ApiModelProperty(value = "淇濆吇浜篿d")
+ private Long maintenancePersonId;
+
+ @ApiModelProperty(value = "淇濆吇浜�")
+ @Excel(name = "淇濆吇浜�")
+ private String maintenancePerson;
+
+ @ApiModelProperty(value = "淇濆吇椤圭洰")
+ @Excel(name = "淇濆吇椤圭洰")
+ private String maintenanceItems;
+
+ @ApiModelProperty(value = "淇濆吇閮ㄤ綅")
+ @Excel(name = "淇濆吇鍐呭")
+ private String maintenanceLocation;
@ApiModelProperty(value = "褰曞叆鏃ユ湡")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -105,8 +120,5 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Long tenantId;
-
- @ApiModelProperty("璁惧淇濆吇浣嶇疆")
- private String maintenanceLocation;
}
--
Gitblit v1.9.3