From f67161d150eb5720b28fd3f9fbb40c4145d1146c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 10 六月 2026 11:42:37 +0800
Subject: [PATCH] feat:1.已审核只能编辑单价 2.添加完成按钮 3.添加标签打印和单据打印次数展示
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index bf34478..3cb7eaf 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;
@@ -92,10 +94,28 @@
private String unit;
/**
- * 鏁伴噺
+ * 鏁伴噺锛堟�绘暟閲忥紝鍒涘缓鍚庝笉鍙慨鏀癸級
*/
@Excel(name = "鏁伴噺")
private BigDecimal quantity;
+
+ /**
+ * 鍚堟牸鏁伴噺
+ */
+ @Excel(name = "鍚堟牸鏁伴噺")
+ private BigDecimal qualifiedQuantity;
+
+ /**
+ * 涓嶅悎鏍兼暟閲�
+ */
+ @Excel(name = "涓嶅悎鏍兼暟閲�")
+ private BigDecimal unqualifiedQuantity;
+
+ /**
+ * 鍚堟牸鐜囷紙%锛�
+ */
+ @Excel(name = "鍚堟牸鐜�")
+ private BigDecimal passRate;
/**
* 妫�娴嬪崟浣�
@@ -149,6 +169,12 @@
@ApiModelProperty("鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
private Long testStandardId;
+ @ApiModelProperty("鍏ュ簱瀹℃壒鐘舵�侊細1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触")
+ private Integer approvalStatus;
+
+ @ApiModelProperty("鍏ュ簱瀹℃壒浜篿d")
+ private String approveUserIds;
+
@TableField(exist = false)
private String workOrderNo;
--
Gitblit v1.9.3