From 1cf91e355038837f30f2d727507b2229263d7de7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 17:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 71 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index 02cdab9..e01db26 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -1,13 +1,13 @@
package com.ruoyi.purchase.pojo;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 閲囪喘鍙拌处瀵硅薄 purchase_ledger
@@ -33,10 +33,20 @@
private String purchaseContractNumber;
/**
+ * 渚涘簲鍟嗗悕绉癷d
+ */
+ private Long supplierId;
+
+ /**
* 渚涘簲鍟嗗悕绉�
*/
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
+
+ /**
+ * 褰曞叆浜哄鍚峣d
+ */
+ private Long recorderId;
/**
* 褰曞叆浜哄鍚�
@@ -63,6 +73,14 @@
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date entryDate;
+
+ /**
+ * 绛捐鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "绛捐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date executionDate;
+
/**
* 澶囨敞
*/
@@ -72,7 +90,7 @@
/**
* 闄勪欢鏉愭枡璺緞鎴栧悕绉�
*/
- @Excel(name = "闄勪欢鏉愭枡璺緞鎴栧悕绉�")
+// @Excel(name = "闄勪欢鏉愭枡璺緞鎴栧悕绉�")
private String attachmentMaterials;
/**
@@ -94,4 +112,51 @@
*/
private Long salesLedgerId;
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+
+ /**
+ * 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
+ */
+ private BigDecimal contractAmount;
+//
+// /**
+// * 涓氬姟鍛�
+// */
+// @Excel(name = "涓氬姟鍛�")
+// private String businessPerson;
+//
+// /**
+// * 涓氬姟鍛榠d
+// */
+// private Long businessPersonId;
+
+ /**
+ * 涓氬姟鍛樻墜鏈哄彿
+ */
+ private String phoneNumber;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鏉ョエ閲戦")
+ private String receiptPaymentAmount;
+
+ @ApiModelProperty("鏈潵绁ㄩ噾棰�")
+ @TableField(exist = false)
+ private String unReceiptPaymentAmount;
+
+ @ApiModelProperty("鏂囦欢绫诲瀷 鍙� 4")
+ @TableField(exist = false)
+ private Integer type;
+
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ private String paymentMethod;
+ @ApiModelProperty("瀹℃壒鐘舵�� 1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触,5琛ㄧず鏄ā鏉�")
+ @Excel(name = "瀹℃壒鐘舵��", readConverterExp = "1=寰呭鏍�,2=瀹℃壒涓�,3=瀹℃壒閫氳繃,4=瀹℃壒澶辫触")
+ private Integer approvalStatus;
+
+ @ApiModelProperty(value = "妯℃澘鍚嶇О")
+ private String templateName;
+ @ApiModelProperty(value = "瀹℃壒浜篿d")
+ private String approveUserIds;
+
}
--
Gitblit v1.9.3