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/device/dto/DeviceRepairDto.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 8df1411..92cfe8c 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -16,7 +16,7 @@
     private Long id;
 
     @ApiModelProperty("璁惧鍙拌处id")
-    private String deviceLedgerId;
+    private Long deviceLedgerId;
 
     @ApiModelProperty("璁惧鍚嶇О")
     private String deviceName;
@@ -26,6 +26,8 @@
 
     @ApiModelProperty("鎶ヤ慨鏃堕棿")
     private Date repairTime;
+    
+    private String repairTimeStr;
 
     @ApiModelProperty("鎶ヤ慨浜�")
     private String repairName;
@@ -39,6 +41,8 @@
     @ApiModelProperty("缁翠慨鏃堕棿")
     private Date maintenanceTime;
 
+    private String maintenanceTimeStr;
+
     @ApiModelProperty("缁翠慨缁撴灉")
     private String maintenanceResult;
 

--
Gitblit v1.9.3