From 6c95c2f6a3602fe6f92898dd322c20bbe955e69d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 18:03:20 +0800
Subject: [PATCH] feat: 成品入库增加审批环节,原材质检后提交入库时增加一个审批环节
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 179caca..1b903e7 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -6,6 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@@ -19,6 +20,7 @@
*/
@TableName(value = "quality_inspect")
@Data
+@EqualsAndHashCode(callSuper = true)
public class QualityInspect extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,7 +33,7 @@
/**
* 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
*/
- @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
+ @Excel(name = "绫诲埆", readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
@NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!")
private Integer inspectType;
@@ -41,8 +43,6 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
-
-
/**
@@ -112,7 +112,6 @@
private String checkResult;
-
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@@ -149,4 +148,24 @@
//涓嶅悎鏍肩幇璞�
private String defectivePhenomena;
+ @ApiModelProperty("鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
+ private Long testStandardId;
+
+ @ApiModelProperty("鍏ュ簱瀹℃壒鐘舵�侊細1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触")
+ private Integer approvalStatus;
+
+ @ApiModelProperty("鍏ュ簱瀹℃壒浜篿d")
+ private String approveUserIds;
+
+
+ @TableField(exist = false)
+ private String workOrderNo;
+ @TableField(exist = false)
+ private String purchaseContractNo;
+
+ /**
+ * 鍘氬害
+ */
+ @TableField(exist = false)
+ private BigDecimal thickness;
}
--
Gitblit v1.9.3