Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 07422564
由
LN
编写于
2020-04-20 14:19:09 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
入料四托盘号错乱
1 个父辈
659aa28f
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
10 行增加
和
8 行删除
source/DeviceLibrary/assemblyLine/EquipBase.cs
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
source/DeviceLibrary/assemblyLine/EquipBase.cs
查看文件 @
0742256
...
@@ -303,7 +303,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -303,7 +303,7 @@ namespace OnlineStore.DeviceLibrary
Thread
.
Sleep
(
30
);
Thread
.
Sleep
(
30
);
}
}
}
}
internal
bool
UpdateTrayNum
()
internal
bool
UpdateTrayNum
()
{
{
trayCount
++;
trayCount
++;
...
...
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
查看文件 @
0742256
...
@@ -463,8 +463,8 @@ namespace OnlineStore.DeviceLibrary
...
@@ -463,8 +463,8 @@ namespace OnlineStore.DeviceLibrary
{
{
SW41_MoveInfo
.
NewMove
(
LineMoveType
.
InStore
);
SW41_MoveInfo
.
NewMove
(
LineMoveType
.
InStore
);
SW41_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW00_Wait
);
SW41_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW00_Wait
);
UpateSw41TrayNum
();
//
UpateSw41TrayNum();
LogUtil
.
info
(
Name
+
"横移轨道41:检测到SW4_StopCheck, 开始处理托盘
,更新托盘号 ["
+
Sw41TrayNum
+
"]
"
);
LogUtil
.
info
(
Name
+
"横移轨道41:检测到SW4_StopCheck, 开始处理托盘 "
);
//CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW4_LocationCylinder_Down);
//CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW4_LocationCylinder_Down);
//CylinderMove(SW41_MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
//CylinderMove(SW41_MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
//阻挡气缸下降500毫秒然后上升
//阻挡气缸下降500毫秒然后上升
...
@@ -511,8 +511,8 @@ namespace OnlineStore.DeviceLibrary
...
@@ -511,8 +511,8 @@ namespace OnlineStore.DeviceLibrary
{
{
SW23_MoveInfo
.
NewMove
(
LineMoveType
.
InStore
);
SW23_MoveInfo
.
NewMove
(
LineMoveType
.
InStore
);
SW23_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW00_Wait
);
SW23_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW00_Wait
);
UpateSw23TrayNum
();
//
UpateSw23TrayNum();
LogUtil
.
info
(
Name
+
"横移轨道23:检测到SW2_StopCheck, 开始处理托盘
,更新托盘号 ["
+
Sw23TrayNum
+
"]
"
);
LogUtil
.
info
(
Name
+
"横移轨道23:检测到SW2_StopCheck, 开始处理托盘 "
);
//CylinderMove(SW23_MoveInfo, IO_Type.SW2_LocationCylinder_Up, IO_Type.SW2_LocationCylinder_Down);
//CylinderMove(SW23_MoveInfo, IO_Type.SW2_LocationCylinder_Up, IO_Type.SW2_LocationCylinder_Down);
//CylinderMove(SW23_MoveInfo, IO_Type.SW3_LocationCylinder_Up, IO_Type.SW3_LocationCylinder_Down);
//CylinderMove(SW23_MoveInfo, IO_Type.SW3_LocationCylinder_Up, IO_Type.SW3_LocationCylinder_Down);
//阻挡气缸下降500毫秒然后上升
//阻挡气缸下降500毫秒然后上升
...
@@ -599,8 +599,9 @@ namespace OnlineStore.DeviceLibrary
...
@@ -599,8 +599,9 @@ namespace OnlineStore.DeviceLibrary
else
if
(
SW41_MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
SW02_WaitCheckTime
))
else
if
(
SW41_MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
SW02_WaitCheckTime
))
{
{
UpateSw41TrayNum
();
SW41_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW03_WaitTime
);
SW41_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW03_WaitTime
);
SWLog
(
"横移轨道41: 等待横移4托盘检测信号 , SW012_WaitTime "
+
TrayManager
.
SwTrayWaitTime
);
SWLog
(
"横移轨道41: 等待横移4托盘检测信号 , SW012_WaitTime "
+
TrayManager
.
SwTrayWaitTime
+
",更新托盘号【"
+
Sw41TrayNum
+
"】"
);
CheckAndMove
(
IO_Type
.
SW4_StopDown
,
IO_VALUE
.
LOW
);
CheckAndMove
(
IO_Type
.
SW4_StopDown
,
IO_VALUE
.
LOW
);
// SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
// SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
SW41_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SW4_TrayCheck
,
IO_VALUE
.
HIGH
));
SW41_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SW4_TrayCheck
,
IO_VALUE
.
HIGH
));
...
@@ -778,7 +779,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -778,7 +779,7 @@ namespace OnlineStore.DeviceLibrary
if
(
equip
.
CurrTrayIsNeed
(
trayNum
,
false
))
if
(
equip
.
CurrTrayIsNeed
(
trayNum
,
false
))
{
{
return
true
;
return
true
;
}
}
}
}
}
}
return
false
;
return
false
;
...
@@ -811,8 +812,9 @@ namespace OnlineStore.DeviceLibrary
...
@@ -811,8 +812,9 @@ namespace OnlineStore.DeviceLibrary
else
if
(
SW23_MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
SW02_WaitCheckTime
))
else
if
(
SW23_MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
SW02_WaitCheckTime
))
{
{
UpateSw23TrayNum
();
SW23_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW03_WaitTime
);
SW23_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW03_WaitTime
);
SWLog
(
"横移轨道23: 等待横移4托盘检测信号 , SW012_WaitTime "
+
TrayManager
.
SwTrayWaitTime
);
SWLog
(
"横移轨道23: 等待横移4托盘检测信号 , SW012_WaitTime "
+
TrayManager
.
SwTrayWaitTime
+
",更新托盘号【"
+
Sw23TrayNum
+
"】"
);
CheckAndMove
(
IO_Type
.
SW2_StopDown
,
IO_VALUE
.
LOW
);
CheckAndMove
(
IO_Type
.
SW2_StopDown
,
IO_VALUE
.
LOW
);
// SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
// SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
SW23_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SW2_TrayCheck
,
IO_VALUE
.
HIGH
));
SW23_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SW2_TrayCheck
,
IO_VALUE
.
HIGH
));
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论