diff --git a/Machines/ILSOS_CCW_H52A/Properties/AssemblyInfo.cs b/Machines/ILSOS_CCW_H52A/Properties/AssemblyInfo.cs index 4b0f7aa..1e5d0e3 100644 --- a/Machines/ILSOS_CCW_H52A/Properties/AssemblyInfo.cs +++ b/Machines/ILSOS_CCW_H52A/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.3")] -[assembly: AssemblyFileVersion("1.0.0.3")] +[assembly: AssemblyVersion("1.0.0.4")] +[assembly: AssemblyFileVersion("1.0.0.4")] diff --git a/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs b/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs index 727f97d..ec7d66c 100644 --- a/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs +++ b/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs @@ -623,17 +623,26 @@ namespace ILSOS_CCW_H52A.Sequences Status.GetProcessingWeldingData().RecipeNo = _RecipeNo; Status.GetProcessingWeldingData().LaserPowerByLBAD = _LaserPowerByLBAD.ToString(); - // 보고 데이터는 스케줄러의 ActiveReportSlot(Complete 또는 PendingComplete)에서 읽음 - var report = _CellScheduler.ActiveReportSlot; - if (report != null) { - Status.GetProcessingWeldingData().LotId = report.LotId; - Status.GetProcessingWeldingData().CellId = report.CellId; - Status.GetProcessingWeldingData().WeldingStartTime = report.WeldStartTime; - Status.GetProcessingWeldingData().WeldingEndTime = report.WeldEndTime; - Status.GetProcessingWeldingData().WeldingSpanTimeMilliseconds = report.WeldingSpanTime.TotalMilliseconds.ToString(); - Status.GetProcessingWeldingData().JigNo = report.JigNo.ToString(); + //// 보고 데이터는 스케줄러의 ActiveReportSlot(Complete 또는 PendingComplete)에서 읽음 + //var report = _CellScheduler.ActiveReportSlot; + //if (report != null) { + // Status.GetProcessingWeldingData().LotId = report.LotId; + // Status.GetProcessingWeldingData().CellId = report.CellId; + // Status.GetProcessingWeldingData().WeldingStartTime = report.WeldStartTime; + // Status.GetProcessingWeldingData().WeldingEndTime = report.WeldEndTime; + // Status.GetProcessingWeldingData().WeldingSpanTimeMilliseconds = report.WeldingSpanTime.TotalMilliseconds.ToString(); + // Status.GetProcessingWeldingData().JigNo = report.JigNo.ToString(); + // SaveCellAPD(); + //} + + //// 보고 데이터는 스케줄러의 ActiveReportSlot(Complete 또는 PendingComplete)에서 읽음 + Status.GetProcessingWeldingData().LotId = jigComplete.LotId; + Status.GetProcessingWeldingData().CellId = jigComplete.CellId; + Status.GetProcessingWeldingData().WeldingStartTime = jigComplete.WeldStartTime; + Status.GetProcessingWeldingData().WeldingEndTime = jigComplete.WeldEndTime; + Status.GetProcessingWeldingData().WeldingSpanTimeMilliseconds = jigComplete.WeldingSpanTime.TotalMilliseconds.ToString(); + Status.GetProcessingWeldingData().JigNo = jigComplete.JigNo.ToString(); SaveCellAPD(); - } } UtilUnit.logUnit.SetLog(LogUnit.eLogType.PRODUCT, MethodBase.GetCurrentMethod().Name, "UPDATE_WELDING_TIME;" + jigComplete.WeldingSpanTime.TotalMilliseconds); diff --git a/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRun.xaml b/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRun.xaml index 6f97ba7..1f8ee2f 100644 --- a/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRun.xaml +++ b/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRun.xaml @@ -112,7 +112,7 @@ - + diff --git a/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs b/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs index f83df86..029f097 100644 --- a/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs +++ b/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs @@ -115,6 +115,7 @@ namespace ILSOS_CCW_H52A.Views CurrentWeldingData.WeldingSpanTimeMilliseconds = "0"; CurrentWeldingData.LotId = "Default_Lot_Id"; CurrentWeldingData.CellId = "Default_Cell_Id"; + CurrentWeldingData.JigNo = "0"; } private void VisibleChanged(object obj) diff --git a/WeldingComponents/LASA/GUI/Canvas/Model.cs b/WeldingComponents/LASA/GUI/Canvas/Model.cs index f8a916c..5951863 100644 --- a/WeldingComponents/LASA/GUI/Canvas/Model.cs +++ b/WeldingComponents/LASA/GUI/Canvas/Model.cs @@ -1032,7 +1032,7 @@ namespace CoreUnit.Control.UserControl.Canvas EnableCanvasColor = org.EnableCanvasColor; EnableCanvasGrid = org.EnableCanvasGrid; Layers = (ICanvasLayer[])org.Layers.Clone(); - + m_activeLayer = m_layers[0]; //var thisDrawing = ActiveLayer as DrawingLayer; //var orgDrawing = org.ActiveLayer as DrawingLayer; //thisDrawing.Copy(orgDrawing, true);