From 51c806f81b4498b2196025c97a94c51b1bb3eeb9 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 16 三月 2026 15:37:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 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 008752c..ef7f13d 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;
@@ -18,7 +19,7 @@
*/
@TableName(value = "quality_inspect")
@Data
-public class QualityInspect implements Serializable {
+public class QualityInspect extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -40,6 +41,8 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
+
+
/**
@@ -70,6 +73,7 @@
* 鍏宠仈浜у搧id
*/
@NotBlank(message = "浜у搧id涓嶈兘涓虹┖")
+ //瀹佸-涓洓寤烘潗浣跨敤鏂扮殑浜у搧琛ㄥ叧鑱攑roduct_material_sku
private Long productId;
/**
@@ -130,5 +134,59 @@
@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;
+
+ /**
+ * 鍙栨牱鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍙栨牱鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date sampleTime;
+
+ /**
+ * 妫�娴嬫�ц川
+ */
+ @Excel(name = "妫�娴嬫�ц川")
+ private String inspectNature;
+
+ /**
+ * 璇曟牱缂栧彿
+ */
+ @Excel(name = "璇曟牱缂栧彿")
+ private String sampleCode;
+
+ /**
+ * 璇曟牱鐘舵��
+ */
+ @Excel(name = "璇曟牱鐘舵��")
+ private String sampleState;
+
+ /**
+ * 杞︾墝鍙�
+ */
+ @Excel(name = "杞︾墝鍙�")
+ private String licensePlateNumber;
}
--
Gitblit v1.9.3