From 5ddc232b8dffcb3402711874491df35fb1997d1d Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 09 五月 2026 16:08:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java | 67 +++++++++++++++++++++++++--------
1 files changed, 51 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..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,39 +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 {
- 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 = "绉熸埛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 List<ProductionOrderRoutingOperationParam> productionOperationParamList;
}
--
Gitblit v1.9.3