diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-03-18 15:18:23 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-03-18 15:18:23 +0200 |
| commit | 98280531a04ba3e549a89e7d7a5d6c85bff85422 (patch) | |
| tree | 1f205f29f7258e70cc44a86c75cf1c1efa63da86 /Software/Visual_Studio/MachineStudio | |
| parent | 6dbef47fe2ca696fcf11ce4c2d0662c28b36bf35 (diff) | |
| download | Tango-98280531a04ba3e549a89e7d7a5d6c85bff85422.tar.gz Tango-98280531a04ba3e549a89e7d7a5d6c85bff85422.zip | |
MS job runs machine gen and length limit
Diffstat (limited to 'Software/Visual_Studio/MachineStudio')
3 files changed, 19 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs index 83897ca16..7646e91c0 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.BL.Entities; +using Tango.BL.Enumerations; namespace Tango.MachineStudio.Statistics.Models { @@ -21,6 +22,14 @@ namespace Tango.MachineStudio.Statistics.Models public RmlModel Rml { get; set; } + public String Gen + { + get + { + return JobRun.MachineType == (int)MachineTypes.Eureka ? "X4" : "X1"; + } + } + public void Init() { if (JobRun.HeatingStartDate != null) @@ -33,7 +42,12 @@ namespace Tango.MachineStudio.Statistics.Models HeatingDuration = JobRun.ActualStartDate - JobRun.HeatingStartDate; } - + if (JobRun.MachineType == (int)MachineTypes.Eureka) + { + JobRun.JobLogicalLength *= 4; + JobRun.JobLength *= 4; + JobRun.EndPosition *= 4; + } } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs index 9dcce7d05..5f38ae147 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs @@ -300,7 +300,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels JobRuns = new ObservableCollection<JobRunModel>(); LoadJobRunsCommand = new RelayCommand(async () => await LoadJobRuns(), () => IsFree && SelectedMachines!= null && SelectedMachines.Source.Count >0); ExportToExcelCommand = new RelayCommand(ExportToExcel, () => IsFree); - LengthUpperValue = 100000.0; + LengthUpperValue = 1000000.0; LengthLowerValue = 0.0; DateTime now = DateTime.Now; StartSelectedDate = now.AddMonths(-1); @@ -489,6 +489,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels .Select(x => new { x.ID, + x.MachineType, x.ActualStartDate, x.EndDate, x.EndPosition, @@ -562,6 +563,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels .Select(x => new JobRun() { ID = x.ID, + MachineType = x.MachineType, ActualStartDate = x.ActualStartDate, EndDate = x.EndDate, EndPosition = x.EndPosition, diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml index c19578580..b067d83fb 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml @@ -586,7 +586,7 @@ </DataTemplate> </DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn> - <DataGridTextColumn Header="ID" Binding="{Binding JobRun.ID}" Width="50" ElementStyle="{StaticResource WrapText}"/> + <DataGridTextColumn Header="Gen" Binding="{Binding Gen}" Width="50"/> <DataGridTextColumn Header="Machine" Binding="{Binding Machine.SerialNumber}" Width="100" ></DataGridTextColumn> <DataGridTextColumn Header="User" Binding="{Binding User.Contact.FullName,TargetNullValue='PPC',FallbackValue='PPC'}" Width="100" ElementStyle="{StaticResource WrapText}" /> <DataGridTextColumn Header="Job Name" Binding="{Binding JobRun.JobName}" Width="100" ElementStyle="{StaticResource WrapText}"/> |