From 60b34f0c724917482a0308dd23c68cd38d3e82ce Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期四, 15 五月 2025 16:48:42 +0800 Subject: [PATCH] 供应商id --- src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java b/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java index 5097798..bcc868d 100644 --- a/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java +++ b/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java @@ -1,12 +1,13 @@ package com.ruoyi.purchase.pojo; -import java.math.BigDecimal; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.Date; /** * 鍙戠エ淇℃伅瀵硅薄 invoice_purchase @@ -26,10 +27,20 @@ private Long id; /** + * 閲囪喘鍙拌处id + */ + private Long purchaseLedgerId; + + /** * 閲囪喘鍚堝悓鍙� */ @Excel(name = "閲囪喘鍚堝悓鍙�") private String purchaseContractNo; + + /** + * 鍏宠仈閿�鍞彴璐︿富琛ㄤ富閿� + */ + private Long salesLedgerId; /** * 閿�鍞悎鍚屽彿 @@ -52,32 +63,36 @@ /** * 鍙戠エ閲戦锛堝厓锛� */ - @Excel(name = "鍙戠エ閲戦", readConverterExp = "鍏�=") + @Excel(name = "鍙戠エ閲戦(鍏�)") private BigDecimal invoiceAmount; /** * 绋庣巼 */ - @Excel(name = "绋庣巼") + @Excel(name = "绋庣巼(%)") private BigDecimal taxRate; + + /** + * 寮�绁ㄤ汉ID + */ + private Long issUerId; /** * 寮�绁ㄤ汉 */ @Excel(name = "寮�绁ㄤ汉") - private String issuer; + private String issUer; /** * 寮�绁ㄦ棩鏈� */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8") @Excel(name = "寮�绁ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd") - private Date issueDate; + private LocalDate issueDate; /** * 鍙戠エ鏂囦欢锛圥DF鏍煎紡锛� */ - @Excel(name = "鍙戠エ鏂囦欢", readConverterExp = "P=DF鏍煎紡") private String invoiceFile; /** -- Gitblit v1.9.3