Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit c2039449
由
LN
编写于
2020-07-02 12:54:33 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
出料托盘处理优化
1 个父辈
79b5a7b9
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
29 行增加
和
13 行删除
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
查看文件 @
c203944
...
@@ -679,9 +679,14 @@ namespace OnlineStore.DeviceLibrary
...
@@ -679,9 +679,14 @@ namespace OnlineStore.DeviceLibrary
{
{
TrayManager
.
UpdateTrayNumError
(-
1
,
""
);
TrayManager
.
UpdateTrayNumError
(-
1
,
""
);
}
}
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MO_15_WaitCanGo
);
//
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo);
CheckLog
(
"托盘放行 "
+
SecondMoveInfo
.
SLog
+
" ,等待 NextStopCheck=0"
);
//
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ,等待 NextStopCheck=0");
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MO_16_Stop2Down
);
CheckLog
(
"托盘放行"
+
SecondMoveInfo
.
SLog
+
" ,阻挡气缸1-2下降)"
);
IOMove
(
IO_Type
.
StopCylinder_Down2
,
IO_VALUE
.
HIGH
);
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
StopCylinder_Down2
,
IO_VALUE
.
HIGH
));
}
}
}
}
catch
(
Exception
ex
)
catch
(
Exception
ex
)
...
@@ -770,9 +775,13 @@ namespace OnlineStore.DeviceLibrary
...
@@ -770,9 +775,13 @@ namespace OnlineStore.DeviceLibrary
#
region
不需要出入库,直接放行
#
region
不需要出入库,直接放行
else
if
(
SecondMoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
MO_14_TopDown
))
else
if
(
SecondMoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
MO_14_TopDown
))
{
{
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MO_15_WaitCanGo
);
//
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo);
CheckLog
(
"托盘放行 "
+
SecondMoveInfo
.
SLog
+
" ,等待 NextStopCheck=0"
);
//
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ,等待 NextStopCheck=0");
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MO_16_Stop2Down
);
CheckLog
(
"托盘放行"
+
SecondMoveInfo
.
SLog
+
" ,阻挡气缸1-2下降)"
);
IOMove
(
IO_Type
.
StopCylinder_Down2
,
IO_VALUE
.
HIGH
);
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
StopCylinder_Down2
,
IO_VALUE
.
HIGH
));
}
}
else
if
(
SecondMoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
MO_15_WaitCanGo
))
else
if
(
SecondMoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
MO_15_WaitCanGo
))
...
...
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
查看文件 @
c203944
...
@@ -64,10 +64,10 @@ namespace OnlineStore.DeviceLibrary
...
@@ -64,10 +64,10 @@ namespace OnlineStore.DeviceLibrary
else
else
{
{
bool
check2Ok
=
TrayManager
.
checkWatch
(
trayCheck2LowWait
,
TrayManager
.
SwTrayWaitTime
,
false
);
bool
check2Ok
=
TrayManager
.
checkWatch
(
trayCheck2LowWait
,
TrayManager
.
SwTrayWaitTime
,
false
);
if
(
IOValue
(
IO_Type
.
StopCylinder_Check1
).
Equals
(
IO_VALUE
.
HIGH
)
&&
(
DateTime
.
Now
-
lastStopDown
).
TotalSeconds
>
3
)
if
(
IOValue
(
IO_Type
.
StopCylinder_Check1
).
Equals
(
IO_VALUE
.
HIGH
)
)
{
{
bool
canProcess
=
(
LineManager
.
Line
.
SwNoProcess
(
Config
.
SidesWayNum
));
bool
canProcess
=
(
LineManager
.
Line
.
SwNoProcess
(
Config
.
SidesWayNum
));
if
(
TrayManager
.
checkWatch
(
trayCheckWait
,
TrayManager
.
SwTrayWaitTime
,
false
)
&&
check2Ok
&&
canProcess
)
if
(
TrayManager
.
checkWatch
(
trayCheckWait
,
TrayManager
.
SwTrayWaitTime
,
false
)
&&
(
DateTime
.
Now
-
lastStopDown
).
TotalSeconds
>
3
&&
check2Ok
&&
canProcess
)
{
{
trayCheckWait
.
Stop
();
trayCheckWait
.
Stop
();
trayCheck2LowWait
.
Stop
();
trayCheck2LowWait
.
Stop
();
...
@@ -426,14 +426,19 @@ namespace OnlineStore.DeviceLibrary
...
@@ -426,14 +426,19 @@ namespace OnlineStore.DeviceLibrary
{
{
SecondMoveInfo
.
EndMove
();
SecondMoveInfo
.
EndMove
();
CheckLog
(
"托盘放行 结束,触发 TrayPEndEvent "
);
CheckLog
(
"托盘放行 结束,触发 TrayPEndEvent "
);
lastStopDown
=
DateTime
.
Now
.
AddSeconds
(-
1
);
//
lastStopDown = DateTime.Now.AddSeconds(-1);
this
.
TrayPEndEvent
?.
Invoke
(
Config
.
SidesWayNum
,
currTrayNum
);
this
.
TrayPEndEvent
?.
Invoke
(
Config
.
SidesWayNum
,
currTrayNum
);
}
}
else
else
{
{
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MO_15_WaitCanGo
);
// lastStopDown = DateTime.Now.AddSeconds(1);
CheckLog
(
"托盘放行 "
+
SecondMoveInfo
.
SLog
+
" ,等待 NextStopCheck=0"
);
//SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo);
//CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ,等待 NextStopCheck=0");
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MO_16_Stop2Down
);
CheckLog
(
"托盘放行 "
+
SecondMoveInfo
.
SLog
+
" ,阻挡2下降"
);
IOMove
(
IO_Type
.
StopCylinder_Down2
,
IO_VALUE
.
HIGH
);
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
StopCylinder_Down2
,
IO_VALUE
.
HIGH
));
}
}
}
}
...
@@ -453,22 +458,24 @@ namespace OnlineStore.DeviceLibrary
...
@@ -453,22 +458,24 @@ namespace OnlineStore.DeviceLibrary
else
if
(
SecondMoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
MO_17_Stop2Check
))
else
if
(
SecondMoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
MO_17_Stop2Check
))
{
{
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MO_18_WaitTime
);
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MO_18_WaitTime
);
CheckLog
(
"托盘放行 "
+
SecondMoveInfo
.
SLog
+
" , 等待500ms后阻挡2上升"
);
CheckLog
(
"托盘放行 "
+
SecondMoveInfo
.
SLog
+
" , 等待200ms后阻挡2上升"
);
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
500
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
StopCylinder_Check2
,
IO_VALUE
.
LOW
));
}
}
else
if
(
SecondMoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
MO_18_WaitTime
))
else
if
(
SecondMoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
MO_18_WaitTime
))
{
{
trayCheck2LowWait
.
Restart
();
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MO_19_StopCylinder_Back
);
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MO_19_StopCylinder_Back
);
CheckLog
(
"托盘放行 "
+
SecondMoveInfo
.
SLog
+
" , 阻挡气缸2上升 "
);
CheckLog
(
"托盘放行 "
+
SecondMoveInfo
.
SLog
+
" , 阻挡气缸2上升 "
);
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
100
));
IOMove
(
IO_Type
.
StopCylinder_Down2
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
StopCylinder_Down2
,
IO_VALUE
.
LOW
);
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
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_19_StopCylinder_Back
))
else
if
(
SecondMoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
MO_19_StopCylinder_Back
))
{
{
CheckLog
(
"托盘放行 结束,触发 TrayPEndEvent "
);
CheckLog
(
"托盘放行 结束,触发 TrayPEndEvent "
);
SecondMoveInfo
.
EndMove
();
SecondMoveInfo
.
EndMove
();
lastStopDown
=
DateTime
.
Now
.
AddSeconds
(-
1
);
//
lastStopDown = DateTime.Now.AddSeconds(-1);
this
.
TrayPEndEvent
?.
Invoke
(
Config
.
SidesWayNum
,
currTrayNum
);
this
.
TrayPEndEvent
?.
Invoke
(
Config
.
SidesWayNum
,
currTrayNum
);
}
}
#
endregion
#
endregion
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论