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

APD데이터를 보고 전에, Report대상 Cell에서 가져와서 셋팅하도록 함

Browse Source
This commit is contained in:
최이근 2026-03-17 20:12:29 +09:00
parent 0252fbe89d
commit 3f0106dac4
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -632,6 +632,7 @@ namespace ILSOS_CCW_H52A.Sequences
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().WeldingJigNo = report.JigNo.ToString(); Status.GetProcessingWeldingData().WeldingJigNo = report.JigNo.ToString();
Status.GetProcessingWeldingData().APD.UpdateHeadNo(report.JigNo.ToString());
} }
SaveCellAPD(); SaveCellAPD();
} }
@ -796,6 +797,7 @@ namespace ILSOS_CCW_H52A.Sequences
_CellScheduler.Prefetch2.CellId = recvInfo.CellId; _CellScheduler.Prefetch2.CellId = recvInfo.CellId;
Status.GetProcessingWeldingData().WorkLotId = recvInfo.LotId; Status.GetProcessingWeldingData().WorkLotId = recvInfo.LotId;
Status.GetProcessingWeldingData().WorkCellId = recvInfo.CellId; Status.GetProcessingWeldingData().WorkCellId = recvInfo.CellId;
Status.GetProcessingWeldingData().WeldingJigNo = _WeldingJigNo.ToString();
if (_CellScheduler.Prefetch2 != null) if (_CellScheduler.Prefetch2 != null)
Log.I($"Prefetch2 >> CellId({_CellScheduler.Prefetch2.CellId}) [CanExist({_CellScheduler.Prefetch2.IsCanExist})] [JigNo({_CellScheduler.Prefetch2.JigNo})] " + 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.LaserPowerRing = laserParam.LaserPower2.ToString();
_CellScheduler.Prefetch2.InnerCellInfo.MarkSpeed = laserParam.MarkSpeed.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.FocalLength = (_PLC.ReadDWord((int)eWordInput.PLC_WELDING_FOCAL_LENGTH).data / 1000f).ToString();
_CellScheduler.Prefetch2.InnerCellInfo.WeldingJigNo = _WeldingJigNo.ToString();
// 업로드 성공 확인 후 뷰/EDC용 Status 갱신 (ReadyScannerList에서 중복 갱신 제거) // 업로드 성공 확인 후 뷰/EDC용 Status 갱신 (ReadyScannerList에서 중복 갱신 제거)
Status.GetProcessingWeldingData().LaserPowerCore = laserParam.LaserPower1.ToString(); Status.GetProcessingWeldingData().LaserPowerCore = laserParam.LaserPower1.ToString();
Status.GetProcessingWeldingData().LaserPowerRing = laserParam.LaserPower2.ToString(); Status.GetProcessingWeldingData().LaserPowerRing = laserParam.LaserPower2.ToString();
Status.GetProcessingWeldingData().MarkSpeed = laserParam.MarkSpeed.ToString(); Status.GetProcessingWeldingData().MarkSpeed = laserParam.MarkSpeed.ToString();
Status.GetProcessingWeldingData().FocalLength = _CellScheduler.Prefetch2.InnerCellInfo.FocalLength; Status.GetProcessingWeldingData().FocalLength = _CellScheduler.Prefetch2.InnerCellInfo.FocalLength;
Status.GetProcessingWeldingData().WeldingJigNo = _WeldingJigNo.ToString();
Log.FuncI("CellTracker Load"); Log.FuncI("CellTracker Load");
return SequenceAction.Ok(); return SequenceAction.Ok();
} }

7
WeldingComponents/WeldingCommon/Data/ActualProcessData.cs
View File

@ -69,6 +69,13 @@ namespace WeldingCommon.Data
item.PolygonDelay, item.PowerCore, item.PowerRing, item.JumpSpeed, item.MarkSpeed, item.JumpX, item.PolygonDelay, item.PowerCore, item.PowerRing, item.JumpSpeed, item.MarkSpeed, item.JumpX,
item.JumpY); 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() protected override void ClearItems()
{ {

1
WeldingComponents/WeldingCommon/Sequences/Main/SeqUploadWeldingList.cs
View File

@ -741,7 +741,6 @@ namespace WeldingCommon.Sequences {
laserLog.EndPointY = obj.PF2.Y; laserLog.EndPointY = obj.PF2.Y;
laserLog.LotID = Status.GetProcessingWeldingData().WorkLotId; laserLog.LotID = Status.GetProcessingWeldingData().WorkLotId;
laserLog.CellID = Status.GetProcessingWeldingData().WorkCellId; laserLog.CellID = Status.GetProcessingWeldingData().WorkCellId;
laserLog.HeadNo = Status.GetProcessingWeldingData().WeldingJigNo;
Status.GetProcessingWeldingData().APD.Add(laserLog); Status.GetProcessingWeldingData().APD.Add(laserLog);
} }