From ded338d0bafa5594b275edb81a8f69ea4446c37c Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 06 一月 2026 15:02:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 3949cd7..8eacb60 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -4,11 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* 浜у搧淇℃伅瀵硅薄 sales_ledger_product
@@ -18,7 +21,7 @@
*/
@TableName("sales_ledger_product")
@Data
-public class SalesLedgerProduct {
+public class SalesLedgerProduct implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -32,6 +35,11 @@
*/
@Excel(name = "鍏宠仈閿�鍞彴璐︿富琛ㄤ富閿�")
private Long salesLedgerId;
+
+ /**
+ * 棰勮鏁伴噺
+ */
+ private BigDecimal warnNum;
/**
* 浜у搧澶х被
@@ -52,11 +60,18 @@
private String unit;
/**
+ * 鐢熶骇鐐掓満
+ */
+ @Excel(name = "鐢熶骇鐐掓満")
+ private String speculativeTradingName;
+
+ /**
* 鏁伴噺
*/
@Excel(name = "鏁伴噺")
private BigDecimal quantity;
-
+ @Excel(name = "鏈�浣庡簱瀛樻暟閲�")
+ private BigDecimal minStock;
/**
* 绋庣巼
*/
@@ -95,7 +110,7 @@
/**
* 鏈鏉ョエ鏁�
*/
- private Long ticketsNum;
+ private BigDecimal ticketsNum;
/**
* 鏈鏉ョエ閲戦(鍏�)
@@ -105,7 +120,7 @@
/**
* 鏈潵绁ㄦ暟
*/
- private Long futureTickets;
+ private BigDecimal futureTickets;
/**
* 鏈潵绁ㄩ噾棰�(鍏�)
@@ -153,4 +168,20 @@
@ApiModelProperty(value = "涓存椂鏈紑绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal tempnoInvoiceAmount;
+
+ @ApiModelProperty(value = "涓存椂鏈潵绁ㄦ暟")
+ @TableField(exist = false)
+ private BigDecimal tempFutureTickets;
+
+ @ApiModelProperty(value = "涓存椂鏈潵绁ㄩ噾棰�")
+ @TableField(exist = false)
+ private BigDecimal tempFutureTicketsAmount;
+
+ @ApiModelProperty("鐧昏浜�")
+ private String register;
+
+ @ApiModelProperty("鐧昏鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime registerDate;
}
--
Gitblit v1.9.3