From 3240968279b2960b05071db0ac4e950955a69dfd Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 21 十月 2025 13:06:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 61 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 30ae659..efa03ec 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -1,14 +1,16 @@
package com.ruoyi.sales.pojo;
-import java.math.BigDecimal;
-
import com.baomidou.mybatisplus.annotation.IdType;
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.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* 浜у搧淇℃伅瀵硅薄 sales_ledger_product
@@ -56,7 +58,8 @@
*/
@Excel(name = "鏁伴噺")
private BigDecimal quantity;
-
+ @Excel(name = "鏈�浣庡簱瀛樻暟閲�")
+ private BigDecimal minStock;
/**
* 绋庣巼
*/
@@ -95,7 +98,7 @@
/**
* 鏈鏉ョエ鏁�
*/
- private Long ticketsNum;
+ private BigDecimal ticketsNum;
/**
* 鏈鏉ョエ閲戦(鍏�)
@@ -103,20 +106,20 @@
private BigDecimal ticketsAmount;
/**
- * 鏈潵寮�绁ㄦ暟
+ * 鏈潵绁ㄦ暟
*/
- private Long futureTickets;
+ private BigDecimal futureTickets;
/**
- * 鏈潵寮�绁ㄩ噾棰�(鍏�)
+ * 鏈潵绁ㄩ噾棰�(鍏�)
*/
private BigDecimal futureTicketsAmount;
@ApiModelProperty(value = "寮�绁ㄦ暟")
- private Integer invoiceNum;
+ private BigDecimal invoiceNum;
@ApiModelProperty(value = "鏈紑绁ㄦ暟")
- private Integer noInvoiceNum;
+ private BigDecimal noInvoiceNum;
@ApiModelProperty(value = "寮�绁ㄩ噾棰�")
private BigDecimal invoiceAmount;
@@ -126,9 +129,47 @@
@ApiModelProperty(value = "鏈寮�绁ㄦ暟")
@TableField(exist = false)
- private Integer currentInvoiceNum;
+ private BigDecimal currentInvoiceNum;
@TableField(exist = false)
@ApiModelProperty(value = "鏈寮�绁ㄩ噾棰�")
private BigDecimal currentInvoiceAmount;
+
+ /**
+ * 浜у搧id
+ */
+ private Long productId;
+
+ /**
+ * 浜у搧瑙勬牸id
+ */
+ private Long productModelId;
+
+ @ApiModelProperty(value = "鍒濆鏈紑绁ㄦ暟")
+ @TableField(exist = false)
+ private BigDecimal originalNoInvoiceNum;
+
+ @ApiModelProperty(value = "涓存椂鏈紑绁ㄦ暟")
+ @TableField(exist = false)
+ private BigDecimal tempNoInvoiceNum;
+
+ @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