From 000205578dc02b9d9ac0e2e5dee740142f4cff80 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 10:36:30 +0800
Subject: [PATCH] fix: 销售发货单打印有多个产品时只展示一个产品名称
---
src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
index 3166ff1..76262fe 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@@ -12,6 +13,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
/**
@@ -20,7 +22,8 @@
*/
@TableName(value ="documentation_borrow_management")
@Data
-@ApiModel(value = "鏂囨。鍊熼槄-褰掕繕琛�")
+@ApiModel(value = "鏂囨。鍊熼槄琛�")
+@EqualsAndHashCode(callSuper = true)
public class DocumentationBorrowManagement extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
@@ -37,10 +40,17 @@
private Long documentationId;
/**
- * 鍊熼槄浜篿d
+ * 鍊熼槄浜�
*/
- @ApiModelProperty(value = "鍊熼槄浜篿d")
- private Long borrowerId;
+ @ApiModelProperty(value = "鍊熼槄浜�")
+ @Excel(name = "鍊熼槄浜�")
+ private String borrower;
+ /**
+ * 褰掕繕浜�
+ */
+ @ApiModelProperty(value = "褰掕繕浜�")
+ @Excel(name = "褰掕繕浜�")
+ private String returner;
/**
* 鍊熼槄鐩殑
@@ -55,25 +65,25 @@
@ApiModelProperty(value = "鍊熼槄鏃ユ湡")
@Excel(name = "鍊熼槄鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDateTime borrowDate;
+ private LocalDate borrowDate;
/**
* 搴斿綊杩樻棩鏈�
*/
@ApiModelProperty(value = "搴斿綊杩樻棩鏈�")
@Excel(name = "搴斿綊杩樻棩鏈�", dateFormat = "yyyy-MM-dd", width = 30)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime dueReturnDate;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate dueReturnDate;
/**
* 瀹為檯褰掕繕鏃ユ湡
*/
@ApiModelProperty(value = "瀹為檯褰掕繕鏃ユ湡")
@Excel(name = "瀹為檯褰掕繕鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime returnDate;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate returnDate;
/**
* 鍊熼槄鐘舵��
--
Gitblit v1.9.3