From f569e2257372a2f940aace9ad151fd758196eb9a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 13 六月 2026 14:34:42 +0800
Subject: [PATCH] 修改客户，销售，协同，报价，质量

---
 src/main/java/com/ruoyi/quality/pojo/QualityInspect.java |   46 +++++++++++++++++++++++++++++++++++-----------
 1 files changed, 35 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 ccdf6ef..0ebd889 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -2,16 +2,19 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.dto.StorageBlobVO;
 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 javax.validation.constraints.NotBlank;
+import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 璐ㄩ噺绠＄悊--鍘熸潗鏂�/杩囩▼/鍑哄巶妫�楠�
@@ -20,6 +23,7 @@
 @TableName(value = "quality_inspect")
 @Data
 public class QualityInspect extends DateQueryDto implements Serializable {
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /**
@@ -32,7 +36,6 @@
      * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
      */
     @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
-    @NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!")
     private Integer inspectType;
 
     /**
@@ -64,6 +67,12 @@
     private String process;
 
     /**
+     * 宸ュ簭绫诲瀷
+     */
+    @Excel(name = "宸ュ簭绫诲瀷")
+    private Integer processType;
+
+    /**
      * 妫�楠屽憳
      */
     @Excel(name = "妫�楠屽憳")
@@ -72,7 +81,6 @@
     /**
      * 鍏宠仈浜у搧id
      */
-    @NotBlank(message = "浜у搧id涓嶈兘涓虹┖")
     private Long productId;
 
     /**
@@ -96,8 +104,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 +129,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;
 
@@ -149,10 +165,18 @@
     //涓嶅悎鏍肩幇璞�
     private String defectivePhenomena;
 
-    @ApiModelProperty("鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
+    @Schema(description = "鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
     private Long testStandardId;
 
 
     @TableField(fill = FieldFill.INSERT)
     private Long deptId;
+
+    @Schema(description = "闄勪欢鍒楄〃锛堟柊澧�/缂栬緫鏃朵紶鍏ワ級")
+    @TableField(exist = false)
+    private List<StorageBlobDTO> storageBlobDTOs;
+
+    @Schema(description = "闄勪欢鍒楄〃锛堟煡璇㈡椂杩斿洖锛�")
+    @TableField(exist = false)
+    private List<StorageBlobVO> storageBlobVOs;
 }

--
Gitblit v1.9.3