From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index f4ebe75..a528151 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -1,6 +1,5 @@
package com.ruoyi.production.dto;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductWorkOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,6 +23,9 @@
@ApiModelProperty(value = "宸ュ簭")
private String processName;
+ @ApiModelProperty(value = "宸ュ簭id")
+ private Long processId;
+
//鍗曚綅
@ApiModelProperty(value = "鍗曚綅")
private String unit;
@@ -35,4 +37,22 @@
@ApiModelProperty(value = "瀹屾垚杩涘害")
private BigDecimal completionStatus;
+
+ @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+ private BigDecimal scrapQty;
+
+ @ApiModelProperty(value = "宸ュ崟绫诲瀷 姝ｅ父 /杩斿伐杩斾慨")
+ private String workOrderType;
+
+ private String deviceName;
+
+ private Long deviceId;
+
+ @ApiModelProperty(value = "宸ュ崟澶勭悊鐢ㄦ埛ids")
+ private String processUserIds;
+
+ @ApiModelProperty(value = "鏄惁鍙互鎶ュ伐")
+ private Boolean hasUnreportedMachine;
+
+ private String finalProductModel;
}
--
Gitblit v1.9.3