From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro

---
 src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java |   93 +++++++++++++++++++++++++---------------------
 1 files changed, 50 insertions(+), 43 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..9fc8d86 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")
-    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 tenantId;
-    @Schema(description = "鍒涘缓浜�")
-    private Integer createUser;
-    @Schema(description = "鏇存柊浜�")
-    private Integer updateUser;
-    @Schema(description = "閮ㄩ棬ID")
-    private Long deptId;
+@Schema(name = "ProductionProductMainDto", description = "production report query dto")
+public class ProductionProductMainDto extends ProductionProductMain {
 
-    @Schema(description = "宸ュ崟缂栧彿")
+    @Schema(description = "product process route item id")
+    private Long productProcessRouteItemId;
+
+    @Schema(description = "production report id")
+    private Long productMainId;
+
+    @Schema(description = "tenant id")
+    private Long tenantId;
+
+    @Schema(description = "work order no")
     private String workOrderNo;
-    @Schema(description = "宸ュ崟鐘舵��")
+
+    @Schema(description = "work order status")
     private String workOrderStatus;
-    @Schema(description = "鏄电О")
+
+    @Schema(description = "nick name")
     private String nickName;
-    @Schema(description = "鏁伴噺")
+
+    @Schema(description = "quantity")
     private BigDecimal quantity;
-    @Schema(description = "鎶ュ簾鏁伴噺")
+
+    @Schema(description = "scrap quantity")
     private BigDecimal scrapQty;
-    @Schema(description = "浜у搧鍚嶇О")
+
+    @Schema(description = "product name")
     private String productName;
-    @Schema(description = "浜у搧鍨嬪彿鍚嶇О")
+
+    @Schema(description = "product model name")
     private String productModelName;
-    @Schema(description = "鍗曚綅")
+
+    @Schema(description = "unit")
     private String unit;
-    @Schema(description = "閿�鍞悎鍚岀紪鍙�")
+
+    @Schema(description = "sales contract no")
     private String salesContractNo;
-    @Schema(description = "鎺掍骇鏃ユ湡")
+
+    @Schema(description = "scheduling date")
     private LocalDate schedulingDate;
-    @Schema(description = "鎺掍骇浜哄憳鍚嶇О")
+
+    @Schema(description = "scheduling user name")
     private String schedulingUserName;
-    @Schema(description = "瀹㈡埛鍚嶇О")
+
+    @Schema(description = "customer name")
     private String customerName;
-    @Schema(description = "宸ュ簭")
+
+    @Schema(description = "process")
     private String process;
+
+    @Schema(description = "salary quota")
+    private BigDecimal workHours;
+
+    @Schema(description = "wages")
+    private BigDecimal wages;
+
+    @Schema(description = "operation param list")
+    private List<ProductionOrderRoutingOperationParam> productionOperationParamList;
 }

--
Gitblit v1.9.3