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/CustomStorage.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
index 82175f6..496c3d1 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -37,41 +37,59 @@
@Excel(name = "鍏ュ簱鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date inboundDate;
+ /**
+ * 缂栧彿
+ */
+ @Excel(name = "缂栧彿")
+ private String code;
+
@TableField(exist = false)
private String timeStr;
+ /**
+ * 寰呭嚭搴撴暟閲�
+ */
+ @Excel(name = "寰呭嚭搴撴暟閲�")
+ @TableField(exist = false)
+ private BigDecimal inboundNum0;
+ /**
+ * 鍑哄簱鏁伴噺
+ */
+ @Excel(name = "鍑哄簱鏁伴噺")
+ @TableField(exist = false)
+ private BigDecimal totalInboundNum = BigDecimal.ZERO;
// 鐗╁搧绫诲瀷
-// @Excel(name = "鐗╁搧绫诲瀷")
+ @Excel(name = "鐗╁搧绫诲瀷")
private String itemType;
// 鍏ュ簱鎵规
-// @Excel(name = "鍏ュ簱鎵规")
+ @Excel(name = "鍏ュ簱鎵规")
private String inboundBatches;
// 鍏ュ簱鏁伴噺
@Excel(name = "鍏ュ簱鏁伴噺")
private BigDecimal inboundNum;
// 渚涘簲鍟嗗悕绉�
-// @Excel(name = "渚涘簲鍟嗗悕绉�")
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
// 浜у搧澶х被
- @Excel(name = "浜у搧鍚嶇О")
+ @Excel(name = "浜у搧澶х被")
private String productCategory;
// 瑙勬牸鍨嬪彿
- @Excel(name = "浜у搧楂樺害")
+ @Excel(name = "瑙勬牸鍨嬪彿")
private String specificationModel;
// 鍗曚綅
-// @Excel(name = "鍗曚綅")
+ @Excel(name = "鍗曚綅")
private String unit;
// 鍚◣鍗曚环
- @Excel(name = "鍗曚环(鍏�)/浠�")
+ @Excel(name = "鍚◣鍗曚环")
private BigDecimal taxInclusiveUnitPrice;
// 鍚◣鎬讳环
-// @Excel(name = "鍚◣鎬讳环")
+ @Excel(name = "鍚◣鎬讳环")
private BigDecimal taxInclusiveTotalPrice;
// 绋庣巼(%)
-// @Excel(name = "绋庣巼(%)")
+ @Excel(name = "绋庣巼(%)")
private BigDecimal taxRate;
// 涓嶅惈绋庢�讳环
-// @Excel(name = "涓嶅惈绋庢�讳环")
+ @Excel(name = "涓嶅惈绋庢�讳环")
private BigDecimal taxExclusiveTotalPrice;
/**
* 鍏ュ簱鐢ㄦ埛
@@ -102,8 +120,8 @@
* 鍏ュ簱鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
-// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-// @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
/**
@@ -116,8 +134,8 @@
* 淇敼鏃堕棿
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
-// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
/**
@@ -140,4 +158,5 @@
*/
@Excel(name = "鍗曚环(缇庡厓)/浠�")
private BigDecimal dollarPrice;
+
}
--
Gitblit v1.9.3