From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 d00c3ae..2558329 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;
@Schema(description = "鍩�")
@@ -36,6 +36,12 @@
@Schema(description = "鎺ユ敹鍙�")
private Integer receiptNo;
+
+ @Schema(description = "璁㈠崟绫诲瀷(01raw:鍘熸潗鏂欙紝02wg:澶栬喘鎴愬搧)")
+ private String orderType;
+
+ @Schema(description = "鐗╂枡灞炴�э紝鐢ㄤ簬鍖哄垎閾溿�侀摑瀵间綋绛夐浂浠�")
+ private String materialProp;
@ExcelProperty(index = 3, value = "闆朵欢鍙�")
@Schema(description = "闆朵欢鍙�")
@@ -207,4 +213,7 @@
// 鏄惁鏄繃鏈熸潗鏂�: 0鍚�, 1:鏄�"
@Schema(description = "鐗╂枡绫诲瀷")
private Integer isExpire;
+
+ @Schema(description = "鏄惁涓烘媶鍒嗚鍗�(1:鏄紝0:鍚�)")
+ private Integer isSplitOrder;
}
--
Gitblit v1.9.3