From 41ab7abd0b0ec0fefb03b60bbaf42c02fbda666b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 15:53:16 +0800
Subject: [PATCH] feat(production): 添加生产订单与销售台账关联功能
---
src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
index 403c424..a84cf04 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
@@ -1,7 +1,9 @@
package com.ruoyi.purchase.pojo;
+import io.swagger.v3.oas.annotations.media.Schema;
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;
@@ -36,6 +38,11 @@
private Long purchaseLedgerId;
/**
+ * 閲囪喘璁㈠崟浜у搧id
+ */
+ private Long salesLedgerProductId;
+
+ /**
* 渚涘簲鍟唅d
*/
private Long supplierId;
@@ -43,17 +50,24 @@
/**
* 鍙戠エid
*/
- private Long invoicePurchaseId;
+ private Long ticketRegistrationId;
/**
* 鏈浠樻閲戦
*/
+ @Excel(name = "浠樻閲戦")
private BigDecimal currentPaymentAmount;
/**
* 浠樻褰㈠紡
*/
+ @Excel(name = "浠樻褰㈠紡")
private String paymentMethod;
+
+ /**
+ * 绋庣巼
+ */
+ private String taxRate;
/**
* 鐧昏浜�
@@ -61,13 +75,22 @@
private Long registrantId;
// 绉熸埛id
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
* 浠樻鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "浠樻鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date paymentDate;
+
+ /**
+ * 鐧昏鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date registrationtDate;
/**
* 鍒涘缓鏃ユ湡
@@ -80,4 +103,11 @@
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3