From 1c215236bcaafd414a1f47e71338fe9c1bbcfb3a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 一月 2026 13:45:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 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 28cee3c..8639b77 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
@@ -37,9 +37,24 @@
     private BigDecimal inboundNum;
 
     /**
+     * 鍗曚环
+     */
+    private BigDecimal unitPrice;
+
+    /**
+     * 鎬讳环
+     */
+    private BigDecimal totalPrice;
+
+    /**
      * 棰勮鏁伴噺
      */
     private BigDecimal warnNum;
+
+    /**
+     * 鍏ュ簱绫诲瀷 1-閲囪喘鍏ュ簱 2-鐢熶骇鍏ュ簱
+     */
+    private Integer type;
 //    /**
 //     * 鏈�浣庡簱瀛樻暟閲�
 //     */
@@ -54,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;
 
     /**
@@ -76,4 +95,16 @@
      */
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+
+    /**
+     * 浜у搧ID
+     */
+    private Long productModelId;
+
+    private Long qualityInspectId;
+
+    /**
+     * 鏄惁鍐荤粨(0:鏈喕缁� 1:宸插喕缁�)
+     */
+    private Boolean isFrozen;
 }

--
Gitblit v1.9.3