From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index e1b2e6a..e06c236 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -14,7 +14,7 @@
import java.util.Date;
/**
- * 璐ㄩ噺绠＄悊--鍘熸潗鏂�/杩囩▼/鍑哄巶妫�楠�
+ * 璐ㄩ噺绠＄悊--鍘熸潗鏂�/杩囩▼/鎴愬搧妫�楠�
* quality_inspect
*/
@TableName(value = "quality_inspect")
@@ -29,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;
@@ -52,7 +52,7 @@
private String supplier;
/**
- * 瀹㈡埛鍚嶇О(杩囩▼妫�楠�/鍑哄巶妫�楠�)
+ * 瀹㈡埛鍚嶇О(杩囩▼妫�楠�/鎴愬搧妫�楠�)
*/
@Excel(name = "瀹㈡埛鍚嶇О")
private String customer;
@@ -100,6 +100,18 @@
private BigDecimal quantity;
/**
+ * 涓嶈壇鏁伴噺
+ */
+ @Excel(name = "涓嶈壇鏁伴噺")
+ private BigDecimal defectiveQuantity;
+
+ /**
+ * 涓嶈壇鍘熷洜
+ */
+ @Excel(name = "涓嶈壇鍘熷洜")
+ private String defectiveReason;
+
+ /**
* 妫�娴嬪崟浣�
*/
@Excel(name = "妫�娴嬪崟浣�")
@@ -138,5 +150,23 @@
*/
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