From 06df28e9434e6b6287aa7aacf42a8a2e00f31454 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 21 五月 2026 09:28:20 +0800
Subject: [PATCH] null 调整

---
 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 = "宸ュ崟绫诲瀷 姝e父 /杩斿伐杩斾慨")
+    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