From 868e1e1f5d568e1bb8b50df758ca3d157a680678 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 20 三月 2026 13:05:32 +0800
Subject: [PATCH] 根据生产订单查询工单信息,根据工单查询报工数据

---
 src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 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..7a10f4a 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,11 @@
     @ApiModelProperty(value = "宸ュ簭")
     private String processName;
 
+    private Long processId;
+
+    @ApiModelProperty(value = "宸ュ簭缂栧彿")
+    private String processNo;
+
     //鍗曚綅
     @ApiModelProperty(value = "鍗曚綅")
     private String unit;
@@ -35,4 +39,26 @@
 
     @ApiModelProperty(value = "瀹屾垚杩涘害")
     private BigDecimal completionStatus;
+
+    @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+    private BigDecimal scrapQty;
+
+    @ApiModelProperty(value = "宸ュ崟绫诲瀷 姝e父 /杩斿伐杩斾慨")
+    private String workOrderType;
+
+    @ApiModelProperty(value = "宸ュ簭鎺掑簭")
+    private Integer dragSort;
+
+    @ApiModelProperty(value = "宸ヨ壓璺嚎ID")
+    private Long productRouteId;
+
+    @ApiModelProperty(value = "鏄惁鍙互鎶ュ伐")
+    private Boolean isCanReport;
+
+    // 鍚堟牸鏁伴噺
+    @ApiModelProperty(value = "鍚堟牸鏁伴噺")
+    private BigDecimal completeQty;
+
+    @ApiModelProperty(value = "涓嶈壇鐜�")
+    private BigDecimal scrapRate;
 }

--
Gitblit v1.9.3