From b525e2433bf5a4bb28848d4426c0ca07ec949cc2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 九月 2025 17:28:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 93 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 3d33354..1a82359 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -1,12 +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
@@ -59,7 +63,7 @@
* 绋庣巼
*/
@Excel(name = "绋庣巼")
- private String taxRate;
+ private BigDecimal taxRate;
/**
* 鍚◣鍗曚环
@@ -84,4 +88,87 @@
*/
@Excel(name = "鍙戠エ绫诲瀷")
private String invoiceType;
+
+ /**
+ * 鍙拌处绫诲瀷 1.閿�鍞� 2锛岄噰璐�
+ */
+ private Integer type;
+
+ /**
+ * 鏈鏉ョエ鏁�
+ */
+ private BigDecimal ticketsNum;
+
+ /**
+ * 鏈鏉ョエ閲戦(鍏�)
+ */
+ private BigDecimal ticketsAmount;
+
+ /**
+ * 鏈潵绁ㄦ暟
+ */
+ private BigDecimal futureTickets;
+
+ /**
+ * 鏈潵绁ㄩ噾棰�(鍏�)
+ */
+ private BigDecimal futureTicketsAmount;
+
+ @ApiModelProperty(value = "寮�绁ㄦ暟")
+ private BigDecimal invoiceNum;
+
+ @ApiModelProperty(value = "鏈紑绁ㄦ暟")
+ 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