From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index e06c236..2be238c 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -88,6 +88,13 @@
private String model;
/**
+ * 鐗╂枡缂栫爜
+ */
+ @Excel(name = "鏂欏彿")
+ @TableField(exist = false)
+ private String materialCode;
+
+ /**
* 鍗曚綅
*/
@Excel(name = "鍗曚綅")
@@ -98,6 +105,10 @@
*/
@Excel(name = "鏁伴噺")
private BigDecimal quantity;
+
+ @Excel(name = "鍚堟牸鏁伴噺")
+ @TableField(exist = false)
+ private BigDecimal qualifiedQuantity;
/**
* 涓嶈壇鏁伴噺
@@ -169,4 +180,6 @@
private String workOrderNo;
@TableField(exist = false)
private String purchaseContractNo;
+ @TableField(exist = false)
+ private String batchNo;
}
--
Gitblit v1.9.3