From ca0565e53494417b3779759f8d3898e07bfd5929 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 14:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb
---
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
index a0f73d9..b9bfb2c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
@@ -35,6 +35,26 @@
* 鍏ュ簱鏁伴噺
*/
private BigDecimal inboundNum;
+
+ /**
+ * 鍗曚环
+ */
+ private BigDecimal unitPrice;
+
+ /**
+ * 鎬讳环
+ */
+ private BigDecimal totalPrice;
+
+ /**
+ * 棰勮鏁伴噺
+ */
+ private BigDecimal warnNum;
+
+ /**
+ * 鍏ュ簱绫诲瀷 1-閲囪喘鍏ュ簱 2-鐢熶骇鍏ュ簱
+ */
+ private Integer type;
// /**
// * 鏈�浣庡簱瀛樻暟閲�
// */
@@ -49,21 +69,25 @@
/**
* 鍏ュ簱鐢ㄦ埛id
*/
+ @TableField(fill = FieldFill.INSERT)
private Long createUser;
/**
* 鍏ュ簱鏃堕棿
*/
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
/**
* 淇敼鑰�
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
/**
* 淇敼鏃堕棿
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
/**
@@ -71,4 +95,22 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ /**
+ * 浜у搧ID
+ */
+ private Long productModelId;
+
+ /**
+ * 姣忕鏁伴噺
+ */
+ private Integer boxNum;
+ /**
+ * 姣忕瑙勬牸
+ */
+ private String cartonSpecifications;
+ /**
+ * 缇庡厓姣忎欢
+ */
+ private BigDecimal dollarPrice;
}
--
Gitblit v1.9.3