Skip to content

李娜 / SO664-AssemblyLine

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

C1HY功能完善

1 个父辈 6240cb4a
全部展开
内嵌 并排
正在显示 13 个修改的文件 包含 126 行增加 和 88 行删除
source/AssemblyLineClient/Program.cs
......@@ -53,7 +53,7 @@ namespace OnlineStore.AssemblyLine
/// </summary>
[STAThread]
static void Main(string[] Args)
{
{
//string code = " (X: 380，Y: 148) L00000000000WG9D19055;E20191230 0180;B7H.10618.5B1008082019123004000;R0080820191230E9600";
//string r = CodeManager.ReplaceCode(code);
......
source/DeviceLibrary/LineConfig/Config_Line.csv
......@@ -62,9 +62,9 @@ PRO,0,上料模块T3-C1-托盘-RFID-IP,PRO_RFIP_300,192.168.210.120,,
DI,0,急停,SuddenStop_BTN,0,HC,X00
DI,0,复位,Reset_BTN,1,HC,X01
DI,0,气压检测1,Airpressure_Check,2,HC,X02
DI,217,C7-HY17阻挡托盘检测,HY_StopTray_Check,3,HC,X03
DI,217,C7-HY17前阻挡托盘检测,HY_FrontStopCheck,3,HC,X03
DI,217,HY17横移托盘检测,HY_TrayCheck,4,HC,X04
DI,217,HY17横移顶升上升端,HY_TopCylinder_UP,5,HC,X05
DI,217,HY17横移顶升上升端,HY_TopCylinder_Up,5,HC,X05
DI,217,HY17横移顶升下降端,HY_TopCylinder_Down,6,HC,X06
DI,217,HY17横移定位1上升端,HY_LocationCylinder_Up1,7,HC,X07
DI,217,HY17横移定位1下降端,HY_LocationCylinder_Down1,8,HC,X08
......@@ -82,7 +82,7 @@ DO,0,故障状态（指示灯）,Alarm_HddLed,2,HC,Y02
DO,0,故障状态（蜂鸣器）,Alarm_Buzzer,3,HC,Y03
DO,0,C6/C7/C9线体运转,MotorRun_679,4,HC,Y04
DO,217,HY17横移电机正转,HY_LineRun,5,HC,Y05
DO,217,HY17阻挡下降,HY_StopDown,6,HC,Y06
DO,217,HY17前阻挡下降,HY_FrontStopDown,6,HC,Y06
DO,217,HY17横移顶升上升,HY_TopCylinder_Up,7,HC,Y07
DO,217,HY17横移顶升下降,HY_TopCylinder_Down,8,HC,Y08
DO,217,HY17横移定位上升,HY_LocationCylinder_Up,9,HC,Y09
......@@ -135,9 +135,9 @@ DI,216,HY16前阻挡托盘检测,HY_FrontStopCheck,52,HC,X52
DI,216,HY16横移托盘检测,HY_TrayCheck,53,HC,X53
DI,216,HY16横移顶升上升端,HY_TopCylinder_Up,54,HC,X54
DI,216,HY16横移顶升下降端,HY_TopCylinder_Down,55,HC,X55
DI,216,HY16-C7阻挡上升端,HY_StopCylinder_Up,56,HC,X56
DI,216,HY16-C7阻挡下降端,HY_StopCylinder_Down,57,HC,X57
DI,217,C7-HY17满料检测,HY_TrayImpletion_Check,58,HC,X58
DI,216,HY16-C7阻挡上升端,HY_OL_StopCylinder_Up,56,HC,X56
DI,216,HY16-C7阻挡下降端,HY_OL_StopCylinder_Down,57,HC,X57
DI,217,C7-HY17满料检测,HY_OL_Full_Check,58,HC,X58
,,,,59,HC,X59
,,,,60,HC,X60
,,,,61,HC,X61
......@@ -186,8 +186,8 @@ DO,216,HY16横移顶升上升,HY_TopCylinder_Up,53,HC,Y53
DO,216,HY16横移顶升下降,HY_TopCylinder_Down,54,HC,Y54
DO,216,HY16前阻挡下降,HY_FrontStopDown,55,HC,Y55
DO,216,HY16阻挡下降,HY_StopDown,56,HC,Y56
DO,216,HY16-C7阻挡上升,HY_StopCylinder_Up,57,HC,Y57
DO,216,HY16-C7阻挡下降,HY_StopCylinder_Down,58,HC,Y58
DO,216,HY16-C7阻挡上升,HY_OL_StopCylinder_Up,57,HC,Y57
DO,216,HY16-C7阻挡下降,HY_OL_StopCylinder_Down,58,HC,Y58
DO,0,C1线体电机1/2/3启动,MotorRun_C1_123,59,HC,Y59
,,,,60,HC,Y60
,,,,61,HC,Y61
......@@ -476,7 +476,7 @@ DI,213,HY13前阻挡托盘检测,HY_FrontStopCheck,228,HC,X228
DI,213,HY13横移托盘检测,HY_TrayCheck,229,HC,X229
DI,213,HY13横移顶升上升端,HY_TopCylinder_Up,230,HC,X230
DI,213,HY13横移顶升下降端,HY_TopCylinder_Down,231,HC,X231
DI,213,C6线体HY13侧满料检测,HY_TrayImpletion_Check,232,HC,X232
DI,213,C6线体HY13侧满料检测,HY_OL_Full_Check,232,HC,X232
,,,,233,HC,X233
,,,,234,HC,X234
,,,,235,HC,X235
......@@ -628,15 +628,15 @@ DI,6,D3-2升降下降端,UpDownCylinder_Down,291,HC,X291
DI,208,HY8横移托盘检测,HY_TrayCheck,292,HC,X292
DI,208,HY8横移顶升上升端,HY_TopCylinder_Up,293,HC,X293
DI,208,HY8横移顶升下降端,HY_TopCylinder_Down,294,HC,X294
DI,208,HY8-HY9阻挡上升端,HY_StopCylinder_Up,295,HC,X295
DI,208,HY8-HY9阻挡下降端,HY_StopCylinder_Down,296,HC,X296
DI,209,HY8-HY9阻挡上升端,HY_StopCylinder_Up,295,HC,X295
DI,209,HY8-HY9阻挡下降端,HY_StopCylinder_Down,296,HC,X296
DI,209,HY9前阻挡托盘检测,HY_FrontStopCheck,297,HC,X297
DI,209,HY9横移托盘检测,HY_TrayCheck,298,HC,X298
DI,209,HY9横移顶升上升端,HY_TopCylinder_Up,299,HC,X299
DI,209,HY9横移顶升下降端,HY_TopCylinder_Down,300,HC,X300
DI,209,C4-HY9阻挡上升端,HY_StopCylinder_Up,301,HC,X301
DI,209,C4-HY9阻挡下降端,HY_StopCylinder_Down,302,HC,X302
DI,209,C4-HY9阻挡托盘检测,HY_StopTray_Check,303,HC,X303
DI,209,C4-HY9阻挡上升端,HY_OL_StopCylinder_Up,301,HC,X301
DI,209,C4-HY9阻挡下降端,HY_OL_StopCylinder_Down,302,HC,X302
DI,209,C4-HY9阻挡托盘检测,HY_OL_Tray_Check,303,HC,X303
,,,,,,
,,,,,,
DO,5,D3-1阻挡1下降,StopDown1,240,HC,Y240
......@@ -664,8 +664,8 @@ DO,208,HY8横移电机反转,HY_LineBackRun,261,HC,Y261
DO,208,HY8横移顶升上升,HY_TopCylinder_Up,262,HC,Y262
DO,208,HY8横移顶升下降,HY_TopCylinder_Down,263,HC,Y263
DO,208,HY8阻挡下降,HY_StopDown,264,HC,Y264
DO,208,HY8-HY9阻挡上升,HY_StopCylinder_Up,265,HC,Y265
DO,208,HY8-HY9阻挡下降,HY_StopCylinder_Down,266,HC,Y266
DO,209,HY8-HY9阻挡上升,HY_StopCylinder_Up,265,HC,Y265
DO,209,HY8-HY9阻挡下降,HY_StopCylinder_Down,266,HC,Y266
DO,209,HY9横移电机正转,HY_LineRun,267,HC,Y267
DO,209,HY9横移电机反转,HY_LineBackRun,268,HC,Y268
,,,,269,HC,Y269
......@@ -719,7 +719,7 @@ DI,206,HY6前阻挡托盘检测,HY_FrontStopCheck,344,HC,X344
DI,206,HY6横移托盘检测,HY_TrayCheck,345,HC,X345
DI,206,HY6横移顶升上升端,HY_TopCylinder_Up,346,HC,X346
DI,206,HY6横移顶升下降端,HY_TopCylinder_Down,347,HC,X347
DI,206,C3线体HY6侧满料检测,HY_TrayImpletion_Check,348,HC,X348
DI,206,C3线体HY6侧满料检测,HY_OL_Full_Check,348,HC,X348
,,,,349,HC,X349
,,,,350,HC,X350
,,,,351,HC,X351
......@@ -902,11 +902,11 @@ DI,202,HY2横移定位1上升端,HY_LocationCylinder_Up1,436,HC,X436
DI,202,HY2横移定位1下降端,HY_LocationCylinder_Down1,437,HC,X437
DI,202,HY2横移定位2上升端,HY_LocationCylinder_Up2,438,HC,X438
DI,202,HY2横移定位2下降端,HY_LocationCylinder_Down2,439,HC,X439
DI,204,HY4横移托盘检测,HY_TrayCheck,440,HC,X440
DI,204,HY4横移顶升上升端,HY_TopCylinder_Up,441,HC,X441
DI,204,HY4横移顶升下降端,HY_TopCylinder_Down,442,HC,X442
DI,204,C2线体HY4侧满料检测,HY_TrayImpletion_Check,443,HC,X443
,,,,444,HC,X444
DI,204,HY4前阻挡托盘检测,HY_FrontStopCheck,440,HC,X440
DI,204,HY4横移托盘检测,HY_TrayCheck,441,HC,X441
DI,204,HY4横移顶升上升端,HY_TopCylinder_Up,442,HC,X442
DI,204,HY4横移顶升下降端,HY_TopCylinder_Down,443,HC,X443
DI,204,C2线体HY4侧满料检测,HY_OL_Full_Check,444,HC,X444
,,,,445,HC,X445
,,,,446,HC,X446
,,,,447,HC,X447
......@@ -1015,18 +1015,18 @@ DO,15,D8-2夹料放松,ClampCylinder_Relax,415,HC,Y415
,,,,,,
,,XT8,XT8,,,
,,HY5&HY7&HY10&J1,HY5&HY7&HY10&J1,,,
DI,205,C2-HY5阻挡托盘检测,HY_StopTray_Check,480,HC,X480
DI,205,C2-HY5短线前阻挡托盘检测,HY_ShortL_StopCheck,480,HC,X480
DI,205,HY5横移托盘检测,HY_TrayCheck,481,HC,X481
DI,205,HY5横移顶升上升端,HY_TopCylinder_Up,482,HC,X482
DI,205,HY5横移顶升下降端,HY_TopCylinder_Down,483,HC,X483
DI,205,C8线体HY5侧满料检测,HY_TrayImpletion_Check,484,HC,X484
DI,205,C8线体HY5侧满料检测,HY_OL_Full_Check,484,HC,X484
DI,207,HY7横移托盘检测,HY_TrayCheck,485,HC,X485
DI,207,HY7横移顶升上升端,HY_TopCylinder_Up,486,HC,X486
DI,207,HY7横移顶升下降端,HY_TopCylinder_Down,487,HC,X487
DI,207,C3-HY7阻挡托盘检测,HY_StopTray_Check,488,HC,X488
DI,207,C8-HY7阻挡托盘检测,HY_StopTray_Check2,489,HC,X489
DI,207,C8线体HY7侧满料检测,HY_TrayImpletion_Check,490,HC,X490
DI,209,C4-HY9满料检测,HY_TrayImpletion_Check,491,HC,X491
DI,207,C3-HY7短线前阻挡托盘检测,HY_ShortL_StopCheck,488,HC,X488
DI,207,C8-HY7长线前阻挡托盘检测,HY_LongL_StopCheck,489,HC,X489
DI,207,C8线体HY7侧满料检测,HY_OL_Full_Check,490,HC,X490
DI,209,C4-HY9满料检测,HY_OL_Full_Check,491,HC,X491
DI,210,HY10前阻挡托盘检测,HY_FrontStopCheck,492,HC,X492
DI,210,HY10横移托盘检测,HY_TrayCheck,493,HC,X493
DI,210,HY10横移顶升上升端,HY_TopCylinder_Up,494,HC,X494
......@@ -1054,12 +1054,12 @@ DO,0,C2/C3/C4/C5/C8线体运转,MotorRun_23458,417,HC,Y417
DO,205,HY5横移电机正转,HY_LineRun,418,HC,Y418
DO,205,HY5横移顶升上升,HY_TopCylinder_Up,419,HC,Y419
DO,205,HY5横移顶升下降,HY_TopCylinder_Down,420,HC,Y420
DO,205,C2-HY5阻挡下降,HY_StopDown,421,HC,Y421
DO,205,C2-HY5短线前阻挡下降,HY_ShortL_StopDown,421,HC,Y421
DO,207,HY7横移电机正转,HY_LineRun,422,HC,Y422
DO,207,HY7横移顶升上升,HY_TopCylinder_Up,423,HC,Y423
DO,207,HY7横移顶升下降,HY_TopCylinder_Down,424,HC,Y424
DO,207,C3-HY7阻挡下降,HY_StopDown,425,HC,Y425
DO,207,C8-HY7阻挡下降,HY_SideStopDown,426,HC,Y426
DO,207,C3-HY7短线前阻挡下降,HY_ShortL_StopDown,425,HC,Y425
DO,207,C8-HY7长线前阻挡下降,HY_LongL_StopDown,426,HC,Y426
DO,210,HY10横移电机正转,HY_LineRun,427,HC,Y427
DO,210,HY10前阻挡下降,HY_FrontStopDown,428,HC,Y428
DO,210,HY10横移顶升上升,HY_TopCylinder_Up,429,HC,Y429
......@@ -1074,8 +1074,8 @@ DO,209,HY9横移顶升上升,HY_TopCylinder_Up,437,HC,Y437
DO,209,HY9横移顶升下降,HY_TopCylinder_Down,438,HC,Y438
DO,209,HY9前阻挡下降,HY_FrontStopDown,439,HC,Y439
DO,209,HY9阻挡下降,HY_StopDown,440,HC,Y440
DO,209,C4-HY9阻挡上升,HY_StopCylinder_Up,441,HC,Y441
DO,209,C4-HY9阻挡下降,HY_StopCylinder_Down,442,HC,Y442
DO,209,C4-HY9阻挡上升,HY_OL_StopCylinder_Up,441,HC,Y441
DO,209,C4-HY9阻挡下降,HY_OL_StopCylinder_Down,442,HC,Y442
,,,,443,HC,Y443
,,,,444,HC,Y444
,,,,445,HC,Y445
......@@ -1127,7 +1127,7 @@ DI,211,HY11前阻挡托盘检测,HY_FrontStopCheck,550,HC,X550
DI,211,HY11横移托盘检测,HY_TrayCheck,551,HC,X551
DI,211,HY11横移顶升上升端,HY_TopCylinder_Up,552,HC,X552
DI,211,HY11横移顶升下降端,HY_TopCylinder_Down,553,HC,X553
DI,211,C5-HY11阻挡托盘检测,HY_StopTray_Check,554,HC,X554
DI,211,C5-HY11阻挡托盘检测,HY_OL_Tray_Check,554,HC,X554
DI,0,T3-C1前阻挡托盘检测,HY_FrontStopCheck,555,HC,X555
DI,0,T3-C1阻挡托盘检测,HY_TrayCheck,556,HC,X556
DI,0,T3-C1顶升上升端,HY_TopCylinder_Up,557,HC,X557
......@@ -1178,7 +1178,7 @@ DO,211,HY11横移顶升上升,HY_TopCylinder_Up,487,HC,Y487
DO,211,HY11横移顶升下降,HY_TopCylinder_Down,488,HC,Y488
DO,211,HY11前阻挡下降,HY_FrontStopDown,489,HC,Y489
DO,211,HY11阻挡下降,HY_StopDown,490,HC,Y490
DO,211,C5-HY11阻挡下降,HY_SideStopDown,491,HC,Y491
DO,211,C5-HY11阻挡下降,HY_OL_StopDown,491,HC,Y491
DO,0,T3-C1前阻挡下降,HY_FrontStopDown,492,HC,Y492
DO,0,T3-C1阻挡下降,HY_StopDown,493,HC,Y493
DO,0,T3-C1顶升上升,HY_TopCylinder_Up,494,HC,Y494
......@@ -1188,13 +1188,13 @@ DO,0,T3-C1顶升下降,HY_TopCylinder_Down,495,HC,Y495
,,,,,,
,,XT10,XT10,,,
,,HY12&HY14&J2,HY12&HY14&J2,,,
DI,214,C6-HY14阻挡托盘检测,HY_StopTray_Check,560,HC,X560
DI,214,C6-HY14短线前阻挡托盘检测,HY_ShortL_StopCheck,560,HC,X560
DI,214,HY14横移托盘检测,HY_TrayCheck,561,HC,X561
DI,214,C9-HY14阻挡托盘检测,HY_StopTray_Check2,562,HC,X562
DI,214,C9-HY14长线前阻挡托盘检测,HY_LongL_StopCheck,562,HC,X562
DI,214,HY14横移顶升上升端,HY_TopCylinder_Up,563,HC,X563
DI,214,HY14横移顶升下降端,HY_TopCylinder_Down,564,HC,X564
DI,211,C5-HY11满料检测,HY_TrayImpletion_Check,565,HC,X565
DI,212,C9-HY12阻挡托盘检测,HY_StopTray_Check,566,HC,X566
DI,211,C5-HY11满料检测,HY_OL_Full_Check,565,HC,X565
DI,212,C9-HY12前阻挡托盘检测,HY_FrontStopCheck,566,HC,X566
DI,212,HY12横移托盘检测,HY_TrayCheck,567,HC,X567
DI,212,HY12横移顶升上升端,HY_TopCylinder_Up,568,HC,X568
DI,212,HY12横移顶升下降端,HY_TopCylinder_Down,569,HC,X569
......@@ -1221,8 +1221,8 @@ DI,212,HY12接驳台料盘检测15寸,HY_TrayCheck4,581,HC,X581
,,,,590,HC,X590
,,,,591,HC,X591
,,,,,,
DO,214,C6-HY14阻挡下降,HY_StopCylinder_Up,496,HC,Y496
DO,214,C9-HY14阻挡下降,HY_StopCylinder_Down,497,HC,Y497
DO,214,C6-HY14短线前阻挡下降,HY_ShortL_StopDown,496,HC,Y496
DO,214,C9-HY14长线前阻挡下降,HY_LongL_StopDown,497,HC,Y497
DO,214,HY14横移电机正转,HY_LineRun,498,HC,Y498
DO,214,HY14横移顶升上升,HY_TopCylinder_Up,499,HC,Y499
DO,214,HY14横移顶升下降,HY_TopCylinder_Down,500,HC,Y500
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
......@@ -250,7 +250,7 @@ namespace OnlineStore.DeviceLibrary
}
internal virtual void OpenStopCylinder()
internal virtual void OpenStopBlock()
{
preRWTime = DateTime.Now;
if (baseConfig.DType.Equals(DeviceType.MoveEquip) )
......@@ -271,7 +271,7 @@ namespace OnlineStore.DeviceLibrary
}
}
internal virtual bool OpenStopCylinderOk(TimeSpan span)
internal virtual bool OpenStopBlockOk(TimeSpan span)
{
TimeSpan rwSpan = DateTime.Now - preRWTime;
if (baseConfig.DType.Equals(DeviceType.MoveEquip) )
......@@ -294,7 +294,7 @@ namespace OnlineStore.DeviceLibrary
}
return false;
}
internal virtual void CloseCylinderStop()
internal virtual void CloseStopBlock()
{
if (baseConfig.DType.Equals(DeviceType.MoveEquip) )
{
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
......@@ -464,7 +464,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 下降所有阻挡气缸
/// </summary>
internal override void OpenStopCylinder()
internal override void OpenStopBlock()
{
//if (Config.SidesWayNum <= 0)
//{
......@@ -480,7 +480,7 @@ namespace OnlineStore.DeviceLibrary
//}
//CylinderMove(null, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
}
internal override void CloseCylinderStop()
internal override void CloseStopBlock()
{
//if (Config.SidesWayNum <= 0)
//{
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
......@@ -602,7 +602,7 @@ namespace OnlineStore.DeviceLibrary
#region 阻挡气缸处理
internal override void OpenStopCylinder()
internal override void OpenStopBlock()
{
preRWTime = DateTime.Now;
......@@ -613,7 +613,7 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(null, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
CylinderMove(null, IO_Type.HY_LocationCylinder_Up, IO_Type.HY_LocationCylinder_Down);
}
internal override bool OpenStopCylinderOk(TimeSpan span)
internal override bool OpenStopBlockOk(TimeSpan span)
{
TimeSpan rwSpan = DateTime.Now - preRWTime;
......@@ -628,12 +628,12 @@ namespace OnlineStore.DeviceLibrary
else if (rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6 && span.TotalSeconds < LineManager.Config.IOSingle_TimerOut * 2)
{
preRWTime = DateTime.Now;
OpenStopCylinder();
OpenStopBlock();
}
return false;
}
internal override void CloseCylinderStop()
internal override void CloseStopBlock()
{
LogInfo("CloseCylinderStop: 上升阻挡气缸，上下气缸上升，顶升气缸下降");
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs
......@@ -59,26 +59,15 @@ namespace OnlineStore.DeviceLibrary
ResetClearData();
lineStatus = LineStatus.ResetMove;
MoveInfo.NextMoveStep(LineMoveStep.HY_R_01StopMove);
if (IsDebug)
{
IOMove(IO_Type.StopDown1, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
}
else
{
IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
}
if (IsDebug)
{
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH);
IOMove(IO_Type.HY_SideStopDown, IO_VALUE.HIGH);
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH);
IOMove(IO_Type.HY_StopDown, IO_VALUE.HIGH);
}
else
{
IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
IOMove(IO_Type.HY_SideStopDown, IO_VALUE.LOW);
IOMove(IO_Type.HY_StopDown, IO_VALUE.LOW);
}
LineStop();
......
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -294,7 +294,7 @@ namespace OnlineStore.DeviceLibrary
{
if (moveEquip.IsDebug)
{
moveEquip.OpenStopCylinder();
moveEquip.OpenStopBlock();
}
else
{
......@@ -433,7 +433,7 @@ namespace OnlineStore.DeviceLibrary
else
{
LogUtil.info(Name + "收到复位信号，" + equip.Name + " 调试中，需要下降阻挡气缸");
equip.OpenStopCylinder();
equip.OpenStopBlock();
}
}
......@@ -455,7 +455,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
equip.CloseCylinderStop();
equip.CloseStopBlock();
}
}
MoveInfo.EndMove();
......@@ -522,7 +522,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
equip.CloseCylinderStop();
equip.CloseStopBlock();
}
}
......@@ -899,7 +899,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
equip.CloseCylinderStop();
equip.CloseStopBlock();
}
}
MoveInfo.EndMove();
......@@ -931,7 +931,7 @@ namespace OnlineStore.DeviceLibrary
if (equip.IsDebug)
{
if (!equip.OpenStopCylinderOk(span))
if (!equip.OpenStopBlockOk(span))
{
msg = equip.Name + "下降阻挡气缸";
TimeSpan rwSpan = DateTime.Now - preRWTime;
......@@ -944,7 +944,7 @@ namespace OnlineStore.DeviceLibrary
{
preRWTime = DateTime.Now;
LogUtil.error(Name + "复位中：等待" + msg + "已【" + FormUtil.GetSpanStr(span) + "】重新调用OpenStopCylinder方法");
equip.OpenStopCylinder();
equip.OpenStopBlock();
}
isOk = false;
break;
......
source/DeviceLibrary/deviceLibrary/IO/IOManager.cs
......@@ -81,7 +81,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
if (ioType.Equals(IO_Type.HY_FrontStopDown))
if (ioType.Equals(IO_Type.HY_FrontStopDown)||ioType.Equals(IO_Type.HY_OL_StopDown))
{
}
......@@ -102,7 +102,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
if (ioType.Equals(IO_Type.HY_FrontStopCheck))
if (ioType.Equals(IO_Type.HY_FrontStopCheck)||ioType.Equals(IO_Type.HY_OL_Tray_Check))
{
}
......
source/DeviceLibrary/model/KTK_Store.cs
......@@ -456,6 +456,12 @@ namespace OnlineStore.DeviceLibrary
}
public bool CylinderIsOk(string IoLowType, string IoHighType)
{
if (!baseConfig.DIList.ContainsKey(IoLowType) || (!baseConfig.DIList.ContainsKey(IoHighType)))
{
return true;
}
if (IOManager.DIValue(IoLowType,DeviceID).Equals(IO_VALUE.LOW) && IOManager.DIValue(IoHighType, DeviceID).Equals(IO_VALUE.HIGH)){
return true;
}
......
source/DeviceLibrary/model/StoreStep.cs
......@@ -1264,7 +1264,7 @@ namespace OnlineStore.DeviceLibrary
HY_R_02StopMove,
#endregion
#region 上料横移入口（HY2 ,HY20）托盘处理，51001
#region C1线横移 阻挡托盘检测处理，51001
HY01_Wait = 51001,
/// <summary>
......@@ -1305,7 +1305,7 @@ namespace OnlineStore.DeviceLibrary
#endregion
#region 横移C1->C1分流入口横移操作 ，51011
#region 横移 C1->C1分流入口横移操作 ，51011
/// <summary>
/// 横移C1->C1分流入口：开始横移，顶升上升，定位下降
/// </summary>
......@@ -1347,30 +1347,30 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// C1线->出料线：开始横移，顶升上升
/// </summary>
HY31_OL_TopUp,
HY31_IOL_TopUp=51031,
/// <summary>
/// C1线->出料线：横移电机反转
/// </summary>
HY32_OL_HYLineRun,
HY32_IOL_HYLineRun,
/// <summary>
/// C1线->出料线：等待托盘检测无信号
/// </summary>
HY33_OL_WaitOutCheck,
HY33_IOL_WaitOutCheck,
/// <summary>
/// C1线->出料线：等待托盘检测无信号一段时间
/// </summary>
HY34_OL_WatOutFixture2,
HY34_IOL_WatOutFixture2,
/// <summary>
/// C1线->出料线：电机停止，顶升下降
/// </summary>
HY35_OL_TopDown,
HY35_IOL_TopDown,
/// <summary>
/// C1线->出料线：结束横移处理
/// </summary>
HY36_OL_HYEnd,
HY36_IOL_HYEnd,
#endregion
......@@ -1456,27 +1456,70 @@ namespace OnlineStore.DeviceLibrary
#endregion
#region 分流横移，直接放盘通过处理，51071
#region 出料线->C1线，托盘检测及横移处理，51071
/// <summary>
/// 出料线->C1线托盘检测: 等待检测到出料线托盘
/// </summary>
HY71_OL_Wait = 51071,
/// <summary>
/// 出料线->C1线托盘检测：检测到出料线托盘，所有阻挡上升
/// </summary>
HY72_OL_AllStopUp,
/// <summary>
/// 出料线->C1线：开始横移，顶升上升
/// </summary>
HY73_OL_TopUp,
/// <summary>
/// 出料线->C1线：横移电机正转
/// </summary>
HY74_OL_HYLineRun,
/// <summary>
/// 出料线->C1线：出料线阻挡下降，等待出料线托盘无信号
/// </summary>
HY75_OL_StopDown,
/// <summary>
/// 出料线->C1线：等待托盘到达信号
/// </summary>
HY76_OL_WaitTray,
/// <summary>
/// 出料线->C1线：再次等待500ms，等待托盘到达信号
/// </summary>
HY77_OL_WaitTime,
/// <summary>
/// 出料线->C1线：电机停止，顶升下降 ，出料线阻挡上升
/// </summary>
HY78_OL_TopDown,
/// <summary>
/// 出料线->C1线：结束横移处理
/// </summary>
HY79_OL_HYEnd,
#endregion
#region C1线横移，阻挡托盘放行处理，51091
/// <summary>
/// C1分流横移放盘离开：等待托盘可离开
/// </summary>
HY71_TrayCanGo = 51071,
HY91_TrayCanGo = 51091,
/// <summary>
///C1分流横移放盘离开：阻挡下降
/// </summary>
HY72_StopDown,
HY92_StopDown,
/// <summary>
/// C1分流横移放盘离开： 等待托盘检测无信号
/// </summary>
HY73_Stop2Check,
HY93_Stop2Check,
/// <summary>
/// C1分流横移放盘离开： 延迟500ms后上升阻挡2
/// </summary>
HY74_WaitTime ,
HY94_WaitTime,
/// <summary>
/// C1分流横移放盘离开： 阻挡上升
/// </summary>
HY75_StopDownUp,
HY95_StopDownUp,
#endregion
#endregion
......
source/LoadCVSLibrary/storeConfig/config/DeviceConfig.cs
......@@ -83,7 +83,7 @@ namespace OnlineStore.LoadCSVLibrary
public virtual void LoadConfig(List<ConfigBase> configList)
{
List<string> ioTypeList = IO_Type.GetTypeList();
//ioTypeList = new List<string>();
ioTypeList = new List<string>();
StringBuilder builder = new StringBuilder("\r\n");
StringBuilder proBuilder = new StringBuilder("\r\n");
DIList = new Dictionary<string, ConfigIO>();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!