From 64984c01892d6fe51d8ab550c6a28f2d0e81d6fe Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 15 一月 2026 17:55:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index a135fa3..7af592b 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -9,8 +9,10 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* 浜у搧淇℃伅瀵硅薄 sales_ledger_product
@@ -20,7 +22,7 @@
*/
@TableName("sales_ledger_product")
@Data
-public class SalesLedgerProduct {
+public class SalesLedgerProduct implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -57,6 +59,12 @@
*/
@Excel(name = "鍗曚綅")
private String unit;
+
+ /**
+ * 鐢熶骇鐐掓満
+ */
+ @Excel(name = "鐢熶骇鐐掓満")
+ private String speculativeTradingName;
/**
* 鏁伴噺
@@ -103,22 +111,22 @@
/**
* 鏈鏉ョエ鏁�
*/
- private BigDecimal ticketsNum;
+ private BigDecimal ticketsNum=BigDecimal.ZERO;
/**
* 鏈鏉ョエ閲戦(鍏�)
*/
- private BigDecimal ticketsAmount;
+ private BigDecimal ticketsAmount=BigDecimal.ZERO;
/**
* 鏈潵绁ㄦ暟
*/
- private BigDecimal futureTickets;
+ private BigDecimal futureTickets=BigDecimal.ZERO;
/**
* 鏈潵绁ㄩ噾棰�(鍏�)
*/
- private BigDecimal futureTicketsAmount;
+ private BigDecimal futureTicketsAmount=BigDecimal.ZERO;
@ApiModelProperty(value = "寮�绁ㄦ暟")
private BigDecimal invoiceNum;
@@ -177,4 +185,28 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime registerDate;
+ /**
+ * 鍙戣揣杞︾墝鍙�
+ */
+ @Excel(name = "鍙戣揣杞︾墝鍙�")
+ @TableField(exist = false)
+ private String shippingCarNumber;
+
+ /**
+ * 鍙戣揣鏃ユ湡
+ */
+ @Excel(name = "鍙戣揣鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date shippingDate;
+
+// @TableField(exist = false)
+// @ApiModelProperty(value = "鐢熶骇鐘舵��")
+// private String productionStatus = "鏈紑濮�";
+ /**
+ * 鍙戣揣瀹℃壒鐘舵��
+ */
+// @TableField(exist = false)
+ @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0鏈敓浜�,1宸茬敓浜�,2寰呭鏍�(瀹℃牳涓�),3瀹℃牳瀹屾垚,4瀹℃牳澶辫触")
+ private Integer approveStatus;
}
--
Gitblit v1.9.3