From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 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 73179fa..92609b2 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -5,7 +5,6 @@
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.io.Serial;
@@ -34,7 +33,6 @@
* 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
*/
@Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
- @NotNull(message = "绫诲埆涓嶈兘涓虹┖")
private Integer inspectType;
/**
@@ -74,7 +72,6 @@
/**
* 鍏宠仈浜у搧id
*/
- @NotNull(message = "浜у搧id涓嶈兘涓虹┖")
private Long productId;
/**
@@ -103,12 +100,10 @@
@Excel(name = "鍚堟牸鏁伴噺")
@TableField("qualified_quantity")
- @NotNull(message = "鍚堟牸鏁伴噺涓嶈兘涓虹┖")
private BigDecimal qualifiedQuantity;
@Excel(name = "涓嶅悎鏍兼暟閲�")
@TableField("unqualified_quantity")
- @NotNull(message = "涓嶅悎鏍兼暟閲忎笉鑳戒负绌�")
private BigDecimal unqualifiedQuantity;
/**
@@ -153,6 +148,11 @@
private Long purchaseLedgerId;
/**
+ * 閿�鍞彴璐d锛堝嚭鍘傛楠岋級
+ */
+ private Long salesLedgerId;
+
+ /**
* 鎶ュ伐id
*/
private Long productMainId;
@@ -164,6 +164,23 @@
@Schema(description = "鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
private Long testStandardId;
+ /**
+ * 鍏ュ簱姣斾緥(鐧惧垎姣�)锛岃川妫�鍏ュ簱鏃跺叆搴撴暟閲�=鍚堟牸鏁伴噺*鍏ュ簱姣斾緥/100
+ */
+ @Excel(name = "鍏ュ簱姣斾緥(%)")
+ @Schema(description = "鍏ュ簱姣斾緥(鐧惧垎姣�)锛岄粯璁�100")
+ private BigDecimal stockInRatio;
+
+ @Schema(description = "妫�楠岃鍒�: 0=鍏ㄦ, 1=鎶芥")
+ @Excel(name = "妫�楠岃鍒�", readConverterExp = "0=鍏ㄦ,1=鎶芥")
+ private Integer inspectRule;
+
+ @Schema(description = "鎶芥姣斾緥(鐧惧垎姣�), 浠卛nspectRule=1鏃舵湁鏁�")
+ @Excel(name = "鎶芥姣斾緥(%)")
+ private BigDecimal sampleRatio;
+
+ @Schema(description = "鎶芥鏁伴噺, 浠卛nspectRule=1鏃舵湁鏁�")
+ private BigDecimal sampleQuantity;
@TableField(fill = FieldFill.INSERT)
private Long deptId;
--
Gitblit v1.9.3