From 84ee50f83144da18e7eb42bb8577aa17f717e7fa Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 18 三月 2026 09:23:00 +0800
Subject: [PATCH] 不合格管理：取消隔离
---
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index e26d014..f847294 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,7 +19,7 @@
*/
@TableName(value = "quality_unqualified")
@Data
-public class QualityUnqualified implements Serializable {
+public class QualityUnqualified extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -30,10 +31,10 @@
/**
- * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
+ * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鎴愬搧妫�楠�)
*/
@NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!!")
- @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
+ @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鎴愬搧妫�楠�")
private Integer inspectType;
/**
@@ -55,6 +56,11 @@
*/
@Excel(name = "妫�楠屽憳")
private String checkName;
+
+ /**
+ * 鍏宠仈浜у搧id
+ */
+ private Long productId;
/**
* 浜у搧鍚嶇О
@@ -105,7 +111,8 @@
@Excel(name = "澶勭悊鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date dealTime;
-
+ @Excel(name = "澶囨敞")
+ private String remark;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@@ -127,5 +134,15 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty("鍏宠仈妫�娴媔d")
+ private Long inspectId;
+
+ @ApiModelProperty("鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
+ @TableField(exist = false)
+ private Boolean method;
+
+ @ApiModelProperty("宸ュ簭")
+ @TableField(exist = false)
+ private String process;
}
--
Gitblit v1.9.3