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

Compare commits

base: RobotAutomationDevelopment-Dept:06805428c6f24013216eb926b5f53263f38dd0bc
Branches Tags
RobotAutomationDevelopment-Dept:main
RobotAutomationDevelopment-Dept:AddSlot
RobotAutomationDevelopment-Dept:_AddSlot
RobotAutomationDevelopment-Dept:RecipeView_AutoRun
RobotAutomationDevelopment-Dept:RecipeLock+GetEquipmentName
RobotAutomationDevelopment-Dept:reFac
RobotAutomationDevelopment-Dept:CellRecevie-Test
..
compare: RobotAutomationDevelopment-Dept:d22baebb847bb3d05475d4049eec1ccb474a50ac
Branches Tags
RobotAutomationDevelopment-Dept:AddSlot
RobotAutomationDevelopment-Dept:_AddSlot
RobotAutomationDevelopment-Dept:RecipeView_AutoRun
RobotAutomationDevelopment-Dept:RecipeLock+GetEquipmentName
RobotAutomationDevelopment-Dept:main
RobotAutomationDevelopment-Dept:reFac
RobotAutomationDevelopment-Dept:CellRecevie-Test

No commits in common. "06805428c6f24013216eb926b5f53263f38dd0bc" and "d22baebb847bb3d05475d4049eec1ccb474a50ac" have entirely different histories.
06805428c6 ... d22baebb84

3 changed files with 3 additions and 9 deletions
Show Stats Expand all files Collapse all files

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

@ -632,7 +632,6 @@ 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();
}
@ -797,7 +796,6 @@ 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})] " +
@ -911,12 +909,14 @@ 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();
}

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

@ -69,13 +69,6 @@ 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()
{

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

@ -741,6 +741,7 @@ 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);
}