From 9e1252668ed1c142c4878da705be2fe76c4a0cd5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 17 三月 2026 14:09:33 +0800
Subject: [PATCH] 质量管理：出厂检验改为成品检验

---
 src/main/java/com/ruoyi/quality/pojo/QualityInspect.java |   48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 008752c..e06c236 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 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 lombok.Data;
@@ -13,12 +14,12 @@
 import java.util.Date;
 
 /**
- * 璐ㄩ噺绠＄悊--鍘熸潗鏂�/杩囩▼/鍑哄巶妫�楠�
+ * 璐ㄩ噺绠＄悊--鍘熸潗鏂�/杩囩▼/鎴愬搧妫�楠�
  * quality_inspect
  */
 @TableName(value = "quality_inspect")
 @Data
-public class QualityInspect implements Serializable {
+public class QualityInspect extends DateQueryDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -28,9 +29,9 @@
     private Long id;
 
     /**
-     * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
+     * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鎴愬搧妫�楠�)
      */
-    @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
+    @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鎴愬搧妫�楠�")
     @NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!")
     private Integer inspectType;
 
@@ -42,6 +43,8 @@
     private Date checkTime;
 
 
+
+
     /**
      * 渚涘簲鍟嗗悕绉�(鍘熸潗鏂欐楠�)
      */
@@ -49,7 +52,7 @@
     private String supplier;
 
     /**
-     * 瀹㈡埛鍚嶇О(杩囩▼妫�楠�/鍑哄巶妫�楠�)
+     * 瀹㈡埛鍚嶇О(杩囩▼妫�楠�/鎴愬搧妫�楠�)
      */
     @Excel(name = "瀹㈡埛鍚嶇О")
     private String customer;
@@ -97,6 +100,18 @@
     private BigDecimal quantity;
 
     /**
+     * 涓嶈壇鏁伴噺
+     */
+    @Excel(name = "涓嶈壇鏁伴噺")
+    private BigDecimal defectiveQuantity;
+
+    /**
+     * 涓嶈壇鍘熷洜
+     */
+    @Excel(name = "涓嶈壇鍘熷洜")
+    private String defectiveReason;
+
+    /**
      * 妫�娴嬪崟浣�
      */
     @Excel(name = "妫�娴嬪崟浣�")
@@ -130,5 +145,28 @@
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
+    /**
+     * 绫诲埆(0:鏈彁浜�;1:宸叉彁浜�)
+     */
+    private Integer inspectState;
 
+    private Long purchaseLedgerId;
+
+    /**
+     * 鎶ュ伐id
+     */
+    private Long productMainId;
+
+    private Long productModelId;
+    //涓嶅悎鏍肩幇璞�
+    private String defectivePhenomena;
+
+    @ApiModelProperty("鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
+    private Long testStandardId;
+
+
+    @TableField(exist = false)
+    private String workOrderNo;
+    @TableField(exist = false)
+    private String purchaseContractNo;
 }

--
Gitblit v1.9.3