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/production/dto/SalesLedgerProductionAccountingDto.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
index c86d7bb..34ed7b1 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
@@ -1,12 +1,16 @@
package com.ruoyi.production.dto;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDate;
/**
* @author :yys
@@ -15,6 +19,7 @@
@Data
@ApiModel
@ExcelIgnoreUnannotated
+@EqualsAndHashCode(callSuper = true)
public class SalesLedgerProductionAccountingDto extends SalesLedgerProductDto{
/**
@@ -63,17 +68,27 @@
*/
@ApiModelProperty(value = "鎺掍骇鏃ユ湡")
@Excel(name = "鐢熶骇鏃ユ湡")
- private String schedulingDate;
+ private LocalDate schedulingDate;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- private String entryDateStart;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate entryDateStart;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- private String entryDateEnd;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate entryDateEnd;
private BigDecimal outputNum;
- private BigDecimal outputRate;
+ private String outputRate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate entryDate;
+
+ private String dateType;
}
--
Gitblit v1.9.3