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 | 95 +++++++++++++++++++++++++----------------------
1 files changed, 51 insertions(+), 44 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 26ef072..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 io.swagger.annotations.ApiModelProperty;
+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 {
- @ApiModelProperty("涓婚敭ID")
- private Long id;
- @ApiModelProperty("浜у搧缂栧彿")
- private String productNo;
- @ApiModelProperty("鐢ㄦ埛ID")
- private Long userId;
- @ApiModelProperty("鐢ㄦ埛鍚嶇О")
- private String userName;
- @ApiModelProperty("浜у搧宸ヨ壓璺嚎鏄庣粏ID")
- private Long productProcessRouteItemId;
- @ApiModelProperty("宸ュ崟ID")
- private Long workOrderId;
- @ApiModelProperty("鐢熶骇宸ュ簭浠诲姟ID")
- private Long productionOperationTaskId;
- @ApiModelProperty("鐘舵��")
- private Integer status;
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
- private LocalDateTime updateTime;
- @ApiModelProperty("绉熸埛ID")
- private Long tenantId;
- @ApiModelProperty("鍒涘缓浜�")
- private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
- private Integer updateUser;
- @ApiModelProperty("閮ㄩ棬ID")
- private Long deptId;
+@Schema(name = "ProductionProductMainDto", description = "production report query dto")
+public class ProductionProductMainDto extends ProductionProductMain {
- @ApiModelProperty("宸ュ崟缂栧彿")
+ @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;
- @ApiModelProperty("宸ュ崟鐘舵��")
+
+ @Schema(description = "work order status")
private String workOrderStatus;
- @ApiModelProperty("鏄电О")
+
+ @Schema(description = "nick name")
private String nickName;
- @ApiModelProperty("鏁伴噺")
+
+ @Schema(description = "quantity")
private BigDecimal quantity;
- @ApiModelProperty("鎶ュ簾鏁伴噺")
+
+ @Schema(description = "scrap quantity")
private BigDecimal scrapQty;
- @ApiModelProperty("浜у搧鍚嶇О")
+
+ @Schema(description = "product name")
private String productName;
- @ApiModelProperty("浜у搧鍨嬪彿鍚嶇О")
+
+ @Schema(description = "product model name")
private String productModelName;
- @ApiModelProperty("鍗曚綅")
+
+ @Schema(description = "unit")
private String unit;
- @ApiModelProperty("閿�鍞悎鍚岀紪鍙�")
+
+ @Schema(description = "sales contract no")
private String salesContractNo;
- @ApiModelProperty("鎺掍骇鏃ユ湡")
+
+ @Schema(description = "scheduling date")
private LocalDate schedulingDate;
- @ApiModelProperty("鎺掍骇浜哄憳鍚嶇О")
+
+ @Schema(description = "scheduling user name")
private String schedulingUserName;
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+
+ @Schema(description = "customer name")
private String customerName;
- @ApiModelProperty("宸ュ簭")
+
+ @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