From f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 9dfb35b..3817082 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -1,22 +1,39 @@
package com.ruoyi.production.dto;
-import com.ruoyi.production.pojo.ProductionProductMain;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
@Data
-public class ProductionProductMainDto extends ProductionProductMain {
- @ApiModelProperty(value = "宸ュ崟缂栧彿")
+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;
+
private String workOrderNo;
-
- @ApiModelProperty(value = "宸ュ崟鐘舵��")
private String workOrderStatus;
-
- @ApiModelProperty(value = "鎶ュ伐浜哄憳鏄电О")
private String nickName;
-
- @ApiModelProperty(value = "鎶ュ伐鏁伴噺")
private BigDecimal quantity;
+ private BigDecimal scrapQty;
+ private String productName;
+ private String productModelName;
+ private String unit;
+ private String salesContractNo;
+ private LocalDate schedulingDate;
+ private String schedulingUserName;
+ private String customerName;
+ private String process;
}
--
Gitblit v1.9.3