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/sales/pojo/ReceiptPayment.java | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
index 6f9a67a..d53ae6a 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
@@ -12,6 +12,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
@Data
public class ReceiptPayment {
@@ -21,24 +22,6 @@
*/
@TableId(type = IdType.AUTO)
private Integer id;
-
- @ApiModelProperty(value = "閿�鍞彴璐ales_ledger")
- private Integer salesLedgerId;
-
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
- private String salesContractNo;
-
- @ApiModelProperty(value = "瀹㈡埛鍚嶇ОID")
- private Integer customerId;
-
- @ApiModelProperty(value = "鍙戠エ鍙�")
- private String invoiceNo;
-
- @ApiModelProperty(value = "鍙戠エ閲戦")
- private BigDecimal invoiceAmount;
-
- @ApiModelProperty(value = "绋庣巼")
- private BigDecimal taxRate;
@ApiModelProperty(value = "鍥炴褰㈠紡 0鐢垫眹1鎵垮厬")
private String receiptPaymentType;
@@ -52,6 +35,12 @@
@ApiModelProperty(value = "invoice_ledger寮�绁ㄥ彴璐︿富閿甀D")
private Integer invoiceLedgerId;
+ @ApiModelProperty(value = "sales_ledger閿�鍞彴璐︿富閿甀D")
+ private Long salesLedgerId;
+
+ @ApiModelProperty(value = "sales_ledger_product閿�鍞彴璐︿骇鍝佷富閿甀D")
+ private Long salesLedgerProductId;
+
@ApiModelProperty(value = "鏉ユ鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -59,6 +48,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
@ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
@@ -75,6 +65,6 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
--
Gitblit v1.9.3