From 47768d890fbfc1a5f3e93ca26137847361415e9e Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 28 十月 2025 10:54:16 +0800
Subject: [PATCH] Merge branch 'master' into pim_meet

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java |   68 +++++++++++++++++++++++++++++----
 1 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index cfb1789..efa03ec 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -1,13 +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
@@ -55,7 +58,8 @@
      */
     @Excel(name = "鏁伴噺")
     private BigDecimal quantity;
-
+    @Excel(name = "鏈�浣庡簱瀛樻暟閲�")
+    private BigDecimal minStock;
     /**
      * 绋庣巼
      */
@@ -94,7 +98,7 @@
     /**
      * 鏈鏉ョエ鏁�
      */
-    private Long ticketsNum;
+    private BigDecimal ticketsNum;
 
     /**
      * 鏈鏉ョエ閲戦(鍏�)
@@ -102,24 +106,70 @@
     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;
 
     @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
     private BigDecimal noInvoiceAmount;
+
+    @ApiModelProperty(value = "鏈寮�绁ㄦ暟")
+    @TableField(exist = false)
+    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