From 5ac6ad0ec6e861d4d2275753d15d2ad7f870915a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 22 六月 2026 17:20:07 +0800
Subject: [PATCH] 6、明细记录中有删除操作的，需设置权限； 7、质量管理要设置检验规则；
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index b5b1bc9..c33313e 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -4,10 +4,10 @@
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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import jakarta.validation.constraints.NotBlank;
+import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -20,6 +20,7 @@
@TableName(value = "quality_inspect")
@Data
public class QualityInspect extends DateQueryDto implements Serializable {
+ @Serial
private static final long serialVersionUID = 1L;
/**
@@ -32,7 +33,6 @@
* 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
*/
@Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
- @NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!")
private Integer inspectType;
/**
@@ -72,7 +72,6 @@
/**
* 鍏宠仈浜у搧id
*/
- @NotBlank(message = "浜у搧id涓嶈兘涓虹┖")
private Long productId;
/**
@@ -96,8 +95,16 @@
/**
* 鏁伴噺
*/
- @Excel(name = "鏁伴噺")
+ @Excel(name = "鎬绘暟閲�")
private BigDecimal quantity;
+
+ @Excel(name = "鍚堟牸鏁伴噺")
+ @TableField("qualified_quantity")
+ private BigDecimal qualifiedQuantity;
+
+ @Excel(name = "涓嶅悎鏍兼暟閲�")
+ @TableField("unqualified_quantity")
+ private BigDecimal unqualifiedQuantity;
/**
* 妫�娴嬪崟浣�
@@ -113,23 +120,23 @@
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
@@ -141,6 +148,11 @@
private Long purchaseLedgerId;
/**
+ * 閿�鍞彴璐d锛堝嚭鍘傛楠岋級
+ */
+ private Long salesLedgerId;
+
+ /**
* 鎶ュ伐id
*/
private Long productMainId;
@@ -149,9 +161,30 @@
//涓嶅悎鏍肩幇璞�
private String defectivePhenomena;
- @ApiModelProperty("鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
+ @Schema(description = "鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
private Long testStandardId;
+ /**
+ * 鍏ュ簱姣斾緥(鐧惧垎姣�)锛岃川妫�鍏ュ簱鏃跺叆搴撴暟閲�=鍚堟牸鏁伴噺*鍏ュ簱姣斾緥/100
+ */
+ @Excel(name = "鍏ュ簱姣斾緥(%)")
+ @Schema(description = "鍏ュ簱姣斾緥(鐧惧垎姣�)锛岄粯璁�100")
+ private BigDecimal stockInRatio;
+
+ @Schema(description = "妫�楠岃鍒�: 0=鍏ㄦ, 1=鎶芥")
+ @Excel(name = "妫�楠岃鍒�", readConverterExp = "0=鍏ㄦ,1=鎶芥")
+ private Integer inspectRule;
+
+ @Schema(description = "鎶芥姣斾緥(鐧惧垎姣�), 浠卛nspectRule=1鏃舵湁鏁�")
+ @Excel(name = "鎶芥姣斾緥(%)")
+ private BigDecimal sampleRatio;
+
+ @Schema(description = "鎶芥鏁伴噺, 浠卛nspectRule=1鏃舵湁鏁�")
+ private BigDecimal sampleQuantity;
+
+ @Schema(description = "鑷姩鍒ゆ柇缁撴灉锛氬悎鏍�/涓嶅悎鏍�/null(闇�鎵嬪姩鍒ゆ柇)")
+ @Excel(name = "鑷姩鍒ゆ柇缁撴灉")
+ private String autoJudgeResult;
@TableField(fill = FieldFill.INSERT)
private Long deptId;
--
Gitblit v1.9.3