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/dto/DeviceMaintenanceDto.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index dffcdd5..8629f1d 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -5,18 +5,17 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
+import java.time.LocalDateTime;
@Data
public class DeviceMaintenanceDto {
@ApiModelProperty("璁惧淇濆吇id")
-
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
- private String deviceLedgerId;
+ private Long deviceLedgerId;
@ApiModelProperty("璁惧鍚嶇О")
private String deviceName;
@@ -24,28 +23,43 @@
@ApiModelProperty("瑙勬牸鍨嬪彿")
private String deviceModel;
+ @ApiModelProperty("淇濆吇閮ㄤ綅")
+ private String maintenanceLocation;
+
+ @ApiModelProperty("淇濆吇椤圭洰")
+ private String maintenanceItems;
+
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private Date maintenancePlanTime;
+ private String maintenancePlanTimeReq;
+
+ @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
+ private String maintenancePlanTime;
+
+ @ApiModelProperty("璁″垝淇濆吇浜�")
+ private String maintenancePerson;
@ApiModelProperty("瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private Date maintenanceActuallyTime;
+ private String maintenanceActuallyTime;
+
+ @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
+ private String maintenanceActuallyTimeReq;
@ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
- private Integer maintenanceResult;
+ private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+ @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
- private Date createTime;
+ private LocalDateTime createTime;
@ApiModelProperty("鏇存柊鏃堕棿")
@TableField(fill = FieldFill.UPDATE)
- private Date updateTime;
+ private LocalDateTime updateTime;
@ApiModelProperty("鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
@@ -58,4 +72,7 @@
@ApiModelProperty("绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @ApiModelProperty("鍒涘缓浜哄悕绉�")
+ private String createUserName;
}
--
Gitblit v1.9.3