Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit a1d7de27
由
LN
编写于
2020-07-22 15:12:47 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
分流bug修改
1 个父辈
856c6505
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
16 行增加
和
16 行删除
source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs
查看文件 @
a1d7de2
...
...
@@ -90,8 +90,7 @@ namespace OnlineStore.DeviceLibrary
private
bool
Shunt_Updown2CanUp
()
{
if
(
IOValue
(
IO_Type
.
Shunt_StopDown2_Back
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
Shunt_Check3_Back
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
Shunt_Check4_BStop
).
Equals
(
IO_VALUE
.
LOW
))
&&
IOValue
(
IO_Type
.
Shunt_Check3_Back
).
Equals
(
IO_VALUE
.
LOW
))
{
return
true
;
}
...
...
@@ -175,7 +174,7 @@ namespace OnlineStore.DeviceLibrary
}
//升降2处过托盘
if
(
IOValue
(
IO_Type
.
Shunt_Check4_BStop
).
Equals
(
IO_VALUE
.
HIGH
))
if
(
IOValue
(
IO_Type
.
Shunt_Check4_BStop
).
Equals
(
IO_VALUE
.
HIGH
)
&&
IOValue
(
IO_Type
.
Shunt_StopDown2_Back
).
Equals
(
IO_VALUE
.
LOW
)
)
{
if
(
TrayManager
.
checkWatch
(
shuntCheck4Watch
,
TrayManager
.
SwTrayWaitTime
,
false
))
...
...
@@ -183,9 +182,9 @@ namespace OnlineStore.DeviceLibrary
if
(
ShuntStop2CanDown
())
{
IOMove
(
IO_Type
.
Shunt_StopDown2_Back
,
IO_VALUE
.
HIGH
,
1200
);
shuntCheck4Watch
.
Stop
();
}
}
}
}
else
{
...
...
@@ -219,7 +218,7 @@ namespace OnlineStore.DeviceLibrary
if
(
TrayNeedShunt
(
ShuntTrayNum
,
out
msg
))
{
Shunt_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
Shunt05_Top1Up
);
LogUtil
.
info
(
Name
+
"["
+
ShuntTrayNum
+
"]"
+
"分流横移:分流,阻挡1上升,升降1上升 ,等待升降2是否可上升 "
);
LogUtil
.
info
(
Name
+
"["
+
ShuntTrayNum
+
"]"
+
"分流横移:
"
+
msg
+
" 需要
分流,阻挡1上升,升降1上升 ,等待升降2是否可上升 "
);
CylinderMove
(
Shunt_MoveInfo
,
IO_Type
.
Shunt_TopCylinder_Down1
,
IO_Type
.
Shunt_TopCylinder_Up1
);
if
(
Shunt_Updown2CanUp
())
...
...
@@ -230,7 +229,7 @@ namespace OnlineStore.DeviceLibrary
else
{
Shunt_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
Shunt02_Stop1Down
);
LogUtil
.
info
(
Name
+
"["
+
ShuntTrayNum
+
"]"
+
"
不需要分流,直接放行,Shunt_StopDown1_Front 下降1200 "
);
LogUtil
.
info
(
Name
+
"["
+
ShuntTrayNum
+
"]"
+
"分流横移:
不需要分流,直接放行,Shunt_StopDown1_Front 下降1200 "
);
IOMove
(
IO_Type
.
Shunt_StopDown1_Front
,
IO_VALUE
.
HIGH
,
1200
);
}
}
...
...
@@ -282,7 +281,7 @@ namespace OnlineStore.DeviceLibrary
}
else
if
(
Shunt_MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
Shunt08_DriveMotorMove
))
{
if
(
IOValue
(
IO_Type
.
Shunt_Check2_Middle
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
Shunt_Check
4_BStop
).
Equals
(
IO_VALUE
.
HIGH
))
if
(
IOValue
(
IO_Type
.
Shunt_Check2_Middle
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
Shunt_Check
3_Back
).
Equals
(
IO_VALUE
.
HIGH
))
{
Shunt_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
Shunt09_Top1Down
);
ShuntLog
(
"分流横移:升降1先下降,皮带1停止,等待检测4信号亮 "
);
...
...
@@ -290,18 +289,18 @@ namespace OnlineStore.DeviceLibrary
CylinderMove
(
null
,
IO_Type
.
Shunt_TopCylinder_Up1
,
IO_Type
.
Shunt_TopCylinder_Down1
);
Shunt_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
Shunt10_WaitCheck
);
ShuntLog
(
"分流横移:再次等待检测2low,检测
4
high,停止皮带线1 "
);
ShuntLog
(
"分流横移:再次等待检测2low,检测
3
high,停止皮带线1 "
);
IOMove
(
IO_Type
.
Shunt_MotorRun1
,
IO_VALUE
.
LOW
);
Shunt_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
Shunt_Check
4_BStop
,
IO_VALUE
.
HIGH
));
Shunt_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
Shunt_Check
3_Back
,
IO_VALUE
.
HIGH
));
Shunt_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
Shunt_Check2_Middle
,
IO_VALUE
.
LOW
));
}
}
else
if
(
Shunt_MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
Shunt09_Top1Down
))
{
Shunt_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
Shunt10_WaitCheck
);
ShuntLog
(
"分流横移:再次等待检测2low,检测
4
high,停止皮带线1 "
);
ShuntLog
(
"分流横移:再次等待检测2low,检测
3
high,停止皮带线1 "
);
IOMove
(
IO_Type
.
Shunt_MotorRun1
,
IO_VALUE
.
LOW
);
Shunt_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
Shunt_Check
4_BStop
,
IO_VALUE
.
HIGH
));
Shunt_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
Shunt_Check
3_Back
,
IO_VALUE
.
HIGH
));
Shunt_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
Shunt_Check2_Middle
,
IO_VALUE
.
LOW
));
}
else
if
(
Shunt_MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
Shunt10_WaitCheck
))
...
...
@@ -323,11 +322,11 @@ namespace OnlineStore.DeviceLibrary
{
Shunt_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
Shunt08_DriveMotorMove
);
Shunt_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1500
));
ShuntLog
(
"分流横移:两边皮带线开始转动,等待检测2low,检测
4
high "
);
ShuntLog
(
"分流横移:两边皮带线开始转动,等待检测2low,检测
3
high "
);
IOMove
(
IO_Type
.
Shunt_MotorRun1
,
IO_VALUE
.
HIGH
);
IOMove
(
IO_Type
.
Shunt_MotorRun2
,
IO_VALUE
.
HIGH
);
Shunt_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
Shunt_Check2_Middle
,
IO_VALUE
.
LOW
));
Shunt_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
Shunt_Check
4_BStop
,
IO_VALUE
.
HIGH
));
Shunt_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
Shunt_Check
3_Back
,
IO_VALUE
.
HIGH
));
}
...
...
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
查看文件 @
a1d7de2
...
...
@@ -696,10 +696,11 @@ namespace OnlineStore.DeviceLibrary
{
TrayManager
.
UpdateTrayNumError
(-
1
,
""
);
}
//SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo);
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MO_15_WaitCanGo
);
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
100
));
//CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ,等待 NextStopCheck=0");
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
MO_16_Stop2Down
();
}
}
catch
(
Exception
ex
)
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论