From e9e88eefcc8abd2b1e187d28c7666e80307e97cc Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 09 五月 2026 14:59:33 +0800
Subject: [PATCH] 不合格处理：切换新的OA流程
---
basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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..f9ae81c 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,15 +18,20 @@
@ExcelIgnoreUnannotated
public class IfsInventoryQuantity implements Serializable {
@TableId(type = IdType.AUTO)
- private Integer id;
-
+ private Long id;
@ApiModelProperty("鍩�")
private String contract;
- @ExcelProperty(index = 13, value = "璁㈠崟鍙�")
+ @ExcelProperty(index = 12, value = "璁㈠崟鍙�")
@ApiModelProperty("璁㈠崟鍙�")
private String orderNo;
+
+ @ApiModelProperty("璁㈠崟绫诲瀷(01raw:鍘熸潗鏂欙紝02wg:澶栬喘鎴愬搧)")
+ private String orderType;
+
+ @ApiModelProperty("鐗╂枡灞炴�э紝鐢ㄤ簬鍖哄垎閾溿�侀摑瀵间綋绛夐浂浠�")
+ private String materialProp;
@ApiModelProperty("琛屽彿")
private String lineNo;
@@ -37,11 +42,11 @@
@ApiModelProperty("鎺ユ敹鍙�")
private Integer receiptNo;
- @ExcelProperty(index = 3, value = "闆朵欢鍙�")
+ @ExcelProperty(index = 2, value = "闆朵欢鍙�")
@ApiModelProperty("闆朵欢鍙�")
private String partNo;
- @ExcelProperty(index = 4, value = "闆朵欢鎻忚堪")
+ @ExcelProperty(index = 3, value = "闆朵欢鎻忚堪")
@ApiModelProperty("闆朵欢鎻忚堪")
private String partDesc;
@@ -51,7 +56,7 @@
@ApiModelProperty("鐘舵��(IFS鍘熸湰鎷夊彇鐨勭姸鎬�)")
private String statusDb;
- @ExcelProperty(index = 11, value = "鎶佃揪鐨勯噰璐暟閲�")
+ @ExcelProperty(index = 10, value = "鎶佃揪鐨勯噰璐暟閲�")
@ApiModelProperty("鎶佃揪鐨勯噰璐暟閲�")
private BigDecimal qtyArrived;
@@ -64,7 +69,7 @@
@ApiModelProperty("渚涘簲鍟嗙紪鍙�")
private String supplierId;
- @ExcelProperty(index = 5, value = "渚涘簲鍟嗗悕绉�")
+ @ExcelProperty(index = 4, value = "渚涘簲鍟嗗悕绉�")
@ApiModelProperty("渚涘簲鍟嗗悕绉�")
private String supplierName;
@@ -137,7 +142,7 @@
@ApiModelProperty("閲囪喘璁㈠崟琛屽娉�")
private String lineRemarks;
- @ExcelProperty(index = 12, value = "鍗曚綅")
+ @ExcelProperty(index = 11, value = "鍗曚綅")
@ApiModelProperty("鍗曚綅")
private String buyUnitMeas;
@@ -184,7 +189,7 @@
private Integer isQuarter;
// 淇敼鍚庣殑
- @ExcelProperty(index = 1, value = "鎵瑰彿")
+ @ExcelProperty(index = 0, value = "鎵瑰彿")
@ApiModelProperty("鎵瑰彿")
private String updateBatchNo;
@@ -207,4 +212,7 @@
// 鏄惁鏄繃鏈熸潗鏂�: 0鍚�, 1:鏄�"
@ApiModelProperty("鐗╂枡绫诲瀷")
private Integer isExpire;
+
+ @ApiModelProperty("鏄惁涓烘媶鍒嗚鍗�(1:鏄紝0:鍚�)")
+ private Integer isSplitOrder;
}
--
Gitblit v1.9.3