From 47c5bd416bf37769022e41402add8a41c2d09c96 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 23 三月 2026 09:47:53 +0800
Subject: [PATCH] 1、生产工单搜索加上生产订单号搜索。 2、列表顺序除了按照优先级进行排序，还要根据工艺路线的工序的顺序进行排序，开始的排在前面
---
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index 5636c2f..0c34c62 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -31,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;
/**
@@ -93,6 +93,12 @@
private String defectivePhenomena;
/**
+ * 鏄惁宸插彇娑堥殧绂�
+ */
+ @Excel(name = "鏄惁宸插彇娑堥殧绂�")
+ private Boolean quarantineLifted;
+
+ /**
* 澶勭悊缁撴灉
*/
@Excel(name = "澶勭悊缁撴灉")
@@ -111,7 +117,8 @@
@Excel(name = "澶勭悊鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date dealTime;
-
+ @Excel(name = "澶囨敞")
+ private String remark;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@@ -133,5 +140,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