From 4fcf61c9d1e0de1d09e11a290a5e73275619f028 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 30 一月 2026 14:39:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 08d65fa..5ef224b 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -1,12 +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 com.ruoyi.production.pojo.ProductionProductMain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@@ -29,7 +32,7 @@
@ApiModelProperty(value = "鎶ュ簾鏁伴噺")
@Excel(name = "鎶ュ簾鏁伴噺")
- private BigDecimal scrapQty;
+ private BigDecimal scrapQty = BigDecimal.ZERO;
//浜у搧鍚嶇О
@Excel(name = "浜у搧鍚嶇О")
@@ -46,4 +49,15 @@
//閿�鍞悎鍚屽彿
@Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate schedulingDate;
+ private String schedulingUserName;
+ private String customerName;
+ private String process;
+ private BigDecimal workHours;
+ private BigDecimal wages;
+
+
}
--
Gitblit v1.9.3