From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +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 | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 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..26ef072 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.bean.dto;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -8,32 +9,59 @@
@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;
+ @ApiModelProperty("宸ュ崟缂栧彿")
private String workOrderNo;
+ @ApiModelProperty("宸ュ崟鐘舵��")
private String workOrderStatus;
+ @ApiModelProperty("鏄电О")
private String nickName;
+ @ApiModelProperty("鏁伴噺")
private BigDecimal quantity;
+ @ApiModelProperty("鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
+ @ApiModelProperty("浜у搧鍚嶇О")
private String productName;
+ @ApiModelProperty("浜у搧鍨嬪彿鍚嶇О")
private String productModelName;
+ @ApiModelProperty("鍗曚綅")
private String unit;
+ @ApiModelProperty("閿�鍞悎鍚岀紪鍙�")
private String salesContractNo;
+ @ApiModelProperty("鎺掍骇鏃ユ湡")
private LocalDate schedulingDate;
+ @ApiModelProperty("鎺掍骇浜哄憳鍚嶇О")
private String schedulingUserName;
+ @ApiModelProperty("瀹㈡埛鍚嶇О")
private String customerName;
+ @ApiModelProperty("宸ュ簭")
private String process;
}
--
Gitblit v1.9.3