From 17a63200983a8e154a1eb3549d1caffa050372c1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 30 三月 2026 17:14:45 +0800
Subject: [PATCH] feat:1.生产订单领用 2.报工领用（关联订单领用） 3.报工删除（关联报工领用） 4.不合格处理（返工生成返工附件并下载）
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index f34124b..3b292a0 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -1,14 +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 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;
+import java.util.List;
@Data
@ExcelIgnoreUnannotated
@@ -30,7 +32,7 @@
@ApiModelProperty(value = "鎶ュ簾鏁伴噺")
@Excel(name = "鎶ュ簾鏁伴噺")
- private BigDecimal scrapQty;
+ private BigDecimal scrapQty = BigDecimal.ZERO;
//浜у搧鍚嶇О
@Excel(name = "浜у搧鍚嶇О")
@@ -40,6 +42,9 @@
@Excel(name = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
+ @Excel(name = "UID鐮�")
+ private String uidNo;
+
//鍗曚綅
@Excel(name = "鍗曚綅")
private String unit;
@@ -48,10 +53,27 @@
@Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
- private LocalDate scheduleDate;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate schedulingDate;
private String schedulingUserName;
private String customerName;
+ //宸ュ簭
+ @Excel(name = "宸ュ簭")
private String process;
private BigDecimal workHours;
private BigDecimal wages;
+
+ @ApiModelProperty(value = "鎶曞叆鎬婚噺(kg)")
+ private BigDecimal totalInvestment;
+
+ private BigDecimal inspectedQuantity;
+
+ // 鍏朵粬鏁版嵁
+ private String otherData;
+ // 宸ュ簭id
+ private Long processId;
+
+ //鍘熸枡
+ private List<DrawMaterialDto> drawMaterialList;
}
--
Gitblit v1.9.3