From fcb6d237cb04eb64035cda4cd4e3ae1ecfec3d8e Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 15 Nov 2024 10:15:57 +0800
Subject: [PATCH] 1

---
 .../MES/product/Dto/ProReportworkDto.cs       | 33 ++++++++-----------
 .../MES/product/ProReportworkService.cs       |  3 ++
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/DOAN.Model/MES/product/Dto/ProReportworkDto.cs b/DOAN.Model/MES/product/Dto/ProReportworkDto.cs
index f3f1372..54ba7dd 100644
--- a/DOAN.Model/MES/product/Dto/ProReportworkDto.cs
+++ b/DOAN.Model/MES/product/Dto/ProReportworkDto.cs
@@ -26,8 +26,6 @@ namespace DOAN.Model.MES.product.Dto
     /// </summary>
     public class ProReportworkDto
     {
-
-       
         public string Id { get; set; }
 
         public string FkWorkorder { get; set; }
@@ -64,15 +62,24 @@ namespace DOAN.Model.MES.product.Dto
 
         public DateTime? UpdatedTime { get; set; }
 
+        /// <summary>
+        /// 优先级 1-100 
+        /// </summary>
+        public int? Priority { get; set; }
 
+        /// <summary>
+        /// 工单状态 
+        /// </summary>
+        public int? Status { get; set; }
 
+        /// <summary>
+        /// 节拍 （秒）
+        /// </summary>
+        public int?  Beat  { get; set; }
     }
 
     public class ProReportworkDto2
     {
-
-      
-
         public string FkWorkorder { get; set; }
 
         public int? DispatchNum { get; set; }
@@ -87,33 +94,19 @@ namespace DOAN.Model.MES.product.Dto
 
 
         //public string CreatedBy { get; set; }
-
-
-
-
     }
 
 
     public class ProReportworkDto3
     {
-
         public string FkWorkorder { get; set; }
 
-   
 
         public int? FinishedNum { get; set; }
 
         public string GroupCode { get; set; }
-       
+
 
         public string LineCode { get; set; }
-
-       
-
-       
-
-
-
-
     }
 }
\ No newline at end of file
diff --git a/DOAN.Service/MES/product/ProReportworkService.cs b/DOAN.Service/MES/product/ProReportworkService.cs
index 67ff8db..ab3ccef 100644
--- a/DOAN.Service/MES/product/ProReportworkService.cs
+++ b/DOAN.Service/MES/product/ProReportworkService.cs
@@ -60,6 +60,9 @@ namespace DOAN.Service.MES.product
                      GroupCode = w.GroupCode,
                      LineCode = w.LineCode,
                      DispatchNum=w.DeliveryNum,
+                     Priority = w.Priority,
+                     Status = w.Status,
+                     Beat = w.Beat
                     
                  }, true).ToPage_NO_Convert<ProReportworkDto>(parm);