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/ProductionProductMainDto.java | 20 +++++++++++++++++++-
1 files changed, 19 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 843e4a6..76723de 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -1,13 +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.LocalDateTime;
+import java.time.LocalDate;
@Data
@ExcelIgnoreUnannotated
@@ -27,6 +29,10 @@
@Excel(name = "鎶ュ伐鏁伴噺")
private BigDecimal quantity;
+ @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+ @Excel(name = "鎶ュ簾鏁伴噺")
+ private BigDecimal scrapQty = BigDecimal.ZERO;
+
//浜у搧鍚嶇О
@Excel(name = "浜у搧鍚嶇О")
private String productName;
@@ -42,4 +48,16 @@
//閿�鍞悎鍚屽彿
@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;
+
+ private String startTime;
+ private String endTime;
}
--
Gitblit v1.9.3