From 422a5676c2d96dd37c1be62935a314d70fef79b5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 15 七月 2026 15:28:04 +0800
Subject: [PATCH] 修改不合格管理

---
 src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java |   97 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 81 insertions(+), 16 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 1712d72..848e69e 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
@@ -1,39 +1,104 @@
 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 {
-    private Long id;
-    private String productNo;
-    private Long userId;
-    private String userName;
-    private Long productProcessRouteItemId;
-    private Long workOrderId;
-    private Long productionOperationTaskId;
-    private Integer status;
-    private LocalDateTime createTime;
-    private LocalDateTime updateTime;
-    private Long tenantId;
-    private Integer createUser;
-    private Integer updateUser;
-    private Long deptId;
+@Schema(name = "ProductionProductMainDto", description = "鐢熶骇鎶ュ伐鏌ヨ鍙傛暟")
+public class ProductionProductMainDto extends ProductionProductMain {
 
+    @Schema(description = "浜у搧宸ヨ壓璺嚎宸ュ簭ID")
+    private Long productProcessRouteItemId;
+
+    @Schema(description = "鎶ュ伐ID")
+    private Long productMainId;
+
+    @Schema(description = "鎶ュ伐鍗曞彿")
+    private String reportNo;
+
+    @Schema(description = "鎶ュ伐缁撴灉绫诲瀷锛�0鍚堟牸锛�1杞诲井杩斿伐锛�2涓ラ噸杩斿伐锛�3鎶ュ簾")
+    private Integer reportType;
+
+    @Schema(description = "鎶ュ伐缁撴灉绫诲瀷鍚嶇О")
+    private String reportTypeName;
+
+    @Schema(description = "瀹℃牳鐘舵�侊細0寰呭鏍革紝1瀹℃牳閫氳繃锛�2瀹℃牳涓嶉�氳繃")
+    private Integer auditStatus;
+
+    @Schema(description = "瀹℃牳鐘舵�佸悕绉�")
+    private String auditStatusName;
+
+    @Schema(description = "瀹℃牳鎰忚")
+    private String auditRemark;
+
+    @Schema(description = "绉熸埛ID")
+    private Long tenantId;
+
+    @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 = "浜у搧瑙勬牸鍨嬪彿")
     private String productModelName;
+
+    @Schema(description = "鍗曚綅")
     private String unit;
+
+    @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 BigDecimal originalWages;
+
+    @Schema(description = "琛ヤ慨鐞嗗伐鏃�")
+    private BigDecimal repairWorkHour;
+
+    @Schema(description = "宸ヨ祫淇閲戦")
+    private BigDecimal adjustAmount;
+
+    @Schema(description = "宸ヨ祫淇璇存槑")
+    private String adjustRemark;
+
+    @Schema(description = "宸ュ簭鍙傛暟鍒楄〃")
+    private List<ProductionOrderRoutingOperationParam> productionOperationParamList;
 }

--
Gitblit v1.9.3