diff --git a/AuroraDevices/AuroraLaserScanner/Scanner.cs b/AuroraDevices/AuroraLaserScanner/Scanner.cs index 2c64c7d..c36ae29 100644 --- a/AuroraDevices/AuroraLaserScanner/Scanner.cs +++ b/AuroraDevices/AuroraLaserScanner/Scanner.cs @@ -37,9 +37,7 @@ namespace AuroraLaserScanner Config = config as ScannerConfig; if (IsSimul) { _scannerObj = new ScannerSimul(); - //return E1.OK; - } - else if (Config.Type == eRTCType.RTC5) { + } else if (Config.Type == eRTCType.RTC5) { _scannerObj = new ScannerRTC5(); } else if (Config.Type == eRTCType.RTC6) { _scannerObj = new ScannerRTC6(); diff --git a/Machines/ILSOS_ACW_H52A/RMS/EDC.cs b/Machines/ILSOS_ACW_H52A/RMS/EDC.cs index fa01259..71f8564 100644 --- a/Machines/ILSOS_ACW_H52A/RMS/EDC.cs +++ b/Machines/ILSOS_ACW_H52A/RMS/EDC.cs @@ -35,7 +35,7 @@ namespace ILSOS_ACW_H52A.RMS string strLaserCenterPower = Status.GetProcessingWeldingData().LaserPowerCore; string strMarkSpeed = Status.GetProcessingWeldingData().MarkSpeed; string strFocalLength = Status.GetProcessingWeldingData().FocalLength; - string strJigNo = Status.GetProcessingWeldingData().WeldingJigNo; + string strJigNo = Status.GetProcessingWeldingData().JigNo; string strLaserPowerByLBAD = Status.GetProcessingWeldingData().LaserPowerByLBAD; diff --git a/Machines/ILSOS_ACW_H52A/Sequences/SeqAutoRunACWH52A.cs b/Machines/ILSOS_ACW_H52A/Sequences/SeqAutoRunACWH52A.cs index 0001779..df711fb 100644 --- a/Machines/ILSOS_ACW_H52A/Sequences/SeqAutoRunACWH52A.cs +++ b/Machines/ILSOS_ACW_H52A/Sequences/SeqAutoRunACWH52A.cs @@ -871,7 +871,7 @@ namespace ILSOS_ACW_H52A.Sequences Status.GetProcessingWeldingData().LaserPowerCore = laserParam.LaserPower1.ToString(); Status.GetProcessingWeldingData().MarkSpeed = laserParam.MarkSpeed.ToString(); Status.GetProcessingWeldingData().FocalLength = (_PLC.ReadDWord((int)eWordInput.PLC_WELDING_FOCAL_LENGTH).data / 1000f).ToString(); - Status.GetProcessingWeldingData().WeldingJigNo = _WeldingJigNo.ToString(); + Status.GetProcessingWeldingData().JigNo = _WeldingJigNo.ToString(); } } @@ -1131,7 +1131,7 @@ namespace ILSOS_ACW_H52A.Sequences Status.GetProcessingWeldingData().RecipeNo = _RecipeNo; Status.GetProcessingWeldingData().LaserPowerByLBAD = _LaserPowerByLBAD.ToString(); - Status.GetProcessingWeldingData().WeldingJigNo = _CompletedJigNo.ToString(); + Status.GetProcessingWeldingData().JigNo = _CompletedJigNo.ToString(); } private SequenceActionResult SetReportCellResult_SeqParams(SequenceContext context, string id, SequenceActionResult param) diff --git a/Machines/ILSOS_CCW_H52A/Datas/JigInfo.cs b/Machines/ILSOS_CCW_H52A/Datas/JigInfo.cs index 9493d82..9873965 100644 --- a/Machines/ILSOS_CCW_H52A/Datas/JigInfo.cs +++ b/Machines/ILSOS_CCW_H52A/Datas/JigInfo.cs @@ -121,7 +121,7 @@ namespace ILSOS_CCW_H52A.Data InnerCellInfo.LaserPowerRing = data.LaserPowerRing; InnerCellInfo.MarkSpeed = data.MarkSpeed; InnerCellInfo.FocalLength = data.FocalLength; - InnerCellInfo.WeldingJigNo = data.WeldingJigNo; + InnerCellInfo.JigNo = data.JigNo; InnerCellInfo.LaserPowerByLBAD = data.LaserPowerByLBAD; InnerCellInfo.CheckCanExist = data.CheckCanExist; InnerCellInfo.CheckScannerListEnd = data.CheckScannerListEnd; diff --git a/Machines/ILSOS_CCW_H52A/Device/Scanner/ScannerCCWH52A.cs b/Machines/ILSOS_CCW_H52A/Device/Scanner/ScannerCCWH52A.cs index acfeda4..2b2d71f 100644 --- a/Machines/ILSOS_CCW_H52A/Device/Scanner/ScannerCCWH52A.cs +++ b/Machines/ILSOS_CCW_H52A/Device/Scanner/ScannerCCWH52A.cs @@ -31,7 +31,7 @@ namespace ILSOS_CCW_H52A.Device if (ret == E1.OK && IsSimul) { if (_plc == null) { _plc = Application.Current.AuroraEnv().DeviceManager[CommonDeviceIds.PLCDevice] as PLCControllerCCWH52A; - return E2.ABORTED; + //return E2.ABORTED; } // 값의 동기화가 필요해서 추가 함 diff --git a/Machines/ILSOS_CCW_H52A/RMS/EDC.cs b/Machines/ILSOS_CCW_H52A/RMS/EDC.cs index 2557b1a..123e375 100644 --- a/Machines/ILSOS_CCW_H52A/RMS/EDC.cs +++ b/Machines/ILSOS_CCW_H52A/RMS/EDC.cs @@ -35,7 +35,7 @@ namespace ILSOS_CCW_H52A.RMS string strLaserCenterPower = Status.GetProcessingWeldingData().LaserPowerCore; string strMarkSpeed = Status.GetProcessingWeldingData().MarkSpeed; string strFocalLength = Status.GetProcessingWeldingData().FocalLength; - string strJigNo = Status.GetProcessingWeldingData().WeldingJigNo; + string strJigNo = Status.GetProcessingWeldingData().JigNo; string strLaserPowerByLBAD = Status.GetProcessingWeldingData().LaserPowerByLBAD; diff --git a/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs b/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs index 24fc6a8..727f97d 100644 --- a/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs +++ b/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs @@ -631,19 +631,11 @@ namespace ILSOS_CCW_H52A.Sequences Status.GetProcessingWeldingData().WeldingStartTime = report.WeldStartTime; Status.GetProcessingWeldingData().WeldingEndTime = report.WeldEndTime; Status.GetProcessingWeldingData().WeldingSpanTimeMilliseconds = report.WeldingSpanTime.TotalMilliseconds.ToString(); - Status.GetProcessingWeldingData().WeldingJigNo = report.JigNo.ToString(); - Status.GetProcessingWeldingData().APD.UpdateHeadNo(report.JigNo.ToString()); + Status.GetProcessingWeldingData().JigNo = report.JigNo.ToString(); + SaveCellAPD(); } - SaveCellAPD(); } - //if (_SystemParameter.BypassModeLBAD == false) { - // if (_StreamLightLBAD.SendWeldingStop() == false) { - // Log.I(string.Format($"[LBAD Interface]SendWeldingStop null")); - // //return null; - // } - //} - 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_PRODUCT_COUNT;" + jigComplete.WeldEndTime.ToString("yyyy-MM-dd HH:mm:ss")); @@ -797,7 +789,7 @@ namespace ILSOS_CCW_H52A.Sequences _CellScheduler.Prefetch2.CellId = recvInfo.CellId; Status.GetProcessingWeldingData().WorkLotId = recvInfo.LotId; Status.GetProcessingWeldingData().WorkCellId = recvInfo.CellId; - Status.GetProcessingWeldingData().WeldingJigNo = _WeldingJigNo.ToString(); + Status.GetProcessingWeldingData().WorkJigNo = _WeldingJigNo.ToString(); if (_CellScheduler.Prefetch2 != null) Log.I($"Prefetch2 >> CellId({_CellScheduler.Prefetch2.CellId}) [CanExist({_CellScheduler.Prefetch2.IsCanExist})] [JigNo({_CellScheduler.Prefetch2.JigNo})] " + diff --git a/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRun.xaml b/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRun.xaml index 199070c..6f97ba7 100644 --- a/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRun.xaml +++ b/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRun.xaml @@ -104,7 +104,7 @@