From 62e7209401eb4732d9f5c64b81036c25b27710b3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 17 七月 2025 14:36:53 +0800
Subject: [PATCH] yys 修改销售管理bug
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 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..1a82359 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
@@ -94,7 +97,7 @@
/**
* 鏈鏉ョエ鏁�
*/
- private Long ticketsNum;
+ private BigDecimal ticketsNum;
/**
* 鏈鏉ョエ閲戦(鍏�)
@@ -102,24 +105,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