From 9d42f647f5589e4a560d745d6b359ae6c273bd8d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 13:08:52 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java |   65 ++++++++++++++++++--------------
 1 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
index e5754bf..cbac4b5 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
@@ -1,67 +1,74 @@
 package com.ruoyi.production.bean.dto;
 
+import com.ruoyi.production.pojo.ProductionOrderRoutingOperationParam;
+import com.ruoyi.production.pojo.ProductionProductMain;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.List;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class ProductionProductMainDto {
-    @Schema(description = "涓婚敭ID")
-    private Long id;
-    @Schema(description = "浜у搧缂栧彿")
-    private String productNo;
-    @Schema(description = "鐢ㄦ埛ID")
-    private Long userId;
-    @Schema(description = "鐢ㄦ埛鍚嶇О")
-    private String userName;
-    @Schema(description = "浜у搧宸ヨ壓璺嚎鏄庣粏ID")
+@Schema(name = "ProductionProductMainDto", description = "鐢熶骇鎶ュ伐鏌ヨ鍙傛暟")
+public class ProductionProductMainDto extends ProductionProductMain {
+
+    @Schema(description = "浜у搧宸ヨ壓璺嚎宸ュ簭ID")
     private Long productProcessRouteItemId;
-    @Schema(description = "宸ュ崟ID")
-    private Long workOrderId;
-    @Schema(description = "鐢熶骇宸ュ簭浠诲姟ID")
-    private Long productionOperationTaskId;
-    @Schema(description = "鐘舵��")
-    private Integer status;
-    @Schema(description = "鍒涘缓鏃堕棿")
-    private LocalDateTime createTime;
-    @Schema(description = "鏇存柊鏃堕棿")
-    private LocalDateTime updateTime;
+
+    @Schema(description = "鎶ュ伐ID")
+    private Long productMainId;
+
     @Schema(description = "绉熸埛ID")
     private Long tenantId;
-    @Schema(description = "鍒涘缓浜�")
-    private Integer createUser;
-    @Schema(description = "鏇存柊浜�")
-    private Integer updateUser;
-    @Schema(description = "閮ㄩ棬ID")
-    private Long deptId;
 
     @Schema(description = "宸ュ崟缂栧彿")
     private String workOrderNo;
+
     @Schema(description = "宸ュ崟鐘舵��")
     private String workOrderStatus;
+
     @Schema(description = "鏄电О")
     private String nickName;
+
     @Schema(description = "鏁伴噺")
     private BigDecimal quantity;
+
     @Schema(description = "鎶ュ簾鏁伴噺")
     private BigDecimal scrapQty;
+
     @Schema(description = "浜у搧鍚嶇О")
     private String productName;
-    @Schema(description = "浜у搧鍨嬪彿鍚嶇О")
+
+    @Schema(description = "浜у搧瑙勬牸鍨嬪彿")
     private String productModelName;
+
     @Schema(description = "鍗曚綅")
     private String unit;
-    @Schema(description = "閿�鍞悎鍚岀紪鍙�")
+
+    @Schema(description = "閿�鍞悎鍚屽彿")
     private String salesContractNo;
+
     @Schema(description = "鎺掍骇鏃ユ湡")
     private LocalDate schedulingDate;
+
     @Schema(description = "鎺掍骇浜哄憳鍚嶇О")
     private String schedulingUserName;
+
     @Schema(description = "瀹㈡埛鍚嶇О")
     private String customerName;
+
     @Schema(description = "宸ュ簭")
     private String process;
+
+    @Schema(description = "宸ヨ祫瀹氶")
+    private BigDecimal workHours;
+
+    @Schema(description = "宸ヨ祫")
+    private BigDecimal wages;
+
+    @Schema(description = "宸ュ簭鍙傛暟鍒楄〃")
+    private List<ProductionOrderRoutingOperationParam> productionOperationParamList;
 }

--
Gitblit v1.9.3