From 7f75b111c64641a21b8f3784fb9b4cc34e681b2d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 四月 2026 15:24:07 +0800
Subject: [PATCH] 检验任务:修复多芯产品生成报告中线芯颜色与检验值不对应问题

---
 basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
index 3984802..a391788 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
@@ -18,7 +18,7 @@
 @ExcelIgnoreUnannotated
 public class IfsInventoryQuantity  implements Serializable {
     @TableId(type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
 
     @ApiModelProperty("鍩�")
@@ -36,6 +36,12 @@
 
     @ApiModelProperty("鎺ユ敹鍙�")
     private Integer receiptNo;
+
+    @ApiModelProperty("璁㈠崟绫诲瀷(01raw:鍘熸潗鏂欙紝02wg:澶栬喘鎴愬搧)")
+    private String orderType;
+
+    @ApiModelProperty("鐗╂枡灞炴�э紝鐢ㄤ簬鍖哄垎閾溿�侀摑瀵间綋绛夐浂浠�")
+    private String materialProp;
 
     @ExcelProperty(index = 3, value = "闆朵欢鍙�")
     @ApiModelProperty("闆朵欢鍙�")
@@ -207,4 +213,7 @@
     // 鏄惁鏄繃鏈熸潗鏂�: 0鍚�, 1:鏄�"
     @ApiModelProperty("鐗╂枡绫诲瀷")
     private Integer isExpire;
+
+    @ApiModelProperty("鏄惁涓烘媶鍒嗚鍗�(1:鏄紝0:鍚�)")
+    private Integer isSplitOrder;
 }

--
Gitblit v1.9.3