From 45893b5be857c034467d7069cf41a9905b369691 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 26 六月 2026 11:01:19 +0800
Subject: [PATCH] fix: 报价日期倒序,发货台账返回宽、高和数量
---
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index 2479add..6039070 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -2,9 +2,11 @@
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;
+import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@@ -18,7 +20,8 @@
*/
@TableName(value = "quality_unqualified")
@Data
-public class QualityUnqualified implements Serializable {
+@EqualsAndHashCode(callSuper = true)
+public class QualityUnqualified extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -28,19 +31,18 @@
private Long id;
-
/**
* 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
*/
@NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!!")
- @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
+ @Excel(name = "绫诲埆", readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
private Integer inspectType;
/**
* 鐘舵��(0:寰呭鐞�;1:宸插鐞�)
*/
@NotBlank(message = "鐘舵�佷笉鑳戒负绌�!!")
- @Excel(name = "鐘舵��",readConverterExp = "0=寰呭鐞�,1=宸插鐞�")
+ @Excel(name = "鐘舵��", readConverterExp = "0=寰呭鐞�,1=宸插鐞�")
private Integer inspectState;
/**
@@ -60,6 +62,11 @@
* 鍏宠仈浜у搧id
*/
private Long productId;
+
+ /**
+ * 浜у搧瑙勬牸ID
+ */
+ private Long productModelId;
/**
* 浜у搧鍚嶇О
@@ -111,7 +118,6 @@
private Date dealTime;
-
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@@ -132,5 +138,15 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty("鍏宠仈妫�娴媔d")
+ private Long inspectId;
+
+ @ApiModelProperty("鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
+ @TableField(exist = false)
+ private Boolean method;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鍘氬害(mm)")
+ private BigDecimal thickness;
}
--
Gitblit v1.9.3