From 8e56e74d6bac088d159f667e58c51a6f370feb15 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 22 一月 2026 10:33:56 +0800
Subject: [PATCH] 生产报工增加报废数量

---
 src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index c90bf87..08d65fa 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -1,17 +1,49 @@
 package com.ruoyi.production.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.production.pojo.ProductionProductMain;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 @Data
+@ExcelIgnoreUnannotated
 public class ProductionProductMainDto extends ProductionProductMain {
     @ApiModelProperty(value = "宸ュ崟缂栧彿")
+    @Excel(name = "宸ュ崟缂栧彿")
     private String workOrderNo;
 
     @ApiModelProperty(value = "宸ュ崟鐘舵��")
     private String workOrderStatus;
 
     @ApiModelProperty(value = "鎶ュ伐浜哄憳鏄电О")
+    @Excel(name = "鎶ュ伐浜�")
     private String nickName;
+
+    @ApiModelProperty(value = "鎶ュ伐鏁伴噺")
+    @Excel(name = "鎶ュ伐鏁伴噺")
+    private BigDecimal quantity;
+
+    @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+    @Excel(name = "鎶ュ簾鏁伴噺")
+    private BigDecimal scrapQty;
+
+    //浜у搧鍚嶇О
+    @Excel(name = "浜у搧鍚嶇О")
+    private String productName;
+
+    //浜у搧瑙勬牸鍨嬪彿
+    @Excel(name = "浜у搧瑙勬牸鍨嬪彿")
+    private String productModelName;
+
+    //鍗曚綅
+    @Excel(name = "鍗曚綅")
+    private String unit;
+
+    //閿�鍞悎鍚屽彿
+    @Excel(name = "閿�鍞悎鍚屽彿")
+    private String salesContractNo;
 }

--
Gitblit v1.9.3