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
///
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; }
+ ///
+ /// 优先级 1-100
+ ///
+ public int? Priority { get; set; }
+ ///
+ /// 工单状态
+ ///
+ public int? Status { get; set; }
+ ///
+ /// 节拍 (秒)
+ ///
+ 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(parm);