From c4409fac0044cc1efeda07b6a7709c3fde1aa9fe Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期六, 24 十月 2026 10:46:32 +0800
Subject: [PATCH] fix(仓储物流): ①出库新增临时跳过租户插件修复 SetOperationList 解析异常 ②库存预警查询补 warningLevel/warningStatus/warningTime/expectedShortageTime/suggestionType/suggestionContent 字段 ③currentStock 别名
---
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
index e4761a2..401d1be 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
@@ -1,8 +1,6 @@
package com.ruoyi.procurementrecord.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Builder;
import lombok.Data;
@@ -24,7 +22,7 @@
private Integer id;
/**
- * 浜у搧淇℃伅琛╥d
+ * 浜у搧淇℃伅琛╥d锛堣嚜瀹氫箟鍏ュ簱鏃朵负0锛�
*/
private Integer salesLedgerProductId;
@@ -33,34 +31,67 @@
*/
private Integer procurementRecordStorageId;
+
+ /**
+ * 缂栧彿
+ */
+ private String code;
+
/**
* 鍑哄簱鎵规
*/
private String inboundBatches;
/**
- * 鍑哄嚭搴撴暟閲�
+ * 鍑哄簱鏁伴噺
*/
private BigDecimal inboundNum;
- /**
- * 鍑哄嚭搴撴椂闂�
- */
- private LocalDateTime createDate;
/**
- * 鍑哄嚭搴撶敤鎴�
+ * 鍑哄簱绫诲瀷 1-閲囪喘鍑哄簱 2-閿�鍞嚭搴� 3-鑷畾涔夊嚭搴�(鍙戞枡/棰嗙敤) 5-閫�璐у嚭搴�(閲囪喘閫�璐�)
+ */
+ private Integer type;
+
+ /**
+ * 渚涘簲鍟嗗悕绉帮紙閫�璐у嚭搴�-閫�鍥炰緵搴斿晢鏃惰褰曪級
+ */
+ private String supplierName;
+
+ /**
+ * 鍑哄簱鐢ㄦ埛
*/
private String createBy;
+ /**
+ * 鍏ュ簱鐢ㄦ埛id
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
/**
- * 鍑哄嚭搴撶敤鎴穒d
+ * 鍏ュ簱鏃堕棿
*/
- private Integer userId;
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼鑰�
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
/**
* 绉熸埛ID
*/
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ /** 棰嗙敤鏁伴噺 */
+ private java.math.BigDecimal requisitionNum;
}
--
Gitblit v1.9.3