Skip to content

李娜 / SO664-AssemblyLine

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

增加isstep方法

1 个父辈 977f5e7f
全部展开
内嵌 并排
正在显示 13 个修改的文件 包含 18 行增加 和 144 行删除
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -151,9 +151,6 @@ ...@@ -151,9 +151,6 @@
<None Include="LineConfig\Config_FeedingEquip_5.csv"> <None Include="LineConfig\Config_FeedingEquip_5.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="LineConfig\Config_Line - 复制.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\Config_Line.csv"> <None Include="LineConfig\Config_Line.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
......
source/DeviceLibrary/LineConfig/Config_Line -20200713-back.csv deleted 100644 → 0
类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
,,,,,,,,,
PRO,0,流水线总电器箱,PRO_AOI_IP_1,192.168.101.21,,,,,
PRO,0,出料皮带线1,PRO_AOI_IP_2,192.168.101.22,,,,,
PRO,0,出料皮带线2,PRO_AOI_IP_3,192.168.101.23,,,,,
,,,,,,,,,
PRO,0,上料流水线SL1-模块1,PRO_AOI_IP_11,192.168.101.24,,,,,
PRO,0,上料流水线SL1-模块2,PRO_AOI_IP_12,192.168.101.25,,,,,
PRO,0,上料流水线SL2-模块1,PRO_AOI_IP_13,192.168.101.26,,,,,
PRO,0,上料流水线SL2-模块2,PRO_AOI_IP_14,192.168.101.27,,,,,
PRO,0,上料流水线SL3-模块1,PRO_AOI_IP_15,192.168.101.28,,,,,
PRO,0,上料流水线SL3-模块2,PRO_AOI_IP_16,192.168.101.29,,,,,
PRO,0,下料流水线SL4-模块1,PRO_AOI_IP_17,192.168.101.30,,,,,
PRO,0,下料流水线SL4-模块2,PRO_AOI_IP_18,192.168.101.31,,,,,
,,,,,,,,,
PRO,0,移载装置(上下为伺服）01、02-模块1,PRO_AOI_IP_19,192.168.101.32,,,,,
PRO,0,移载装置(上下为伺服）01、02-模块2,PRO_AOI_IP_20,192.168.101.33,,,,,
PRO,0,移载装置(上下为伺服）03、04-模块1,PRO_AOI_IP_21,192.168.101.34,,,,,
PRO,0,移载装置(上下为伺服）03、04-模块2,PRO_AOI_IP_22,192.168.101.35,,,,,
PRO,0,移载装置(上下为伺服）05、06-模块1,PRO_AOI_IP_23,192.168.101.36,,,,,
PRO,0,移载装置(上下为伺服）05、06-模块2,PRO_AOI_IP_24,192.168.101.37,,,,,
PRO,0,移载装置(上下为伺服）07、08-模块1,PRO_AOI_IP_25,192.168.101.38,,,,,
PRO,0,移载装置(上下为伺服）07、08-模块2,PRO_AOI_IP_26,192.168.101.39,,,,,
PRO,0,移载装置(上下为伺服）09、10-模块1,PRO_AOI_IP_27,192.168.101.40,,,,,
PRO,0,移载装置(上下为伺服）09、10-模块2,PRO_AOI_IP_28,192.168.101.41,,,,,
PRO,0,移载装置(上下为气缸）11、12-模块1,PRO_AOI_IP_29,192.168.101.42,,,,,
PRO,0,移载装置(上下为气缸）11、12-模块2,PRO_AOI_IP_30,192.168.101.43,,,,,
PRO,0,移载装置(上下为气缸）13、14-模块1,PRO_AOI_IP_31,192.168.101.44,,,,,
PRO,0,移载装置(上下为气缸）13、14-模块2,PRO_AOI_IP_32,192.168.101.45,,,,,
PRO,0,移载装置(上下为气缸）15、16-模块1,PRO_AOI_IP_33,192.168.101.46,,,,,
PRO,0,移载装置(上下为气缸）15、16-模块2,PRO_AOI_IP_34,192.168.101.47,,,,,
PRO,0,移载装置(上下为气缸）17、18-模块1,PRO_AOI_IP_35,192.168.101.48,,,,,
PRO,0,移载装置(上下为气缸）17、18-模块2,PRO_AOI_IP_36,192.168.101.49,,,,,
,,,,,,,,,
PRO,0,移栽装置1-托盘-RFID-IP,PRO_RFIP_001,192.168.210.103,,,,,
PRO,0,移栽装置2-托盘-RFID-IP,PRO_RFIP_002,192.168.210.104,,,,,
PRO,0,移栽装置3-托盘-RFID-IP,PRO_RFIP_003,192.168.210.105,,,,,
PRO,0,移栽装置4-托盘-RFID-IP,PRO_RFIP_004,192.168.210.106,,,,,
PRO,0,移栽装置5-托盘-RFID-IP,PRO_RFIP_005,192.168.210.107,,,,,
PRO,0,移栽装置6-托盘-RFID-IP,PRO_RFIP_006,192.168.210.108,,,,,
PRO,0,移栽装置7-托盘-RFID-IP,PRO_RFIP_007,192.168.210.111,,,,,
PRO,0,移栽装置8-托盘-RFID-IP,PRO_RFIP_008,192.168.210.112,,,,,
PRO,0,移栽装置9-托盘-RFID-IP,PRO_RFIP_009,192.168.210.113,,,,,
PRO,0,移栽装置10-托盘-RFID-IP,PRO_RFIP_010,192.168.210.114,,,,,
PRO,0,移栽装置11-托盘-RFID-IP,PRO_RFIP_011,192.168.210.120,,,,,
PRO,0,移栽装置12-托盘-RFID-IP,PRO_RFIP_012,192.168.210.121,,,,,
PRO,0,移栽装置13-托盘-RFID-IP,PRO_RFIP_013,192.168.210.123,,,,,
PRO,0,移栽装置14-托盘-RFID-IP,PRO_RFIP_014,192.168.210.124,,,,,
PRO,0,移栽装置15-托盘-RFID-IP,PRO_RFIP_015,192.168.210.125,,,,,
PRO,0,移栽装置16-托盘-RFID-IP,PRO_RFIP_016,192.168.210.126,,,,,
PRO,0,移栽装置17-托盘-RFID-IP,PRO_RFIP_017,192.168.210.128,,,,,
PRO,0,移栽装置18-托盘-RFID-IP,PRO_RFIP_018,192.168.210.129,,,,,
PRO,0,出料移栽1-托盘-RFID-IP,PRO_RFIP_201,192.168.210.119,,,,,
PRO,0,出料移栽2-托盘-RFID-IP,PRO_RFIP_202,192.168.210.122,,,,,
PRO,0,出料移栽3-托盘-RFID-IP,PRO_RFIP_203,192.168.210.127,,,,,
PRO,0,出料移栽4-托盘-RFID-IP,PRO_RFIP_204,192.168.210.130,,,,,
,0,入料流水线1-托盘-RFID-IP,PRO_RFIP_101,192.168.210.101,,,,,
PRO,0,入料流水线2-托盘-RFID-IP,PRO_RFIP_102,192.168.210.110,,,,,
PRO,0,入料流水线3-托盘-RFID-IP,PRO_RFIP_103,192.168.210.116,,,,,
,0,入料流水线4-托盘-RFID-IP,PRO_RFIP_104,192.168.210.117,,,,,
PRO,0,入料流水线1-上料模块-RFID-IP,PRO_RFIP_101-1,192.168.210.102,,,,,
PRO,0,入料流水线2-上料模块-RFID-IP,PRO_RFIP_102-1,192.168.210.109,,,,,
PRO,0,入料流水线3-上料模块-RFID-IP,PRO_RFIP_103-1,192.168.210.115,,,,,
PRO,0,入料流水线4-上料模块-RFID-IP,PRO_RFIP_104-1,192.168.210.118,,,,,
,,,,,,,,,
PRO,0,当多久没操作时流水线休眠（秒）,Sleep_MSeconds,600,,,,,
PRO,0,气压检测信号关闭需要持续的时间,AirCheckSeconds,600,,,,,
PRO,0,IO信号超时时间（秒）,IOSingle_TimerOut,15,,,,,
PRO,0,IO模块对应的DI数量,IO_DILength,192.168.101.33#8;192.168.101.35#8;192.168.101.37#8;192.168.101.39#8;192.168.101.41#8;,,,,,
PRO,0,模块对应的DO数量,IO_DOLength,192.168.101.33#8;192.168.101.35#8;192.168.101.37#8;192.168.101.39#8;192.168.101.41#8;,,,,,
,,,,,,,,,
,,,,,,,,,
DI,0,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X001,X001
DI,0,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X002,X002
DI,0,联动,Start_BTN,2,PRO_AOI_IP_1,0,联动,X003,X003
DI,0,气压检测,Airpressure_Check,3,PRO_AOI_IP_1,0,气压检测,X004,X004
,0,NG料盘推出气缸前进端,NGCylinder_Before,4,PRO_AOI_IP_1,0,NG料盘推出气缸前进端,X005,X005
,0,NG料盘推出气缸后退端,NGCylinder_After,5,PRO_AOI_IP_1,0,NG料盘推出气缸后退端,X006,X006
DI,0,环形线横移4定位上升端,SW4_LocationCylinder_Up,6,PRO_AOI_IP_1,0,环形线横移4定位上升端,X007,X007
DI,0,环形线横移4定位下降端,SW4_LocationCylinder_Down,7,PRO_AOI_IP_1,0,环形线横移4定位下降端,X008,X008
,0,,,8,PRO_AOI_IP_1,0,,X009,X009
,0,,,9,PRO_AOI_IP_1,0,,X010,X010
,0,,,10,PRO_AOI_IP_1,0,,X011,X011
,0,,,11,PRO_AOI_IP_1,0,,X012,X012
,0,,,12,PRO_AOI_IP_1,0,,X013,X013
,0,,,13,PRO_AOI_IP_1,0,,X014,X014
,0,,,14,PRO_AOI_IP_1,0,,X015,X015
,0,,,15,PRO_AOI_IP_1,0,,X016,X016
,,,,,,,,,
DO,0,待机状态（黄灯）,AutoRun_HddLed,0,PRO_AOI_IP_1,0,待机状态（黄灯）,Y001,Y001
DO,0,运行状态（绿灯）,RunSign_HddLed,1,PRO_AOI_IP_1,0,运行状态（绿灯）,Y002,Y002
DO,0,故障状态（红灯）,Alarm_HddLed,2,PRO_AOI_IP_1,0,故障状态（红灯）,Y003,Y003
DO,0,故障状态（蜂鸣器）,Alarm_Buzzer,3,PRO_AOI_IP_1,0,故障状态（蜂鸣器）,Y004,Y004
DO,0,驱动电机1正转,DriveMotor_Run1,4,PRO_AOI_IP_1,0,驱动电机1正转,Y005,Y005
DO,0,驱动电机2正转,DriveMotor_Run2,5,PRO_AOI_IP_1,0,驱动电机2正转,Y006,Y006
DO,0,驱动电机3正转,DriveMotor_Run3,6,PRO_AOI_IP_1,0,驱动电机3正转,Y007,Y007
DO,0,驱动电机4正转,DriveMotor_Run4,7,PRO_AOI_IP_1,0,驱动电机4正转,Y008,Y008
DO,0,环形线横移4电机运转,SW4_MotorRun,8,PRO_AOI_IP_1,0,环形线横移4电机运转,Y009,Y009
,0,NG料盘推出气缸前进SOL,NGCylinder_Before,9,PRO_AOI_IP_1,0,NG料盘推出气缸前进SOL,Y010,Y010
,0,NG料盘推出气缸后退SOL,NGCylinder_After,10,PRO_AOI_IP_1,0,NG料盘推出气缸后退SOL,Y011,Y011
DO,0,环形线横移4定位上升SOL,SW4_LocationCylinder_Up,11,PRO_AOI_IP_1,0,环形线横移4定位上升SOL,Y012,Y012
DO,0,环形线横移4定位下降SOL,SW4_LocationCylinder_Down,12,PRO_AOI_IP_1,0,环形线横移4定位下降SOL,Y013,Y013
,0,,,13,PRO_AOI_IP_1,0,,Y014,Y014
,0,,,14,PRO_AOI_IP_1,0,,Y015,Y015
,0,,,15,PRO_AOI_IP_1,0,,Y016,Y016
DI,1,01NSC-进仓02阻挡1检测,NextStopCheck,8,PRO_AOI_IP_19,0,01NSC-进仓02阻挡1检测,X269,X269
DI,2,02NSC-进仓03阻挡1检测,NextStopCheck,0,PRO_AOI_IP_21,0,02NSC-进仓02阻挡1检测,X291,X291
DI,3,03NSC-进仓04阻挡1检测,NextStopCheck,8,PRO_AOI_IP_21,0,03NSC-进仓04阻挡1检测,X299,X299
DI,4,04NSC-进仓05阻挡1检测,NextStopCheck,0,PRO_AOI_IP_23,0,04NSC-进仓05阻挡1检测,X321,X321
DI,5,05NSC-进仓06阻挡1检测,NextStopCheck,8,PRO_AOI_IP_23,0,05NSC-进仓06阻挡1检测,X329,X329
DI,6,06NSC-FL1阻挡检测,NextStopCheck,9,PRO_AOI_IP_14,0,进仓06NSC-FL1阻挡检测,X170,X170
DI,102,SL2NSC-进仓07阻挡1检测,NextStopCheck,0,PRO_AOI_IP_25,0,SL2NSC-进仓07阻挡1检测,X351,X351
DI,7,07NSC-进仓08阻挡1检测,NextStopCheck,8,PRO_AOI_IP_25,0,进仓07NSC-进仓08阻挡1检测,X359,X359
DI,8,08NSC-进仓09阻挡1检测,NextStopCheck,0,PRO_AOI_IP_27,0,进仓08NSC-进仓09阻挡1检测,X381,X381
DI,9,09NSC-进仓10阻挡1检测,NextStopCheck,8,PRO_AOI_IP_27,0,进仓09NSC-进仓10阻挡1检测,X389,X389
DI,10,10NSC-环形线横移2阻挡检测,NextStopCheck,2,PRO_AOI_IP_28,0,进仓10NSC-环形线横移2阻挡检测,X403,X403
DI,201,出料1NSC-进仓11阻挡1检测,NextStopCheck,0,PRO_AOI_IP_29,0,出料1NSC-进仓11阻挡1检测,X411,X411
DI,11,11NSC-进仓12阻挡1检测,NextStopCheck,10,PRO_AOI_IP_29,0,11NSC-进仓12阻挡1检测,X421,X421
DI,12,12NSC-出料2阻挡1检测,NextStopCheck,4,PRO_AOI_IP_32,0,12NSC-出料2阻挡1检测,X475,X475
DI,202,出料2NSC-进仓13阻挡1检测,NextStopCheck,0,PRO_AOI_IP_31,0,出料2NSC-进仓13阻挡1检测,X451,X451
DI,13,13NSC-进仓14阻挡1检测,NextStopCheck,10,PRO_AOI_IP_31,0,13NSC-进仓14阻挡1检测,X461,X461
DI,14,14NSC-进仓15阻挡1检测,NextStopCheck,0,PRO_AOI_IP_33,0,14NSC-进仓15阻挡1检测,X491,X491
DI,15,15NSC-进仓16阻挡1检测,NextStopCheck,10,PRO_AOI_IP_33,0,15NSC-进仓16阻挡1检测,X501,X501
DI,16,16NSC-出料3阻挡1检测,NextStopCheck,4,PRO_AOI_IP_34,0,16NSC-出料3阻挡1检测,X515,X515
DI,203,出料3NSC-进仓17阻挡1检测,NextStopCheck,0,PRO_AOI_IP_35,0,出料3NSC-进仓17阻挡1检测,X531,X531
DI,17,17NSC-进仓18阻挡1检测,NextStopCheck,10,PRO_AOI_IP_35,0,17NSC-进仓18阻挡1检测,X541,X541
DI,18,18NSC-出料4阻挡1检测,NextStopCheck,4,PRO_AOI_IP_36,0,18NSC-出料4阻挡1检测,X555,X555
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/LineConfig/Config_Line.csv
...@@ -33,23 +33,23 @@ PRO,0,D12-2移栽23-托盘-RFID-IP,PRO_RFIP_023,192.168.210.103,, ...@@ -33,23 +33,23 @@ PRO,0,D12-2移栽23-托盘-RFID-IP,PRO_RFIP_023,192.168.210.103,,
PRO,0,D12-1移栽24-托盘-RFID-IP,PRO_RFIP_024,192.168.210.104,, PRO,0,D12-1移栽24-托盘-RFID-IP,PRO_RFIP_024,192.168.210.104,,
PRO,0,横移-HY1-托盘-RFID-IP,PRO_RFIP_201,192.168.210.144,, PRO,0,横移-HY1-托盘-RFID-IP,PRO_RFIP_201,192.168.210.144,,
PRO,0,横移-HY2-托盘-RFID-IP,PRO_RFIP_202,192.168.210.145,, PRO,0,横移-HY2-托盘-RFID-IP,PRO_RFIP_202,192.168.210.145,,
PRO,0,横移-HY3-托盘-RFID-IP,PRO_RFIP_203,,, ,0,横移-HY3-托盘-RFID-IP,PRO_RFIP_203,,,
PRO,0,横移-HY4-托盘-RFID-IP,PRO_RFIP_204,192.168.210.146,, PRO,0,横移-HY4-托盘-RFID-IP,PRO_RFIP_204,192.168.210.146,,
PRO,0,横移-HY5-托盘-RFID-IP,PRO_RFIP_205,,, ,0,横移-HY5-托盘-RFID-IP,PRO_RFIP_205,,,
PRO,0,横移-HY6-托盘-RFID-IP,PRO_RFIP_206,192.168.210.137,, PRO,0,横移-HY6-托盘-RFID-IP,PRO_RFIP_206,192.168.210.137,,
PRO,0,横移-HY7-托盘-RFID-IP,PRO_RFIP_207,,, ,0,横移-HY7-托盘-RFID-IP,PRO_RFIP_207,,,
PRO,0,横移-HY8-托盘-RFID-IP,PRO_RFIP_208,192.168.210.123,, PRO,0,横移-HY8-托盘-RFID-IP,PRO_RFIP_208,192.168.210.123,,
PRO,0,横移-HY9-托盘-RFID-IP,PRO_RFIP_209,192.168.210.135,, PRO,0,横移-HY9-托盘-RFID-IP,PRO_RFIP_209,192.168.210.135,,
PRO,0,横移-HY10-托盘-RFID-IP,PRO_RFIP_210,192.168.210.136,, PRO,0,横移-HY10-托盘-RFID-IP,PRO_RFIP_210,192.168.210.136,,
PRO,0,横移-HY11-托盘-RFID-IP,PRO_RFIP_211,192.168.210.127,, PRO,0,横移-HY11-托盘-RFID-IP,PRO_RFIP_211,192.168.210.127,,
PRO,0,横移-HY12-托盘-RFID-IP,PRO_RFIP_212,192.168.210.128,, PRO,0,横移-HY12-托盘-RFID-IP,PRO_RFIP_212,192.168.210.128,,
PRO,0,横移-HY13-托盘-RFID-IP,PRO_RFIP_213,192.168.210.115,, PRO,0,横移-HY13-托盘-RFID-IP,PRO_RFIP_213,192.168.210.115,,
PRO,0,横移-HY14-托盘-RFID-IP,PRO_RFIP_214,,, ,0,横移-HY14-托盘-RFID-IP,PRO_RFIP_214,,,
PRO,0,横移-HY15-托盘-RFID-IP,PRO_RFIP_215,192.168.210.107,, PRO,0,横移-HY15-托盘-RFID-IP,PRO_RFIP_215,192.168.210.107,,
PRO,0,横移-HY16-托盘-RFID-IP,PRO_RFIP_216,192.168.210.102,, PRO,0,横移-HY16-托盘-RFID-IP,PRO_RFIP_216,192.168.210.102,,
PRO,0,横移-HY17-托盘-RFID-IP,PRO_RFIP_217,192.168.210.101,, PRO,0,横移-HY17-托盘-RFID-IP,PRO_RFIP_217,192.168.210.101,,
PRO,0,横移-HY18-托盘-RFID-IP,PRO_RFIP_218,192.168.210.110,, PRO,0,横移-HY18-托盘-RFID-IP,PRO_RFIP_218,192.168.210.110,,
PRO,0,横移-HY19-托盘-RFID-IP,PRO_RFIP_219,,, ,0,横移-HY19-托盘-RFID-IP,PRO_RFIP_219,,,
PRO,0,横移-HY20-托盘-RFID-IP,PRO_RFIP_220,192.168.210.111,, PRO,0,横移-HY20-托盘-RFID-IP,PRO_RFIP_220,192.168.210.111,,
PRO,0,横移-HY21-托盘-RFID-IP,PRO_RFIP_221,192.168.210.105,, PRO,0,横移-HY21-托盘-RFID-IP,PRO_RFIP_221,192.168.210.105,,
PRO,0,上料模块T1-料架-RFID-IP,PRO_RFIP_101,192.168.210.142,, PRO,0,上料模块T1-料架-RFID-IP,PRO_RFIP_101,192.168.210.142,,
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -578,9 +578,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -578,9 +578,9 @@ namespace OnlineStore.DeviceLibrary
//托盘卡的信号不报警，只提示 //托盘卡的信号不报警，只提示
// [_进仓_14-SMove] [CheckFixture] [MO_17_Stop2Check] 等待[X462 - 进仓14阻挡2托盘检测 - StopCylinder_Check2 = LOW] 超时[181.7]秒 // [_进仓_14-SMove] [CheckFixture] [MO_17_Stop2Check] 等待[X462 - 进仓14阻挡2托盘检测 - StopCylinder_Check2 = LOW] 超时[181.7]秒
if (moveInfo.MoveType.Equals(LineMoveType.CheckFixture) && if (moveInfo.MoveType.Equals(LineMoveType.CheckFixture) &&
(moveInfo.MoveStep.Equals(LineMoveStep.MIO_00_Stop1Down) || (moveInfo.IsStep(LineMoveStep.MIO_00_Stop1Down) ||
moveInfo.MoveStep.Equals(LineMoveStep.MIO_01_TrayCheck) || moveInfo.IsStep(LineMoveStep.MIO_01_TrayCheck) ||
moveInfo.MoveStep.Equals(LineMoveStep.MO_17_Stop2Check))) moveInfo.IsStep(LineMoveStep.MO_17_Stop2Check)))
{ {
return true; return true;
} }
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -867,7 +867,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -867,7 +867,7 @@ namespace OnlineStore.DeviceLibrary
} }
//等待200毫秒后停止转动 //等待200毫秒后停止转动
Thread.Sleep(5000); Thread.Sleep(5000);
if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_05_LineStart)) if (MoveInfo.IsStep(LineMoveStep.FI_05_LineStart))
{ {
LogUtil.info(logName + " 等待5000后, MoveInfo.MoveType= FI_03_LineStart 不需要停止链条转动"); LogUtil.info(logName + " 等待5000后, MoveInfo.MoveType= FI_03_LineStart 不需要停止链条转动");
} }
......
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -64,6 +64,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -64,6 +64,7 @@ namespace OnlineStore.DeviceLibrary
baseConfig = lineConfig; baseConfig = lineConfig;
this.Config = lineConfig; this.Config = lineConfig;
this.DeviceID = lineConfig.Id; this.DeviceID = lineConfig.Id;
T3C1_MoveInfo = new LineMoveInfo(DeviceID, " T3-C1 ");
//SW41_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-41"); //SW41_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-41");
//SW23_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-23"); //SW23_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-23");
//Shunt_MoveInfo = new LineMoveInfo(DeviceID, "分流横移1"); //Shunt_MoveInfo = new LineMoveInfo(DeviceID, "分流横移1");
...@@ -1029,7 +1030,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1029,7 +1030,7 @@ namespace OnlineStore.DeviceLibrary
msg += " " + lineStatus + "\n"; msg += " " + lineStatus + "\n";
msg += "alarm： " + alarmType + "\n"; msg += "alarm： " + alarmType + "\n";
msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.SLog + "\n"; msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.SLog + "\n";
msg += "T3C1：" + T3C1__MoveInfo.MoveType + " " + T3C1__MoveInfo.MoveStep + "\n"; msg += "T3C1：" + T3C1_MoveInfo.MoveType + " " + T3C1_MoveInfo.MoveStep + "\n";
//msg += "横移41托盘：" + Sw41TrayNum.ToString().PadLeft(2,'0') + "：" + SW41_MoveInfo.MoveType + " " + SW41_MoveInfo.MoveStep + "\n"; //msg += "横移41托盘：" + Sw41TrayNum.ToString().PadLeft(2,'0') + "：" + SW41_MoveInfo.MoveType + " " + SW41_MoveInfo.MoveStep + "\n";
//msg += "横移23托盘：" + Sw23TrayNum.ToString().PadLeft(2,'0') + "：" + SW23_MoveInfo.MoveType + " " + SW23_MoveInfo.MoveStep + "\n"; //msg += "横移23托盘：" + Sw23TrayNum.ToString().PadLeft(2,'0') + "：" + SW23_MoveInfo.MoveType + " " + SW23_MoveInfo.MoveStep + "\n";
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -198,7 +198,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -198,7 +198,7 @@ namespace OnlineStore.DeviceLibrary
// 在 OnlineStore.DeviceLibrary.LineBean.CheckWait(LineMoveInfo checkWaitInfo) 位置 E:\VSSource\RC1250_佳士达\RC1250-AssemblyLine\source\DeviceLibrary\assemblyLine\LineBean_Partial.cs:行号 89 // 在 OnlineStore.DeviceLibrary.LineBean.CheckWait(LineMoveInfo checkWaitInfo) 位置 E:\VSSource\RC1250_佳士达\RC1250-AssemblyLine\source\DeviceLibrary\assemblyLine\LineBean_Partial.cs:行号 89
if (ex is System.IndexOutOfRangeException) if (ex is System.IndexOutOfRangeException)
{ {
if (checkWaitInfo.MoveStep.Equals(LineMoveStep.SW06_TopCylinderUp)) if (checkWaitInfo.IsStep(LineMoveStep.SW06_TopCylinderUp))
{ {
LogUtil.error(checkWaitInfo.Name + " 当前步骤：SW06_TopCylinderUp，IndexOutOfRangeException异常，自动回到上一个步骤 SW05_LocationDown,等待500 重新开始 "); LogUtil.error(checkWaitInfo.Name + " 当前步骤：SW06_TopCylinderUp，IndexOutOfRangeException异常，自动回到上一个步骤 SW05_LocationDown,等待500 重新开始 ");
checkWaitInfo.NextMoveStep(LineMoveStep.SW05_LocationDown); checkWaitInfo.NextMoveStep(LineMoveStep.SW05_LocationDown);
...@@ -331,7 +331,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -331,7 +331,7 @@ namespace OnlineStore.DeviceLibrary
{ {
return true; return true;
} }
else if (move.MoveInfo.MoveStep.Equals(LineMoveStep.MO_57_CylinderAfter) && move.MoveInfo.IsInWait.Equals(false) else if (move.MoveInfo.IsStep(LineMoveStep.MO_57_CylinderAfter) && move.MoveInfo.IsInWait.Equals(false)
&&move.CylinderIsOk(IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After)) &&move.CylinderIsOk(IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After))
{ {
return true; return true;
...@@ -391,7 +391,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -391,7 +391,7 @@ namespace OnlineStore.DeviceLibrary
currTrayNum = -1; currTrayNum = -1;
if (deviceID.Equals(103)) if (deviceID.Equals(103))
{ {
if (T3C1__MoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && T3C1__MoveInfo.MoveStep.Equals(LineMoveStep.MO_11_CodeRember)) if (T3C1_MoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && T3C1_MoveInfo.IsStep(LineMoveStep.MO_11_CodeRember))
{ {
currTrayNum = T3C1_TrayNum; currTrayNum = T3C1_TrayNum;
return true; return true;
......
source/DeviceLibrary/model/LineMoveInfo.cs
...@@ -82,6 +82,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -82,6 +82,10 @@ namespace OnlineStore.DeviceLibrary
{ {
get { return moveStep; } get { return moveStep; }
} }
public bool IsStep(LineMoveStep step)
{
return (MoveStep.Equals(step));
}
public string SLog public string SLog
{ {
get { return " "+MoveStep + " "; } get { return " "+MoveStep + " "; }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!