From 5bd1e846de7587f39d3edacfed58bfa8325c8758 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 30 一月 2026 15:09:07 +0800
Subject: [PATCH] 不合格管理：重新提交oa功能调整2
---
inspect-server/src/main/java/com/ruoyi/inspect/dto/UnqualifiedHandlerDto.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/UnqualifiedHandlerDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/UnqualifiedHandlerDto.java
index 1b0d8e0..8594292 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/UnqualifiedHandlerDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/UnqualifiedHandlerDto.java
@@ -8,6 +8,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -16,6 +17,9 @@
@ApiModelProperty("鍩�")
private String contract;
+
+ @ApiModelProperty("OA娴佺▼鐘舵��")
+ private String operation;
@ApiModelProperty("璁㈠崟鍙�")
private String orderNo;
@@ -68,6 +72,9 @@
@ApiModelProperty("鎵瑰彿")
private String lotBatchNo;
+ @ApiModelProperty("鏇存柊鍚庣殑ifs鎵瑰彿")
+ private String updateBatchNo;
+
@ApiModelProperty("wdr鍙�")
private String waivDevRejNo;
@@ -111,7 +118,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime invalidDate;
-
@ApiModelProperty("瀹℃壒鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime approvedDate;
@@ -128,7 +134,6 @@
@ApiModelProperty("閲囪喘鍗曚綅")
private String buyUnitMeas;
-
private Integer isSource;
private Integer number;
@@ -139,10 +144,25 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime receiverDate;
-
@ApiModelProperty("闄勪欢鍒楄〃")
private List<InsUnqualifiedHandlerFile> unqualifiedHandlerFiles;
+ /**
+ * 鍙嶉寮�濮嬫棩鏈�
+ */
+ @ApiModelProperty(value = "鍙嶉寮�濮嬫棩鏈�")
+ private String feedbackStartTime;
+ /**
+ * 鍙嶉缁撴潫鏃ユ湡
+ */
+ @ApiModelProperty(value = "鍙嶉缁撴潫鏃ユ湡")
+ private String feedbackEndTime;
+
+ /**
+ * 鐗╂枡灞炴��
+ */
+ @ApiModelProperty(value = "鐗╂枡灞炴��")
+ private String materialProp;
}
--
Gitblit v1.9.3