From 3f0106dac4b2dc8cc3197098dbaff08796e5dcc0 Mon Sep 17 00:00:00 2001 From: choieigun Date: Tue, 17 Mar 2026 20:12:29 +0900 Subject: [PATCH] =?UTF-8?q?APD=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=A5=BC=20?= =?UTF-8?q?=EB=B3=B4=EA=B3=A0=20=EC=A0=84=EC=97=90,=20Report=EB=8C=80?= =?UTF-8?q?=EC=83=81=20Cell=EC=97=90=EC=84=9C=20=EA=B0=80=EC=A0=B8?= =?UTF-8?q?=EC=99=80=EC=84=9C=20=EC=85=8B=ED=8C=85=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs | 4 ++-- WeldingComponents/WeldingCommon/Data/ActualProcessData.cs | 7 +++++++ .../WeldingCommon/Sequences/Main/SeqUploadWeldingList.cs | 1 - 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs b/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs index 152577e..65b0ae7 100644 --- a/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs +++ b/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs @@ -632,6 +632,7 @@ namespace ILSOS_CCW_H52A.Sequences 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()); } SaveCellAPD(); } @@ -796,6 +797,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(); if (_CellScheduler.Prefetch2 != null) Log.I($"Prefetch2 >> CellId({_CellScheduler.Prefetch2.CellId}) [CanExist({_CellScheduler.Prefetch2.IsCanExist})] [JigNo({_CellScheduler.Prefetch2.JigNo})] " + @@ -909,14 +911,12 @@ namespace ILSOS_CCW_H52A.Sequences _CellScheduler.Prefetch2.InnerCellInfo.LaserPowerRing = laserParam.LaserPower2.ToString(); _CellScheduler.Prefetch2.InnerCellInfo.MarkSpeed = laserParam.MarkSpeed.ToString(); _CellScheduler.Prefetch2.InnerCellInfo.FocalLength = (_PLC.ReadDWord((int)eWordInput.PLC_WELDING_FOCAL_LENGTH).data / 1000f).ToString(); - _CellScheduler.Prefetch2.InnerCellInfo.WeldingJigNo = _WeldingJigNo.ToString(); // 업로드 성공 확인 후 뷰/EDC용 Status 갱신 (ReadyScannerList에서 중복 갱신 제거) Status.GetProcessingWeldingData().LaserPowerCore = laserParam.LaserPower1.ToString(); Status.GetProcessingWeldingData().LaserPowerRing = laserParam.LaserPower2.ToString(); Status.GetProcessingWeldingData().MarkSpeed = laserParam.MarkSpeed.ToString(); Status.GetProcessingWeldingData().FocalLength = _CellScheduler.Prefetch2.InnerCellInfo.FocalLength; - Status.GetProcessingWeldingData().WeldingJigNo = _WeldingJigNo.ToString(); Log.FuncI("CellTracker Load"); return SequenceAction.Ok(); } diff --git a/WeldingComponents/WeldingCommon/Data/ActualProcessData.cs b/WeldingComponents/WeldingCommon/Data/ActualProcessData.cs index 212307b..0b62681 100644 --- a/WeldingComponents/WeldingCommon/Data/ActualProcessData.cs +++ b/WeldingComponents/WeldingCommon/Data/ActualProcessData.cs @@ -69,6 +69,13 @@ namespace WeldingCommon.Data item.PolygonDelay, item.PowerCore, item.PowerRing, item.JumpSpeed, item.MarkSpeed, item.JumpX, item.JumpY); } + public void UpdateHeadNo(string headNo) + { + foreach (var item in this) + item.HeadNo = headNo; + foreach (DataRow row in table.Rows) + row["HeadNo"] = headNo; + } protected override void ClearItems() { diff --git a/WeldingComponents/WeldingCommon/Sequences/Main/SeqUploadWeldingList.cs b/WeldingComponents/WeldingCommon/Sequences/Main/SeqUploadWeldingList.cs index d865348..806ed26 100644 --- a/WeldingComponents/WeldingCommon/Sequences/Main/SeqUploadWeldingList.cs +++ b/WeldingComponents/WeldingCommon/Sequences/Main/SeqUploadWeldingList.cs @@ -741,7 +741,6 @@ namespace WeldingCommon.Sequences { laserLog.EndPointY = obj.PF2.Y; laserLog.LotID = Status.GetProcessingWeldingData().WorkLotId; laserLog.CellID = Status.GetProcessingWeldingData().WorkCellId; - laserLog.HeadNo = Status.GetProcessingWeldingData().WeldingJigNo; Status.GetProcessingWeldingData().APD.Add(laserLog); }