Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 977277ba 由 LN
选项

入料流程

1 个父辈 2309664a
全部展开
内嵌 并排
正在显示 29 个修改的文件 包含 246 行增加 和 179 行删除
source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
......@@ -5,7 +5,7 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,对应的横移模块,SidesWayNum,1,,,,,
PRO,0,是否是用来出料,IsCanOut,0,,,,,
,,,,,,,,,
AXIS,0,提升上料轴,Batch_Axis,2,COM1,0,,,
AXIS,0,提升上料轴,Batch_Axis,2,COM1,1,,,
PRO,0,提升上料轴原位待机点 P1,BatchAxisP1,1000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,10000,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,500,,,,,
......@@ -20,7 +20,7 @@ PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,400,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,50,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,5000,,,,,
,,,,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,2,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴在移栽上下降的位置P2集合,UpDownPositionsP2,0=180000;,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv
......@@ -5,7 +5,7 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,对应的横移模块,SidesWayNum,0,,,,,
PRO,0,是否是用来出料,IsCanOut,0,,,,,
,,,,,,,,,
AXIS,0,提升上料轴,Batch_Axis,2,COM1,0,,,
AXIS,0,提升上料轴,Batch_Axis,2,COM1,3,,,
PRO,0,提升上料轴原位待机点 P1,BatchAxisP1,1000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,10000,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,500,,,,,
......@@ -20,7 +20,7 @@ PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,400,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,50,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,5000,,,,,
,,,,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,4,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴在移栽上下降的位置P2集合,UpDownPositionsP2,0=180000;,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
......@@ -5,7 +5,7 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,对应的横移模块,SidesWayNum,2,,,,,
PRO,0,是否是用来出料,IsCanOut,0,,,,,
,,,,,,,,,
AXIS,0,提升上料轴,Batch_Axis,2,COM1,0,,,
AXIS,0,提升上料轴,Batch_Axis,2,COM1,5,,,
PRO,0,提升上料轴原位待机点 P1,BatchAxisP1,1000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,10000,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,500,,,,,
......@@ -20,7 +20,7 @@ PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,400,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,50,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,5000,,,,,
,,,,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,6,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴在移栽上下降的位置P2集合,UpDownPositionsP2,0=180000;,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
......@@ -5,7 +5,7 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,对应的横移模块,SidesWayNum,3,,,,,
PRO,0,是否是用来出料,IsCanOut,1,,,,,
,,,,,,,,,
AXIS,0,提升上料轴,Batch_Axis,2,COM1,0,,,
AXIS,0,提升上料轴,Batch_Axis,2,COM1,7,,,
PRO,0,提升上料轴原位待机点 P1,BatchAxisP1,1000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,10000,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,500,,,,,
......@@ -20,7 +20,7 @@ PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,400,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,50,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,5000,,,,,
,,,,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,8,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴在移栽上下降的位置P2集合,UpDownPositionsP2,0=180000;,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
......
source/DeviceLibrary/LineConfig/Config_Line.csv
......@@ -5,18 +5,6 @@ PRO,0,IO信号超时时间（毫秒）,IOSingle_TimerOut,15000,,,,,
PRO,0,IO模块对应的DI数量,IO_DILength,192.168.100.30#8;192.168.100.32#8;192.168.100.34#8;192.168.100.36#8;192.168.100.38#8;,,,,,
PRO,0,模块对应的DO数量,IO_DOLength,192.168.100.30#8;192.168.100.32#8;192.168.100.34#8;192.168.100.36#8;192.168.100.38#8;,,,,,
,,,,,,,,,
PRO,0,模拟量IO模块的IP地址,AIDevice_IP,192.168.201.62,,,,,
PRO,0,模拟量测高1mm对应的转换值,AI_ConvertPosition,74,,,,,
PRO,0,模拟信号1默认高度,AIDI1_DefaultPosition,4074,,,,,
PRO,0,模拟信号2默认高度,AIDI2_DefaultPosition,4054,,,,,
PRO,0,模拟信号3默认高度,AIDI3_DefaultPosition,4184,,,,,
PRO,0,模拟信号4默认高度,AIDI4_DefaultPosition,3930,,,,,
,,,,,,,,,
PRO,0,模拟信号1的地址,AIDI1_Addr,0,,,,,
PRO,0,模拟信号2的地址,AIDI2_Addr,1,,,,,
PRO,0,模拟信号3的地址,AIDI3_Addr,2,,,,,
PRO,0,模拟信号4的地址,AIDI4_Addr,3,,,,,
,,,,,,,,,
,,,,,,,,,
DI,0,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X001,X001
DI,0,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X002,X002
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_01.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,1,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_02.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,2,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_03.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,3,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_04.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,4,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_05.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,5,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_06.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,6,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_07.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,7,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_08.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,8,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_09.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,9,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_10.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,10,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/assemblyLine/ALineManager.cs
......@@ -33,7 +33,7 @@ namespace OnlineStore.DeviceLibrary
{
if (valueList.Contains(item))
{
LogUtil.error( type.Name + "枚举值：" + item + "重复存在，请检查代码！");
LogUtil.error( type.Name + "枚举值：" + item + "重复存在，请检查代码！程序退出。");
Application.Exit();
break;
}
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
......@@ -60,18 +60,7 @@ namespace OnlineStore.DeviceLibrary
{
mainTimer.Enabled = false;
}
StopMove();
//停止运行时，把所有IO 置零
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
IOMove(IO_Type.TopCylinder_UP, IO_VALUE.LOW);
IOMove(IO_Type.TopCylinder_Down, IO_VALUE.LOW);
IOMove(IO_Type.BeforeAfterCylinder_Before, IO_VALUE.LOW);
IOMove(IO_Type.BeforeAfterCylinder_After, IO_VALUE.LOW);
IOMove(IO_Type.UpDownCylinder_Up, IO_VALUE.LOW);
IOMove(IO_Type.UpDownCylinder_Down, IO_VALUE.LOW);
IOMove(IO_Type.ClampCylinder_Slack, IO_VALUE.LOW);
IOMove(IO_Type.ClampCylinder_Tighten, IO_VALUE.LOW);
StopMove();
runStatus = LineRunStatus.Wait;
}
......@@ -113,8 +102,7 @@ namespace OnlineStore.DeviceLibrary
if (LineManager.Line.CanProcessLine()&&SecondMoveInfo.MoveType.Equals(LineMoveType.None))
{
StartCheckFixture();
}
}
if (MoveInfo.MoveType.Equals(LineMoveType.None)&&Config.IsCanOut.Equals(false))
{
StartInStoreP();
......@@ -143,9 +131,10 @@ namespace OnlineStore.DeviceLibrary
alarmType = LineAlarmType.None;
runStatus = LineRunStatus.HomeMoving;
LogInfo( "开始原点返回： (上下伺服原点返回，上料伺服原点返回 )开始");
LogInfo("开始原点返回： ");
MoveInfo.NewMove(LineMoveType.ReturnHome);
StartReset();
return true;
}
/// <summary>
......@@ -164,7 +153,7 @@ namespace OnlineStore.DeviceLibrary
return false;
}
alarmType = LineAlarmType.None;
LogInfo("开始重置： （上下伺服原点返回，上料伺服原点返回）开始；");
LogInfo("开始重置： ");
runStatus = LineRunStatus.Reset;
MoveInfo.NewMove(LineMoveType.Reset);
StartReset();
......@@ -205,15 +194,7 @@ namespace OnlineStore.DeviceLibrary
switch (MoveInfo.MoveStep)
{
case LineMoveStep.Wait:
LogInfo(MoveInfo.MoveType + "：FR_01_StopCylinderMove：放料阻挡气缸上升,顶升气缸下降");
MoveInfo.NextMoveStep(LineMoveStep.FR_01_StopCylinderMove);
if (Config.SidesWayNum <= 0)
{
IOMove(IO_Type.FL_StopCylinder_Down1, IO_VALUE.LOW);
IOMove(IO_Type.FL_StopCylinder_Down2, IO_VALUE.LOW);
//顶升气缸下降
CylinderMove(null, IO_Type.FL_TopCylinder_Up, IO_Type.FL_TopCylinder_Down);
}
StartReset();
break;
case LineMoveStep.FR_01_StopCylinderMove:
LogInfo(MoveInfo.MoveType + "：FR_03_TrayLocation_After：升降轴托盘气缸后退");
......@@ -227,13 +208,13 @@ namespace OnlineStore.DeviceLibrary
break;
case LineMoveStep.FR_04_LocationCylinder_Down:
LogInfo(MoveInfo.MoveType + "：FR_05_AxisHomeMove：伺服原点返回");
LogInfo(MoveInfo.MoveType + "：FR_05_AxisHomeMove：2伺服原点返回");
MoveInfo.NextMoveStep(LineMoveStep.FR_05_AxisHomeMove);
ACAxisHomeMove(Config.Batch_Axis);
ACAxisHomeMove(Config.UpDown_Axis);
break;
case LineMoveStep.FR_05_AxisHomeMove:
LogInfo(MoveInfo.MoveType + "：FR_06_AxisToP1：伺服到P1点");
LogInfo(MoveInfo.MoveType + "：FR_06_AxisToP1：2伺服到P1点");
MoveInfo.NextMoveStep(LineMoveStep.FR_06_AxisToP1);
ACAxisMove(Config.Batch_Axis, Config.BatchAxisP1, Config.BatchAxis_P1Speed);
ACAxisMove(Config.UpDown_Axis, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed);
......@@ -272,6 +253,16 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.EndMove();
SecondMoveInfo.EndMove();
BatchAxisStopCheck();
ACServerManager.SuddenStop(Config.Batch_Axis);
ACServerManager.SuddenStop(Config.UpDown_Axis);
if (Config.SidesWayNum <= 0)
{
IOMove(IO_Type.FL_StopCylinder_Down1, IO_VALUE.LOW);
IOMove(IO_Type.FL_StopCylinder_Down2, IO_VALUE.LOW);
IOMove(IO_Type.FL_TopCylinder_Down, IO_VALUE.LOW);
IOMove(IO_Type.FL_TopCylinder_Up, IO_VALUE.LOW);
}
IOMove(IO_Type.SL_Line_Run, IO_VALUE.LOW);
IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.LOW);
IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW);
......@@ -283,30 +274,6 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 是否需要拦截当前托盘进行处理
/// </summary>
/// <returns></returns>
internal bool NeedCurrTray()
{
int num = TrayManager.GetTrayNum(Config.Id);
bool isFull = TrayManager.IsFixTureFull(num);
if (Config.IsCanOut.Equals(1))
{
if (isFull && runStatus.Equals(LineRunStatus.Runing) && MoveInfo.MoveType.Equals(LineMoveType.OutStore))
{
return true;
}
}
else
{
if (!isFull && runStatus.Equals(LineRunStatus.Runing) && MoveInfo.MoveType.Equals(LineMoveType.InStore))
{
return true;
}
}
return false;
}
/// <summary>
/// 下降所有阻挡气缸
/// </summary>
internal override void OpenStopCylinder()
......@@ -364,5 +331,53 @@ namespace OnlineStore.DeviceLibrary
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_TrayLocation2_Before, IO_VALUE.LOW));
}
}
#region 提升轴匀速上升处理
private System.Timers.Timer axisCheckTimer = null;
private string TargetIoType = IO_Type.SL_AxisLocationCheck;
private IO_VALUE TargetIoValue = IO_VALUE.HIGH;
private bool BatchAxisStartCheck(string targetIo = "", IO_VALUE value = IO_VALUE.HIGH)
{
if (String.IsNullOrEmpty(targetIo))
{
targetIo = IO_Type.SL_AxisLocationCheck;
}
if (axisCheckTimer == null)
{
axisCheckTimer = new System.Timers.Timer();
axisCheckTimer.AutoReset = true;
axisCheckTimer.Interval += 30;
axisCheckTimer.Elapsed += CheckTimer_Elapsed;
axisCheckTimer.Enabled = false;
}
TargetIoValue = value;
TargetIoType = targetIo;
axisCheckTimer.Start();
return true;
}
private bool BatchAxisStopCheck()
{
if (!(axisCheckTimer == null))
{
axisCheckTimer.Stop();
}
return true;
}
private bool IsInProcess = false;
private void CheckTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
if (IsInProcess) { return; }
IsInProcess = true;
if (IOValue(TargetIoType).Equals(TargetIoValue))
{
LogUtil.info(Name+ "上料轴，检测到 " + TargetIoType + "=" + TargetIoValue + "，可以停止运动");
ACServerManager.SuddenStop(Config.Batch_Axis.DeviceName, Config.Batch_Axis.GetAxisValue());
BatchAxisStopCheck();
}
IsInProcess = false;
}
#endregion
}
}
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -118,12 +118,10 @@ namespace OnlineStore.DeviceLibrary
Task.Factory.StartNew(delegate
{
//连接rfip
RFIDManager.ConnectRFIOList(new List<string>(DeviceConfig.ProRFIpMap.Values));
RFIDManager.ConnectRFIOList(new List<string>(DeviceConfig.ProRFIpMap.Values));
Thread.Sleep(5);
IOManager.instance.ConnectionIOList(ioList);
//Thread.Sleep(10);
//AIManager.ConnectionIP(Config.AIDevice_IP);
addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check));
addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN));
addLastDI(IO_Type.Reset_BTN, IOValue(IO_Type.Reset_BTN));
......
source/DeviceLibrary/assemblyLine/MoveEquip.cs
......@@ -11,7 +11,7 @@ using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
/// <summary>
/// 流水线自动料仓-移栽装置类
/// 流水线自动料仓-进仓装置类
/// </summary>
public partial class MoveEquip : EquipBase
{
......@@ -23,12 +23,12 @@ namespace OnlineStore.DeviceLibrary
this.Config = config;
baseConfig = config;
IsDebug = config.IsDebug.Equals(1);
Name = (" " + "_移栽_" + DeviceID + " ").ToUpper();
Name = (" " + "_进仓_" + DeviceID.ToString().PadLeft(2,'0') + " ").ToUpper();
Init();
MoveInfo = new LineMoveInfo(DeviceID, "移栽-" + DeviceID + "-MoveInfo");
SecondMoveInfo = new LineMoveInfo(DeviceID, "移栽-" + DeviceID + "-SecondMoveInfo");
MoveInfo = new LineMoveInfo(DeviceID, "进仓-" + DeviceID.ToString().PadLeft(2, '0') + "-MoveInfo");
SecondMoveInfo = new LineMoveInfo(DeviceID, "进仓-" + DeviceID.ToString().PadLeft(2, '0') + "-SecondMoveInfo");
UseAxis = config.UpDownUseAxis.Equals(1);
if (UseAxis)
......@@ -107,7 +107,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
private void OutStoreListPro()
{
//料仓出库完成，移栽装置开始出库检测
//料仓出库完成，进仓装置开始出库检测
if (IsDebug.Equals(false) && MoveInfo.MoveType.Equals(LineMoveType.None) && runStatus.Equals(LineRunStatus.Runing))
{
InOutParam waitOutParma = null;
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
......@@ -153,7 +153,6 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(LineMoveStep.MO_59_ClampCylinderTighten))
{
OutStoreLog("出库：(MO_08_UpDownCylinderUp 上下气缸1上升）");
this.MoveInfo.NextMoveStep(LineMoveStep.MO_60_UpDownCylinderUp);
UpdownUpMove();
}
......@@ -163,7 +162,7 @@ namespace OnlineStore.DeviceLibrary
TrayManager.DelNeedEmptyTrayNum();
OutStoreLog("出库 SecondMove：移栽完成，放行托盘");
SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_TopCylinder_Down);
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_13_TopCylinder_Down);
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
LogInfo("【" + posId + "】出库处理结束，！");
......@@ -253,9 +252,9 @@ namespace OnlineStore.DeviceLibrary
TrayManager.UpdateFixtureValue(num );
//阻挡气缸移动
InStoreLog("放托盘（放开阻挡）：SecondMove=MO_12_TopCylinder_Down 物品已移走，顶升气缸1下降）");
InStoreLog("放托盘（放开阻挡）：SecondMove=MO_13_TopCylinder_Down 物品已移走，顶升气缸1下降）");
SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_TopCylinder_Down);
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_13_TopCylinder_Down);
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.MI_10_WaitBox))
......@@ -530,8 +529,8 @@ namespace OnlineStore.DeviceLibrary
{
TrayManager.UpdateTrayNumError(-1, "");
}
CheckLog("托盘放行 SecondMove：(MO_13_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_13_WaitCanGo);
CheckLog("托盘放行 SecondMove：(MO_14_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_WaitCanGo);
if (DeviceID.Equals(2))
{
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
......@@ -552,13 +551,7 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_UP);
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_06_TopCylinderUp))
{
CheckLog("托盘检测（流水线阻挡）SecondMove：(MIO_07_TopCylinderUpWait ,顶升气缸上升时等待1秒钟，再下降）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_07_TopCylinderUpWait);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_07_TopCylinderUpWait))
{
{
CheckLog("托盘检测（流水线阻挡）*************** 托盘号【" + currMoveTrayNum + "】");
//托盘号正确
......@@ -593,8 +586,8 @@ namespace OnlineStore.DeviceLibrary
{
TrayManager.UpdateTrayNumError(-1, "");
}
CheckLog("托盘检测 SecondMove：(MO_12_TopCylinder_Down ，托盘号【" + currMoveTrayNum + "】,直接放盘通过，顶升气缸下降）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_TopCylinder_Down);
CheckLog("托盘检测 SecondMove：(MO_13_TopCylinder_Down ，托盘号【" + currMoveTrayNum + "】,直接放盘通过，顶升气缸下降）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_13_TopCylinder_Down);
CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
}
......@@ -608,10 +601,10 @@ namespace OnlineStore.DeviceLibrary
#endregion
#region 不需要出入库，直接放行
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_12_TopCylinder_Down))
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_13_TopCylinder_Down))
{
CheckLog("托盘放行 SecondMove：(MO_13_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_13_WaitCanGo);
CheckLog("托盘放行 SecondMove：(MO_14_WaitCanGo ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_WaitCanGo);
if (DeviceID.Equals(2))
{
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
......@@ -620,29 +613,29 @@ namespace OnlineStore.DeviceLibrary
}
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_13_WaitCanGo))
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_14_WaitCanGo))
{
CheckLog("托盘放行 SecondMove：(MO_14_StopCylinder2_Down ，阻挡气缸1-2下降）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_StopCylinder2_Down);
CheckLog("托盘放行 SecondMove：(MO_15_StopCylinder2_Down ，阻挡气缸1-2下降）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_StopCylinder2_Down);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH));
// SecondMoveInfo.EndStepWait();
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_14_StopCylinder2_Down))
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_15_StopCylinder2_Down))
{
CheckLog("托盘放行 SecondMove：(MO_15_Tray_Check ， 阻挡2托盘检测=0）, 延时2秒）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_Tray_Check);
CheckLog("托盘放行 SecondMove：(MO_16_Tray_Check ， 阻挡2托盘检测=0）, 延时2秒）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_Tray_Check);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.LOW));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_15_Tray_Check))
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_16_Tray_Check))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_StopCylinder_Back);
CheckLog("托盘放行 SecondMove：(MO_16_StopCylinder_Back ， 阻挡气缸1-2上升 ）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_17_StopCylinder_Back);
CheckLog("托盘放行 SecondMove：(MO_17_StopCylinder_Back ， 阻挡气缸1-2上升 ）");
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_16_StopCylinder_Back))
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_17_StopCylinder_Back))
{
preTrayNum = currMoveTrayNum;
CheckLog("托盘放行 SecondMove：(托盘放行结束） ");
......
source/DeviceLibrary/deviceLibrary/RFID/RFIDManager.cs
......@@ -18,6 +18,7 @@ namespace OnlineStore.DeviceLibrary
internal static void ConnectRFIOList(List<string> rfioNameList)
{
try {
if (conTimer == null)
{
conTimer = new System.Timers.Timer();
......@@ -35,6 +36,10 @@ namespace OnlineStore.DeviceLibrary
{
conTimer.Start();
}
}catch(Exception ex)
{
LogUtil.error("ConnectRFIOList出错：" + ex.ToString());
}
}
private static bool isProcess = false;
private static DateTime lastTime = DateTime.Now;
......@@ -84,22 +89,20 @@ namespace OnlineStore.DeviceLibrary
string logName = "RFIP模块[" + rfid + "] ";
try
{
rfidReader = new Reader();
// rfidReader.LocalIP = "192.168.100.101";
rfidReader.RemoteIP = rfid;
RFReaderMap.Add(rfid, rfidReader);
{
LogUtil.debug("开始连接" + logName + "，尝试重连3次");
for (int i = 1; i <= 3; i++)
{
rfidReader = new Reader();
// rfidReader.LocalIP = "192.168.100.101";
rfidReader.RemoteIP = rfid;
bool result = rfidReader.Connect();
if (result)
{
rfidReader.AutoScan(true);
LogUtil.info("第【" + i + "】次连接 " + logName + " 成功：");
Thread.Sleep(10);
RFReaderMap.Add(rfid, rfidReader);
if (RfIPList.Contains(rfid))
{
RfIPList.Remove(rfid);
......@@ -110,8 +113,7 @@ namespace OnlineStore.DeviceLibrary
{
LogUtil.error("第【" + i + "】次连接 " + logName + " 失败：" + "");
}
Thread.Sleep(5);
GC.Collect();
Thread.Sleep(5);
}
}
......
source/DeviceLibrary/model/KTK_Store.cs
......@@ -325,6 +325,17 @@ namespace OnlineStore.DeviceLibrary
public void CylinderMove(LineMoveInfo moveInfo, string IoLowType, string IoHighType)
{
if (baseConfig.DType.Equals(DeviceType.FeedingEquip))
{
if (!baseConfig.DOList.ContainsKey(IoLowType))
{
return;
}
if (!baseConfig.DOList.ContainsKey(IoHighType))
{
return;
}
}
IOMove(IoLowType, IO_VALUE.LOW);
IOMove(IoHighType, IO_VALUE.HIGH);
if (moveInfo != null)
......
source/DeviceLibrary/model/LineMoveInfo.cs
......@@ -297,6 +297,18 @@ namespace OnlineStore.DeviceLibrary
wait.WaitType = WaitEnum.W202_DLineCanOut;
return wait;
}
public static WaitResultInfo WaitBatchAxis(ConfigMoveAxis axis, int targetPosition, int targetSpeed)
{
WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 0;
wait.WaitType = WaitEnum.W101_BatchAxisMove;
wait.AxisInfo = axis;
wait.IsHomeMove = false;
wait.TargetPosition = targetPosition;
wait.TargetSpeed = targetSpeed;
wait.IsEnd = false;
return wait;
}
public string ToStr()
{
if (WaitType.Equals(WaitEnum.W001_AxisMove))
......@@ -342,7 +354,12 @@ namespace OnlineStore.DeviceLibrary
}else if (WaitType.Equals(WaitEnum.W010_SW34NoTray))
{
return "等待横移34无托盘";
}else if (WaitType.Equals(WaitEnum.W201_ProvidingCanOut))
}
else if (WaitType.Equals(WaitEnum.W101_BatchAxisMove))
{
return "上料轴缓慢上升";
}
else if (WaitType.Equals(WaitEnum.W201_ProvidingCanOut))
{
return "移栽模块可移栽出库";
}else if (WaitType.Equals(WaitEnum.W202_DLineCanOut))
......@@ -449,6 +466,10 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
internal static int W010_SW34NoTray = 10;
/// <summary>
/// 入料模块：批量轴缓慢上升，并检测有料盘后停止
/// </summary>
internal static int W101_BatchAxisMove = 101;
/// <summary>
/// 移栽模块可移栽出库
/// </summary>
internal static int W201_ProvidingCanOut = 201;
......
source/DeviceLibrary/model/StoreStep.cs
......@@ -288,9 +288,9 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
MIO_06_TopCylinderUp = 3086,
/// <summary>
/// 此处 顶升气缸上升时等待一秒钟，再下降，现在看起来没有升到位就下降
/// 移载（流水线）装置出入库处理，定位气缸上升
/// </summary>
MIO_07_TopCylinderUpWait = 3087,
MIO_07_LocationCylinderUp = 3087,
/// <summary>
/// 等待StoreMove完成当前操作开始入库
/// </summary>
......@@ -307,25 +307,29 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
MO_11_CodeRember = 3101,
/// <summary>
/// 移载（流水线）定位气缸下降
/// </summary>
MO_12_LoactionCylinder_Down = 3102,
/// <summary>
/// 移载（流水线）装置出库处理 ，顶升气缸1下降
/// </summary>
MO_12_TopCylinder_Down = 3102,
MO_13_TopCylinder_Down = 3103,
/// <summary>
/// 如果是移栽2需要等待托盘是否可以走
/// </summary>
MO_13_WaitCanGo=3103,
MO_14_WaitCanGo=3104,
/// <summary>
/// 移载（流水线）装置出库处理， 阻挡气缸1-2下降
/// </summary>
MO_14_StopCylinder2_Down = 3104,
MO_15_StopCylinder2_Down = 3105,
/// <summary>
/// 移载（流水线）装置出库处理， 阻挡2托盘检测=0，
/// </summary>
MO_15_Tray_Check = 3105,
MO_16_Tray_Check = 3106,
/// <summary>
/// 移载（流水线）装置出库处理， 阻挡气缸1-1下降 阻挡气缸1-2上升
/// </summary>
MO_16_StopCylinder_Back = 3106,
MO_17_StopCylinder_Back = 3107,
/// <summary>
/// 移栽装置出库处理，开始出库
......@@ -507,98 +511,95 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 入口流水线转动，等待入料检测信号消失
/// </summary>
FI_03_InLineStart = 11003,
FI_03_LineStart = 11003,
/// <summary>
/// 入口流水线转动，等待阻挡气缸信号到位
/// </summary>
FI_04_InLineRun= 11004,
FI_04_LineRunCheck= 11004,
/// <summary>
/// 入口流水线转动，等待入料阻挡信号消失
/// </summary>
FI_05_InLineStart = 11005,
FI_05_LineStart = 11005,
/// <summary>
/// 入口流水线转动，等待定位工位检测到位
/// </summary>
FI_06_InLineRun = 11006,
FI_06_LineRunCheck = 11006,
/// <summary>
/// 已有工位检测信号，定位气缸上升
///入料检测： 工位检测信号，定位气缸上升
/// </summary>
FI_07_LocationCylinder_Up = 11007,
/// <summary>
/// 提升轴下降到位P2
/// 入料检测：提升轴下降到位P2
/// </summary>
FI_08_BatchAxisToP2 = 11008,
/// <summary>
/// 升降盘定位气缸前进
/// 入料检测：升降盘定位气缸前进
/// </summary>
FI_09_TrayLocation_Before = 11009,
/// <summary>
/// 上料轴开始慢速上升到P3点，等待加测到料盘
/// 入料检测：上料轴开始慢速上升到P3点，等待检测到料盘
/// </summary>
FI_10_AxisUpMove= 11010,
FI_10_AxisUpMove = 11010,
/// <summary>
/// 判断是否有料盘，若无料盘，提升伺服下降
/// 有料盘：上料横移机构取料
/// <summary>
/// 料盘移栽：有料盘：上料横移机构取料
/// </summary>
FI_11_MoveCylinder_Take = 11011,
/// <summary>
/// 上料横移机构下降
/// 料盘移栽：上料横移机构下降
/// </summary>
FI_12_MoveCylinder_Down = 11012,
/// <summary>
/// 上料横移机构夹紧
/// 料盘移栽：上料横移机构夹紧
/// </summary>
FI_13_MoveCylinder_Tighten = 11013,
/// <summary>
/// 上料横移机构上升，同时伺服运动到P3
/// 料盘移栽：上料横移机构上升，同时伺服运动到P3
/// </summary>
FI_14_MoveCylinder_Up = 11014,
/// <summary>
/// 记录高度尺寸
/// 料盘移栽：记录高度尺寸
/// </summary>
FI_15_SaveSize= 11015,
FI_15_SaveSize = 11015,
/// <summary>
/// 上料横移气缸放料SOL
/// 料盘移栽： 上料横移气缸放料SOL
/// </summary>
FI_16_MoveCylinder_Emptying = 11016,
/// <summary>
/// 等待空托盘到达，并顶升上升，定位上升
/// 料盘移栽：等待空托盘到达，并顶升上升，定位上升
/// </summary>
FI_17_WaitTray= 11017,
FI_17_WaitTray = 11017,
/// <summary>
/// 上料机构下降
/// 料盘移栽： 上料机构下降
/// </summary>
FI_18_MoveCylinder_Down = 11018,
/// <summary>
/// 移栽伺服下降到指定位置
/// 料盘移栽： 移栽伺服下降到指定位置
/// </summary>
FI_19_UpdownAxisToP2= 11019,
FI_19_UpdownAxisToP2 = 11019,
/// <summary>
/// 上料气缸放松
/// 料盘移栽： 上料气缸放松
/// </summary>
FI_20_MoveCylinder_Slack = 11020,
/// <summary>
/// 升降伺服到P1点
/// 料盘移栽：升降伺服到P1点
/// </summary>
FI_21_UpDownAxisToP1= 11021,
FI_21_UpDownAxisToP1 = 11021,
/// <summary>
/// 上料横移机构上升
/// 料盘移栽：上料横移机构上升
/// </summary>
FI_22_MoveCylinder_Up = 11022,
/// <summary>
/// 上料横移机构到取料端
/// 料盘移栽：上料横移机构到取料端
/// </summary>
FI_23_MoveCylinder_Take = 11023,
......@@ -620,9 +621,41 @@ namespace OnlineStore.DeviceLibrary
FI_33_BatchAxisToP1 = 11033,
/// <summary>
/// 上料完成，定位气缸下降，开始空料架移出
/// 上料完成，判断出料线体是否有料架
/// </summary>
FI_34_OutCheck = 11034,
/// <summary>
/// 上料完成，出口顶升气缸上升
/// </summary>
FI_35_OutTopCylinder_Up = 11035,
/// <summary>
///上料完成， 线体横移电机运转，等待料架到达出口
/// </summary>
FI_36_SideWayLineRun = 11036,
/// <summary>
///上料完成， 料架到达出口，线体横移电机停止
/// </summary>
FI_37_LineStop= 11037,
/// <summary>
///上料完成， 料架到达出口，出口顶升下降，定位气缸下降,
/// </summary>
FI_38_TopCylinderDown = 11038,
/// <summary>
///上料完成， 出口线体运转，料架到达出口处, 通知AGV取空料架
/// </summary>
FI_39_OutLineRun = 11039,
/// <summary>
///上料完成， AGV到达，继续转动出口线体，送走出料料架,
/// </summary>
FI_40_OutLineRun = 11040,
/// <summary>
///上料完成， 料架送出,
/// </summary>
FI_34_LocationCylinder_Down = 11034,
FI_41_OutLineRun = 11041,
#endregion
#region 入料装置出料处理，12000开始
......@@ -630,7 +663,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
///
/// </summary>
FO_01_OutLineStart = 11001,
FO_01_OutLineStart = 12000,
#endregion
#region 出料装置移栽出料，20000开始
......
source/LoadCVSLibrary/CSVReaderBase.cs
......@@ -122,13 +122,19 @@ namespace OnlineStore.LoadCSVLibrary
protected static Dictionary<string, int> GetAllTitleIndex(string lineValue)
{
Dictionary<string, int> titleIndex = new Dictionary<string, int>();
var array = lineValue.Split(',');
try
{
var array = lineValue.Split(',');
//验证列
for (int i = 0; i < array.Length; i++)
//验证列
for (int i = 0; i < array.Length; i++)
{
string title = array[i];
titleIndex.Add(title, i);
}
}catch(Exception ex)
{
string title = array[i];
titleIndex.Add(title, i);
LOGGER.Error("出错：", ex);
}
return titleIndex;
}
......
source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs
......@@ -243,7 +243,7 @@ namespace OnlineStore.LoadCSVLibrary
}
else
{
IP = DeviceName;
return DeviceName;
}
}
return IP;
......
source/LoadCVSLibrary/storeConfig/config/DeviceConfig.cs
......@@ -123,10 +123,10 @@ namespace OnlineStore.LoadCSVLibrary
LOGGER.Error("配置文件：" + this.ConfigFilePath + "，属性名=" + con.ProName + "的属性未找到匹配字段！");
}
}
else if (!ProIOIpMap.ContainsKey(con.ProName) && con.ProName.ToUpper().Contains(IOIP_Str))
else if (!ProIOIpMap.ContainsKey(con.ProName) && con.ProName.ToUpper().Contains(IOIP_Str.ToUpper()))
{
ProIOIpMap.Add(con.ProName, con.ProValue);
}else if(!ProRFIpMap.ContainsKey(con.ProName) && con.ProName.ToUpper().Contains(RFIP_Str))
}else if(!ProRFIpMap.ContainsKey(con.ProName) && con.ProName.ToUpper().Contains(RFIP_Str.ToUpper()))
{
ProRFIpMap.Add(con.ProName, con.ProValue);
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!