Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit b42d2d18
由
LN
编写于
2020-02-28 20:02:26 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
托盘逻辑修改
1 个父辈
261a5797
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
37 行增加
和
37 行删除
source/DeviceLibrary/assemblyLine/EquipBase.cs
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
source/DeviceLibrary/assemblyLine/EquipBase.cs
查看文件 @
b42d2d1
...
@@ -413,50 +413,50 @@ namespace OnlineStore.DeviceLibrary
...
@@ -413,50 +413,50 @@ namespace OnlineStore.DeviceLibrary
if
(!
wait
.
IsEnd
)
if
(!
wait
.
IsEnd
)
{
{
if
(
wait
.
IoType
.
Equals
(
IO_Type
.
ClampCylinder_Slack
)
&&
wait
.
IoValue
.
Equals
(
IO_VALUE
.
HIGH
)
&&
span
.
TotalMilliseconds
>
6000
)
//if (wait.IoType.Equals(IO_Type.ClampCylinder_Slack) && wait.IoValue.Equals(IO_VALUE.HIGH) && span.TotalMilliseconds > 6000)
//{
// LogInfo("未检测到:ClampCylinder_Slack=HIGH,超过6秒钟,默认下一步骤");
// wait.IsEnd = true;
//}
//else if (wait.IoType.Equals(IO_Type.SL_MoveCylinder_Tighten) && wait.IoValue.Equals(IO_VALUE.HIGH) && span.TotalMilliseconds > 6000)
//{
// LogInfo("未检测到:SL_MoveCylinder_Tighten=HIGH,超过6秒钟,默认下一步骤");
// wait.IsEnd = true;
//}
//else
//{
TimeSpan
rwSpan
=
DateTime
.
Now
-
preRWTime
;
//一分钟还未检测到
if
(
span
.
TotalSeconds
>
LineManager
.
Config
.
IOSingle_TimerOut
&&
NoAlarm
())
{
{
LogInfo
(
"未检测到:ClampCylinder_Slack=HIGH,超过6秒钟,默认下一步骤"
);
ConfigIO
io
=
baseConfig
.
getWaitIO
(
wait
.
IoType
);
wait
.
IsEnd
=
true
;
WarnMsg
=
Name
+
"等待"
+
NotOkMsg
+
" 超时"
;
Alarm
(
LineAlarmType
.
IoSingleTimeOut
);
LogUtil
.
error
(
MoveInfo
.
Name
+
WarnMsg
,
DeviceID
+
13
);
}
}
else
if
(
wait
.
IoType
.
Equals
(
IO_Type
.
SL_MoveCylinder_Tighten
)
&&
wait
.
IoValue
.
Equals
(
IO_VALUE
.
HIGH
)
&&
span
.
TotalMilliseconds
>
6000
)
else
if
(
rwSpan
.
TotalSeconds
>
5
&&
span
.
TotalSeconds
>
6
&&
span
.
TotalSeconds
<
LineManager
.
Config
.
IOSingle_TimerOut
*
2
)
{
{
LogInfo
(
"未检测到:SL_MoveCylinder_Tighten=HIGH,超过6秒钟,默认下一步骤"
);
preRWTime
=
DateTime
.
Now
;
wait
.
IsEnd
=
true
;
string
msg
=
moveInfo
.
Name
+
" "
+
NotOkMsg
+
"已等待 "
+
Math
.
Abs
(
span
.
TotalSeconds
)
+
"秒,重写DO:"
;
}
bool
isLog
=
false
;
else
foreach
(
WaitResultInfo
ww
in
list
)
{
TimeSpan
rwSpan
=
DateTime
.
Now
-
preRWTime
;
//一分钟还未检测到
if
(
span
.
TotalSeconds
>
LineManager
.
Config
.
IOSingle_TimerOut
&&
NoAlarm
())
{
{
ConfigIO
io
=
baseConfig
.
getWaitIO
(
wait
.
IoType
);
if
(
ww
!=
null
&&
ww
.
WaitType
.
Equals
(
2
)
&&
baseConfig
.
DOList
.
ContainsKey
(
ww
.
IoType
))
WarnMsg
=
Name
+
"等待"
+
NotOkMsg
+
" 超时"
;
Alarm
(
LineAlarmType
.
IoSingleTimeOut
);
LogUtil
.
error
(
MoveInfo
.
Name
+
WarnMsg
,
DeviceID
+
13
);
}
else
if
(
rwSpan
.
TotalSeconds
>
5
&&
span
.
TotalSeconds
>
6
&&
span
.
TotalSeconds
<
LineManager
.
Config
.
IOSingle_TimerOut
*
2
)
{
preRWTime
=
DateTime
.
Now
;
string
msg
=
moveInfo
.
Name
+
" "
+
NotOkMsg
+
"已等待 "
+
Math
.
Abs
(
span
.
TotalSeconds
)
+
"秒,重写DO:"
;
bool
isLog
=
false
;
foreach
(
WaitResultInfo
ww
in
list
)
{
{
if
(
ww
!=
null
&&
ww
.
WaitType
.
Equals
(
2
)
&&
baseConfig
.
DOList
.
ContainsKey
(
ww
.
IoType
))
isLog
=
true
;
{
IOMove
(
ww
.
IoType
,
ww
.
IoValue
);
isLog
=
true
;
msg
+=
ww
.
ToStr
()
+
","
;
IOMove
(
ww
.
IoType
,
ww
.
IoValue
);
msg
+=
ww
.
ToStr
()
+
","
;
}
}
if
(
isLog
)
{
LogUtil
.
error
(
msg
);
}
}
}
}
isOk
=
false
;
if
(
isLog
)
break
;
{
LogUtil
.
error
(
msg
);
}
}
}
isOk
=
false
;
break
;
}
}
// }
}
}
else
if
(
wait
.
WaitType
.
Equals
(
WaitEnum
.
W003_Time
))
else
if
(
wait
.
WaitType
.
Equals
(
WaitEnum
.
W003_Time
))
{
{
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @
b42d2d1
...
@@ -50,7 +50,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -50,7 +50,7 @@ namespace OnlineStore.DeviceLibrary
private
InOutParam
CheckParam
=
new
InOutParam
();
private
InOutParam
CheckParam
=
new
InOutParam
();
private
DateTime
lastStopDown
=
DateTime
.
Now
;
internal
DateTime
lastStopDown
=
DateTime
.
Now
;
private
Stopwatch
swWaitWatch
=
new
Stopwatch
();
private
Stopwatch
swWaitWatch
=
new
Stopwatch
();
private
void
StartCheckFixture
()
private
void
StartCheckFixture
()
...
@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary
}
}
}
}
else
if
(
Config
.
SidesWayNum
.
Equals
(
2
)
&&
IOValue
(
IO_Type
.
SW_StopCheck
).
Equals
(
IO_VALUE
.
HIGH
)
&&
canProcess
else
if
(
Config
.
SidesWayNum
.
Equals
(
2
)
&&
IOValue
(
IO_Type
.
SW_StopCheck
).
Equals
(
IO_VALUE
.
HIGH
)
&&
canProcess
&&
(
DateTime
.
Now
-
lastStopDown
).
TotalSeconds
>
4
)
&&
(
DateTime
.
Now
-
lastStopDown
).
TotalSeconds
>
2.5
)
{
{
if
(
TrayManager
.
checkWatch
(
swWaitWatch
,
TrayManager
.
SwTrayWaitTime
,
true
))
if
(
TrayManager
.
checkWatch
(
swWaitWatch
,
TrayManager
.
SwTrayWaitTime
,
true
))
{
{
...
...
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
查看文件 @
b42d2d1
此文件的差异被折叠,
点击展开。
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论