From a08dce3de307ce138396db5fe7274ead2ef5c573 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 17:12:08 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb
---
src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
index 9aa7fd7..750b426 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -29,20 +29,16 @@
@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;
- /**
- * 鍥剧墖
- */
- private String url;
/**
* 鍑哄簱鏁伴噺
*/
@@ -88,6 +84,15 @@
@Excel(name = "鍏ュ簱鐢ㄦ埛")
private String createBy;
/**
+ * 寰呭嚭搴撴暟閲�
+ */
+ @Excel(name = "寰呭嚭搴撴暟閲�")
+ @TableField(exist = false)
+ private BigDecimal inboundNum0 = BigDecimal.ZERO;
+
+
+
+ /**
* 鍏ュ簱鐢ㄦ埛id
*/
@TableField(fill = FieldFill.INSERT)
@@ -120,5 +125,20 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ /**
+ * 姣忕鏁伴噺
+ */
+ @Excel(name = "姣忕鏁伴噺")
+ private Integer boxNum;
+ /**
+ * 姣忕瑙勬牸
+ */
+ @Excel(name = "姣忕瑙勬牸")
+ private String cartonSpecifications;
+ /**
+ * 缇庡厓姣忎欢
+ */
+ @Excel(name = "鍗曚环(缇庡厓)/浠�")
+ private BigDecimal dollarPrice;
}
--
Gitblit v1.9.3