From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

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

diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 545be5d..7481074 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -1,34 +1,100 @@
 package com.ruoyi.production.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.enums.AuditEnum;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.production.pojo.ProductionProductMain;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @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 = "鏄惁鎶ュ伐")
-    private boolean reportWork;
+    @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+    @Excel(name = "鎶ュ簾鏁伴噺")
+    private BigDecimal scrapQty = BigDecimal.ZERO;
 
-    @ApiModelProperty(value = "鎶ュ伐id")
-    private Long productMainId;
-    @ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
-    private LocalDateTime actualStartTime;
+    /**
+     * 琛ヤ骇鏁伴噺
+     */
+    @Excel(name = "琛ヤ骇鏁伴噺")
+    private BigDecimal replenishQty;
 
-    @ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
-    private LocalDateTime actualEndTime;
+    /**
+     * 鍔犳斁鏁�
+     */
+    @Excel(name = "鍔犳斁鏁�")
+    private BigDecimal addQty;
+
+    //浜у搧鍚嶇О
+    @Excel(name = "浜у搧鍚嶇О")
+    private String productName;
+
+    //浜у搧瑙勬牸鍨嬪彿
+    @Excel(name = "浜у搧瑙勬牸鍨嬪彿")
+    private String productModelName;
+
+    //鍗曚綅
+    @Excel(name = "鍗曚綅")
+    private String unit;
+
+    //閿�鍞悎鍚屽彿
+    @Excel(name = "閿�鍞悎鍚屽彿")
+    private String salesContractNo;
+
+    @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;
+
+    private Long auditUserId;
+    private String auditUserName;
+
+    private Long deviceId;
+    private String deviceName;
+    private String workMinutes;
+
+    private List<Team> teamList;
+
+
+
+
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Team {
+        private Long userId;
+        private String userName;
+    }
 }

--
Gitblit v1.9.3