RobotAutomationDevelopment-Dept/LGES-2170-ACW_CCW-Welder
12
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jig No 변경 및 Main Process View LaserPath 업데이트 수정

Browse Source
This commit is contained in:
ACW 2026-04-13 14:53:09 +09:00
parent b875398e0d
commit 4b7b9cf9cd
5 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Machines/ILSOS_CCW_H52A/Properties/AssemblyInfo.cs
View File

@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.3")] [assembly: AssemblyVersion("1.0.0.4")]
[assembly: AssemblyFileVersion("1.0.0.3")] [assembly: AssemblyFileVersion("1.0.0.4")]

29
Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs
View File

@ -623,17 +623,26 @@ namespace ILSOS_CCW_H52A.Sequences
Status.GetProcessingWeldingData().RecipeNo = _RecipeNo; Status.GetProcessingWeldingData().RecipeNo = _RecipeNo;
Status.GetProcessingWeldingData().LaserPowerByLBAD = _LaserPowerByLBAD.ToString(); Status.GetProcessingWeldingData().LaserPowerByLBAD = _LaserPowerByLBAD.ToString();
// 보고 데이터는 스케줄러의 ActiveReportSlot(Complete 또는 PendingComplete)에서 읽음 //// 보고 데이터는 스케줄러의 ActiveReportSlot(Complete 또는 PendingComplete)에서 읽음
var report = _CellScheduler.ActiveReportSlot; //var report = _CellScheduler.ActiveReportSlot;
if (report != null) { //if (report != null) {
Status.GetProcessingWeldingData().LotId = report.LotId; // Status.GetProcessingWeldingData().LotId = report.LotId;
Status.GetProcessingWeldingData().CellId = report.CellId; // Status.GetProcessingWeldingData().CellId = report.CellId;
Status.GetProcessingWeldingData().WeldingStartTime = report.WeldStartTime; // Status.GetProcessingWeldingData().WeldingStartTime = report.WeldStartTime;
Status.GetProcessingWeldingData().WeldingEndTime = report.WeldEndTime; // Status.GetProcessingWeldingData().WeldingEndTime = report.WeldEndTime;
Status.GetProcessingWeldingData().WeldingSpanTimeMilliseconds = report.WeldingSpanTime.TotalMilliseconds.ToString(); // Status.GetProcessingWeldingData().WeldingSpanTimeMilliseconds = report.WeldingSpanTime.TotalMilliseconds.ToString();
Status.GetProcessingWeldingData().JigNo = report.JigNo.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(); SaveCellAPD();
}
} }
UtilUnit.logUnit.SetLog(LogUnit.eLogType.PRODUCT, MethodBase.GetCurrentMethod().Name, "UPDATE_WELDING_TIME;" + jigComplete.WeldingSpanTime.TotalMilliseconds); UtilUnit.logUnit.SetLog(LogUnit.eLogType.PRODUCT, MethodBase.GetCurrentMethod().Name, "UPDATE_WELDING_TIME;" + jigComplete.WeldingSpanTime.TotalMilliseconds);

2
Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRun.xaml
View File

@ -112,7 +112,7 @@
<usercontrols:UCKeyValueString Height="30" KeyText="Welding Time (ms)" ValueText="{Binding CurrentWeldingData.WeldingSpanTimeMilliseconds}" KeyHorizontalAlignment="Right" KeyTextWidth="0.8*" IsReadOnly="True"/> <usercontrols:UCKeyValueString Height="30" KeyText="Welding Time (ms)" ValueText="{Binding CurrentWeldingData.WeldingSpanTimeMilliseconds}" KeyHorizontalAlignment="Right" KeyTextWidth="0.8*" IsReadOnly="True"/>
<usercontrols:UCKeyValueString Height="30" KeyText="Lot ID" ValueText="{Binding CurrentWeldingData.LotId}" KeyHorizontalAlignment="Right" KeyTextWidth="0.8*" IsReadOnly="True"/> <usercontrols:UCKeyValueString Height="30" KeyText="Lot ID" ValueText="{Binding CurrentWeldingData.LotId}" KeyHorizontalAlignment="Right" KeyTextWidth="0.8*" IsReadOnly="True"/>
<usercontrols:UCKeyValueString Height="30" KeyText="Cell ID" ValueText="{Binding CurrentWeldingData.CellId}" KeyHorizontalAlignment="Right" KeyTextWidth="0.8*" ValueTextSize="11" IsReadOnly="True"/> <usercontrols:UCKeyValueString Height="30" KeyText="Cell ID" ValueText="{Binding CurrentWeldingData.CellId}" KeyHorizontalAlignment="Right" KeyTextWidth="0.8*" ValueTextSize="11" IsReadOnly="True"/>
<usercontrols:UCKeyValueString Height="30" KeyText="Head No" ValueText="{Binding CurrentWeldingData.JigNo}" KeyHorizontalAlignment="Right" KeyTextWidth="0.8*" ValueTextSize="11" IsReadOnly="True"/> <usercontrols:UCKeyValueString Height="30" KeyText="Head No" ValueText="{Binding CurrentWeldingData.JigNo}" KeyHorizontalAlignment="Right" KeyTextWidth="0.8*" IsReadOnly="True"/>
</UniformGrid> </UniformGrid>
</Grid> </Grid>
</GroupBox> </GroupBox>

1
Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs
View File

@ -115,6 +115,7 @@ namespace ILSOS_CCW_H52A.Views
CurrentWeldingData.WeldingSpanTimeMilliseconds = "0"; CurrentWeldingData.WeldingSpanTimeMilliseconds = "0";
CurrentWeldingData.LotId = "Default_Lot_Id"; CurrentWeldingData.LotId = "Default_Lot_Id";
CurrentWeldingData.CellId = "Default_Cell_Id"; CurrentWeldingData.CellId = "Default_Cell_Id";
CurrentWeldingData.JigNo = "0";
} }
private void VisibleChanged(object obj) private void VisibleChanged(object obj)

2
WeldingComponents/LASA/GUI/Canvas/Model.cs
View File

@ -1032,7 +1032,7 @@ namespace CoreUnit.Control.UserControl.Canvas
EnableCanvasColor = org.EnableCanvasColor; EnableCanvasColor = org.EnableCanvasColor;
EnableCanvasGrid = org.EnableCanvasGrid; EnableCanvasGrid = org.EnableCanvasGrid;
Layers = (ICanvasLayer[])org.Layers.Clone(); Layers = (ICanvasLayer[])org.Layers.Clone();
m_activeLayer = m_layers[0];
//var thisDrawing = ActiveLayer as DrawingLayer; //var thisDrawing = ActiveLayer as DrawingLayer;
//var orgDrawing = org.ActiveLayer as DrawingLayer; //var orgDrawing = org.ActiveLayer as DrawingLayer;
//thisDrawing.Copy(orgDrawing, true); //thisDrawing.Copy(orgDrawing, true);