From 7b2233d1dab53574facc66b3bebffcd8ca5919de Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 21 三月 2026 14:27:19 +0800
Subject: [PATCH] yys 1.已退货完毕的出库单号不要展示在关联出库单中 2.退货管理唯一处理 3.生产订单-库存数量回显 4.发货管理回显退货数量 5.发货增加详情接口 6.生产核算清理脏数据 7.生产报工-删除生产报工记录报错 8.筛选客户名称数据展示有误
---
src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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..803d600 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
@@ -2,6 +2,7 @@
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 +37,11 @@
private Long purchaseLedgerId;
/**
+ * 閲囪喘璁㈠崟浜у搧id
+ */
+ private Long salesLedgerProductId;
+
+ /**
* 渚涘簲鍟唅d
*/
private Long supplierId;
@@ -43,17 +49,24 @@
/**
* 鍙戠エid
*/
- private Long invoicePurchaseId;
+ private Long ticketRegistrationId;
/**
* 鏈浠樻閲戦
*/
+ @Excel(name = "浠樻閲戦")
private BigDecimal currentPaymentAmount;
/**
* 浠樻褰㈠紡
*/
+ @Excel(name = "浠樻褰㈠紡")
private String paymentMethod;
+
+ /**
+ * 绋庣巼
+ */
+ private String taxRate;
/**
* 鐧昏浜�
@@ -61,15 +74,24 @@
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;
+
+ /**
* 鍒涘缓鏃ユ湡
*/
@TableField(fill = FieldFill.INSERT)
--
Gitblit v1.9.3