From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +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..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,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 = "production report query dto")
+public class ProductionProductMainDto extends ProductionProductMain {
+ @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 = "work order status")
private String workOrderStatus;
+
+ @Schema(description = "nick name")
private String nickName;
+
+ @Schema(description = "quantity")
private BigDecimal quantity;
+
+ @Schema(description = "scrap quantity")
private BigDecimal scrapQty;
+
+ @Schema(description = "product name")
private String productName;
+
+ @Schema(description = "product model name")
private String productModelName;
+
+ @Schema(description = "unit")
private String unit;
+
+ @Schema(description = "sales contract no")
private String salesContractNo;
+
+ @Schema(description = "scheduling date")
private LocalDate schedulingDate;
+
+ @Schema(description = "scheduling user name")
private String schedulingUserName;
+
+ @Schema(description = "customer name")
private String customerName;
+
+ @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