From bc0193e94c96c7ea60be17d250e00408dc787a87 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 18 十一月 2025 17:44:07 +0800
Subject: [PATCH] yys 1.销售、采购关于发票的改成不必填 2.回款类型字典改-下 3.销售台账、采购台账可能不开票直接回款 4.销售台账要直接查产品名字 5.指标维护-内控值为非必填 6.所有税率都自己填，有时候可能不含税
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index def5e39..3bc98c7 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,6 +1,7 @@
package com.ruoyi.sales.pojo;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
@@ -8,6 +9,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 閿�鍞彴璐﹀璞� sales_ledger
@@ -33,6 +35,11 @@
private String salesContractNo;
/**
+ * 鏄惁寮�绁� 1-鏄� 2-鍚�
+ */
+ private Integer isInvoice;
+
+ /**
* 瀹㈡埛鍚堝悓鍙�
*/
@Excel(name = "瀹㈡埛鍚堝悓鍙�")
@@ -49,6 +56,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDate;
/**
@@ -71,8 +79,12 @@
/**
* 褰曞叆浜�
*/
- @Excel(name = "褰曞叆浜�")
private String entryPerson;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "褰曞叆浜�")
+ @Excel(name = "褰曞叆浜�")
+ private String entryPersonName;
/**
* 澶囨敞
@@ -97,6 +109,26 @@
@TableField(exist = false)
@ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
- private BigDecimal noInvoiceAmountTotal;
+ @Excel(name = "鏈紑绁ㄩ噾棰�")
+ private BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "绛捐鏃ユ湡")
+ private LocalDate executionDate;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸插紑绁ㄩ噾棰�(鍏�)")
+ @Excel(name = "宸插紑绁ㄩ噾棰�")
+ private BigDecimal invoiceTotal = BigDecimal.ZERO;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍥炴閲戦")
+ private BigDecimal receiptPaymentAmountTotal = BigDecimal.ZERO;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
+ private BigDecimal noReceiptAmount = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ private String paymentMethod;
}
--
Gitblit v1.9.3