From 844cae1a3be7bd2fbf8803a7ee33b0622208de05 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 29 四月 2026 09:43:43 +0800
Subject: [PATCH] fix(production): 修复生产报表数据查询问题
---
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 6e2ca95..1355a8b 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -1,14 +1,11 @@
package com.ruoyi.production.dto;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductWorkOrder;
-import com.ruoyi.production.pojo.ProductWorkOrderFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
-import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
@@ -25,6 +22,9 @@
//宸ュ簭
@ApiModelProperty(value = "宸ュ簭")
private String processName;
+
+ @ApiModelProperty(value = "宸ュ簭id")
+ private Long processId;
//鍗曚綅
@ApiModelProperty(value = "鍗曚綅")
@@ -43,4 +43,11 @@
@ApiModelProperty(value = "宸ュ崟绫诲瀷 姝e父 /杩斿伐杩斾慨")
private String workOrderType;
+
+ private String deviceName;
+
+ private Long deviceId;
+
+ @ApiModelProperty(value = "宸ュ崟澶勭悊鐢ㄦ埛ids")
+ private String processUserIds;
}
--
Gitblit v1.9.3