From 455b965c6435b5359bb5c25f2b6810dbc06f5481 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 13 二月 2026 17:56:39 +0800
Subject: [PATCH] Merge branch 'dev_New_kthg' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_kthg
---
src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
index d590eaf..2f43344 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
@@ -1,10 +1,15 @@
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 org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDate;
/**
* @author :yys
@@ -12,6 +17,7 @@
*/
@Data
@ApiModel
+@ExcelIgnoreUnannotated
public class SalesLedgerProductionAccountingDto extends SalesLedgerProductDto{
/**
@@ -24,6 +30,7 @@
* 鎺掍骇浜哄悕绉�
*/
@ApiModelProperty(value = "鐢熶骇浜哄悕绉�")
+ @Excel(name = "鐢熶骇浜�")
private String schedulingUserName;
@@ -37,6 +44,7 @@
* 鐢熶骇鏁伴噺
*/
@ApiModelProperty(value = "鐢熶骇鏁伴噺")
+ @Excel(name = "鐢熶骇鏁伴噺")
private BigDecimal finishedNum;
/**
@@ -49,16 +57,34 @@
* 宸ュ簭
*/
@ApiModelProperty(value = "宸ュ簭")
+ @Excel(name = "宸ュ簭")
private String process;
/**
* 鎺掍骇鏃ユ湡
*/
@ApiModelProperty(value = "鎺掍骇鏃ユ湡")
- private String schedulingDate;
+ @Excel(name = "鐢熶骇鏃ユ湡")
+ private LocalDate schedulingDate;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- private String schedulingDateStart;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate entryDateStart;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- private String schedulingDateEnd;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate entryDateEnd;
+
+
+ private BigDecimal outputNum;
+
+ private String outputRate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate entryDate;
+
+ private String dateType;
+
}
--
Gitblit v1.9.3