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:15785353c11795a70d1ec47441cfb9f7eb9feda4
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:9265b22328e30881eb6e279cab9e08bd28580eb9
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. "15785353c11795a70d1ec47441cfb9f7eb9feda4" and "9265b22328e30881eb6e279cab9e08bd28580eb9" have entirely different histories.
15785353c1 ... 9265b22328

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

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

@ -1085,9 +1085,7 @@ namespace ILSOS_CCW_H52A.Sequences
report.JigNo, report.WeldingSpanTime.TotalMilliseconds.ToString(), lbadAvg, report.JigNo, report.WeldingSpanTime.TotalMilliseconds.ToString(), lbadAvg,
wd.TodayProduct, wd.TotalProduct); wd.TodayProduct, wd.TotalProduct);
_CellTracker.SendEcsData(report.CellId, strPath, strData + ""); _CellTracker.SendEcsData(report.CellId, strPath, strData + "");
Log.I($"Report to CellTracker >> [LotID({report.LotId})] [CellID({report.CellId})] [LbadAvg({lbadAvg})]");
Log.I($"Report to CellTracker >> [LotID({report.LotId})] [CellID({report.CellId})] [JigNo({report.JigNo})] [LbadAvg({lbadAvg})]");
Log.I($"Cell Data : {strData}");
// 로컬 CSV 저장 // 로컬 CSV 저장
string strItem = "//Date, Time, LotID, CellID, RecipeNo, LaserPower, MarkSpeed, FocalLength, HeadNo, WeldingTime, LaserPowerByLBAD, TodayCount, TotalCount"; string strItem = "//Date, Time, LotID, CellID, RecipeNo, LaserPower, MarkSpeed, FocalLength, HeadNo, WeldingTime, LaserPowerByLBAD, TodayCount, TotalCount";

8
WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.cs
View File

@ -105,6 +105,11 @@ namespace CoreUnit.Scanner.UserControl.Canvas.Dialog
//label73.Enabled = false; //label73.Enabled = false;
//label70.Enabled = false; //label70.Enabled = false;
nudRampingStartPower2.Enabled = false;
nudRampingEndPower2.Enabled = false;
#region Permission Checking #region Permission Checking
// Engineer 이상 등급만 사용 가능 // Engineer 이상 등급만 사용 가능
bool PermissionCheck = ApplicationExt.PermissionLevel <= (ushort)Aurora.Api.PermissionLevel.LEVEL3; bool PermissionCheck = ApplicationExt.PermissionLevel <= (ushort)Aurora.Api.PermissionLevel.LEVEL3;
@ -173,6 +178,9 @@ namespace CoreUnit.Scanner.UserControl.Canvas.Dialog
label65.Enabled = PermissionCheck; label65.Enabled = PermissionCheck;
label78.Enabled = PermissionCheck; label78.Enabled = PermissionCheck;
nudRampingStartPower2.Visible = false;
nudRampingEndPower2.Visible = false;
#endregion #endregion
//} //}