diff --git a/DOAN.Model/MES/process/ProcessmodelWorkStep.cs b/DOAN.Model/MES/process/ProcessmodelWorkStep.cs index 919fd6e..0b78d5a 100644 --- a/DOAN.Model/MES/process/ProcessmodelWorkStep.cs +++ b/DOAN.Model/MES/process/ProcessmodelWorkStep.cs @@ -86,5 +86,15 @@ namespace DOAN.Model.Business public string DeviceName { get; set; } + public string Workshop { get; set; } + + public string Workline { get; set; } + + public int? Status { get; set; } + + public string DeviceSpecification { get; set; } + + public string ResponsiblePerson { get; set; } + } } \ No newline at end of file diff --git a/DOAN.Service/MES/process/ProcessmodelWorkStepService.cs b/DOAN.Service/MES/process/ProcessmodelWorkStepService.cs index 980cd71..bcc389e 100644 --- a/DOAN.Service/MES/process/ProcessmodelWorkStepService.cs +++ b/DOAN.Service/MES/process/ProcessmodelWorkStepService.cs @@ -120,7 +120,12 @@ namespace DOAN.Service.Business { Id = uniqueValue.Id, DeviceCode = uniqueValue.UniqueValue, - DeviceName = dictionary.DeviceName + DeviceName = dictionary.DeviceName, + Workshop = dictionary.Workshop, + Workline = dictionary.Workline, + Status = dictionary.Status, + DeviceSpecification = dictionary.DeviceSpecification, + ResponsiblePerson = dictionary.ResponsiblePerson }); }