From a40e6b29c5a02c14712d56ffed16e36ce89464ca Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 29 十二月 2025 17:00:01 +0800
Subject: [PATCH] 报告生成调整

---
 basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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..9c3a4d7 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,8 +18,7 @@
 @ExcelIgnoreUnannotated
 public class IfsInventoryQuantity  implements Serializable {
     @TableId(type = IdType.AUTO)
-    private Integer id;
-
+    private Long id;
 
     @ApiModelProperty("鍩�")
     private String contract;
@@ -27,6 +26,12 @@
     @ExcelProperty(index = 13, value = "璁㈠崟鍙�")
     @ApiModelProperty("璁㈠崟鍙�")
     private String orderNo;
+
+    @ApiModelProperty("璁㈠崟绫诲瀷(01raw:鍘熸潗鏂欙紝02wg:澶栬喘鎴愬搧)")
+    private String orderType;
+
+    @ApiModelProperty("鐗╂枡灞炴�э紝鐢ㄤ簬鍖哄垎閾溿�侀摑瀵间綋绛夐浂浠�")
+    private String materialProp;
 
     @ApiModelProperty("琛屽彿")
     private String lineNo;
@@ -207,4 +212,7 @@
     // 鏄惁鏄繃鏈熸潗鏂�: 0鍚�, 1:鏄�"
     @ApiModelProperty("鐗╂枡绫诲瀷")
     private Integer isExpire;
+
+    @ApiModelProperty("鏄惁涓烘媶鍒嗚鍗�(1:鏄紝0:鍚�)")
+    private Integer isSplitOrder;
 }

--
Gitblit v1.9.3