From 3440ecd09d9dfc884fe111a2cdd4daff7aae50ef Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 18 九月 2026 15:21:09 +0800
Subject: [PATCH] feat: 检验模块新增纸质单据导出模板（原材料/出厂/过程检验），过程检验新增技术参数等字段并改造判定提交逻辑
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 123 +++++++++++++++++++++++++++++++++++++---
1 files changed, 112 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..19a0816 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 jakarta.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;
/**
@@ -88,6 +96,18 @@
private String model;
/**
+ * 鏉愯川
+ */
+ @Excel(name = "鏉愯川")
+ private String material;
+
+ /**
+ * 楠屾敹渚濇嵁
+ */
+ @Excel(name = "楠屾敹渚濇嵁")
+ private String acceptanceBasis;
+
+ /**
* 鍗曚綅
*/
@Excel(name = "鍗曚綅")
@@ -96,8 +116,81 @@
/**
* 鏁伴噺
*/
- @Excel(name = "鏁伴噺")
+ @Excel(name = "鎬绘暟閲�")
private BigDecimal quantity;
+
+ /**
+ * 鎶芥鏁�
+ */
+ @Excel(name = "鎶芥鏁�")
+ private BigDecimal samplingCount;
+
+ /**
+ * 鍥剧焊鍏抽敭閮ㄤ綅灏哄
+ */
+ @Excel(name = "鍥剧焊鍏抽敭閮ㄤ綅灏哄")
+ private String drawingKeyDimensions;
+
+ /**
+ * 瀹炴祴鍏抽敭閮ㄤ綅灏哄
+ */
+ @Excel(name = "瀹炴祴鍏抽敭閮ㄤ綅灏哄")
+ private String measuredKeyDimensions;
+
+ /**
+ * 涓昏鎶�鏈弬鏁�(杩囩▼妫�楠�)
+ */
+ @Excel(name = "涓昏鎶�鏈弬鏁�")
+ private String mainTechnicalParams;
+
+ /**
+ * 瀹為檯鎶�鏈弬鏁�(杩囩▼妫�楠�)
+ */
+ @Excel(name = "瀹為檯鎶�鏈弬鏁�")
+ private String actualTechnicalParams;
+
+ /**
+ * 璇存槑涔�(杩囩▼妫�楠�)
+ */
+ @Excel(name = "璇存槑涔�")
+ private String specificationManual;
+
+ /**
+ * 鍏ュ簱缂栧彿
+ */
+ @Excel(name = "鍏ュ簱缂栧彿")
+ private String warehouseCode;
+
+ /**
+ * 鎵�灞炶澶囧悕绉�
+ */
+ @Excel(name = "鎵�灞炶澶囧悕绉�")
+ private String equipmentName;
+
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ @Excel(name = "椤圭洰鍚嶇О")
+ private String projectName;
+
+ /**
+ * 鍒ゅ畾(鍚堟牸/涓嶅悎鏍�)
+ */
+ @Excel(name = "鍒ゅ畾")
+ private String verdict;
+
+ /**
+ * 寮傚父澶囨敞(鍘熸潗鏂欐楠�)
+ */
+ private String abnormalRemark;
+
+ @Excel(name = "鍚堟牸鏁伴噺")
+ @TableField("qualified_quantity")
+ private BigDecimal qualifiedQuantity;
+
+ @Excel(name = "涓嶅悎鏍兼暟閲�")
+ @TableField("unqualified_quantity")
+ private BigDecimal unqualifiedQuantity;
/**
* 妫�娴嬪崟浣�
@@ -113,23 +206,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 +242,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