From 47c5bd416bf37769022e41402add8a41c2d09c96 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 23 三月 2026 09:47:53 +0800
Subject: [PATCH] 1、生产工单搜索加上生产订单号搜索。 2、列表顺序除了按照优先级进行排序，还要根据工艺路线的工序的顺序进行排序，开始的排在前面
---
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 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..d9b7ec0 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,29 @@
@ApiModelProperty(value = "瀹屾垚杩涘害")
private BigDecimal completionStatus;
+
+ @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+ private BigDecimal scrapQty;
+
+ @ApiModelProperty(value = "宸ュ崟绫诲瀷 姝ｅ父 /杩斿伐杩斾慨")
+ 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;
+
+ @ApiModelProperty(value = "鐘舵�佹枃鏈�")
+ private String statusText;
}
--
Gitblit v1.9.3