Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit fcf38b52
由
LN
编写于
2020-01-08 13:49:28 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
增加报警显示
1 个父辈
8e2fb2ea
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
22 行增加
和
10 行删除
source/AssemblyLineClient/FrmFeedingEquip.cs
source/DeviceLibrary/assemblyLine/DischargeLine.cs
source/DeviceLibrary/assemblyLine/EquipBase.cs
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
source/DeviceLibrary/assemblyLine/LineBean.cs
source/AssemblyLineClient/FrmFeedingEquip.cs
查看文件 @
fcf38b5
...
@@ -143,7 +143,7 @@ namespace OnlineStore.AssemblyLine
...
@@ -143,7 +143,7 @@ namespace OnlineStore.AssemblyLine
{
{
lblInstoreList
.
Text
=
text
;
lblInstoreList
.
Text
=
text
;
}
}
lblMoveInfo
.
Text
=
equipBean
.
GetMoveStr
();
lblMoveInfo
.
Text
=
"料架:"
+
equipBean
.
CurrShelfId
+
"\r\n"
+
equipBean
.
GetMoveStr
();
lblwidth
.
Text
=
" "
;
lblwidth
.
Text
=
" "
;
}
}
catch
(
Exception
ex
)
catch
(
Exception
ex
)
...
...
source/DeviceLibrary/assemblyLine/DischargeLine.cs
查看文件 @
fcf38b5
...
@@ -383,7 +383,8 @@ namespace OnlineStore.DeviceLibrary
...
@@ -383,7 +383,8 @@ namespace OnlineStore.DeviceLibrary
string
msg
=
""
;
string
msg
=
""
;
int
tLength
=
10
;
int
tLength
=
10
;
msg
+=
"runS:"
+
runStatus
+
"\n"
;
msg
+=
"runS:"
+
runStatus
+
"\n"
;
msg
+=
"runS:"
+
lineStatus
+
"\n"
;
msg
+=
"lineS:"
+
lineStatus
+
"\n"
;
msg
+=
"alarm: "
+
alarmType
+
"\n"
;
msg
+=
"MoveT:"
+
MoveInfo
.
MoveType
+
"\n"
;
msg
+=
"MoveT:"
+
MoveInfo
.
MoveType
+
"\n"
;
msg
+=
"MoveS:"
+
MoveInfo
.
SLog
+
"\n"
;
msg
+=
"MoveS:"
+
MoveInfo
.
SLog
+
"\n"
;
...
...
source/DeviceLibrary/assemblyLine/EquipBase.cs
查看文件 @
fcf38b5
...
@@ -576,6 +576,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -576,6 +576,7 @@ namespace OnlineStore.DeviceLibrary
msg
+=
"runS: "
+
runStatus
+
"\n"
;
msg
+=
"runS: "
+
runStatus
+
"\n"
;
msg
+=
"lineS: "
+
lineStatus
+
"\n"
;
msg
+=
"lineS: "
+
lineStatus
+
"\n"
;
msg
+=
"alarm: "
+
alarmType
+
"\n"
;
msg
+=
"MoveT:"
+
MoveInfo
.
MoveType
+
"\n"
;
msg
+=
"MoveT:"
+
MoveInfo
.
MoveType
+
"\n"
;
msg
+=
"MoveS :"
+
MoveInfo
.
SLog
+
"\n"
;
msg
+=
"MoveS :"
+
MoveInfo
.
SLog
+
"\n"
;
msg
+=
"SMoveT:"
+
SecondMoveInfo
.
MoveType
+
"\n"
;
msg
+=
"SMoveT:"
+
SecondMoveInfo
.
MoveType
+
"\n"
;
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
查看文件 @
fcf38b5
...
@@ -442,9 +442,19 @@ namespace OnlineStore.DeviceLibrary
...
@@ -442,9 +442,19 @@ namespace OnlineStore.DeviceLibrary
}
}
else
else
{
{
WarnMsg
=
Name
+
"TrayLCylinderAfter:提升轴当前不在下降位置P2,不后退定位气缸"
;
if
(
IOValue
(
IO_Type
.
SL_TrayLocation1_After
).
Equals
(
IO_VALUE
.
HIGH
)
&&
Alarm
(
LineAlarmType
.
IoSingleTimeOut
);
IOValue
(
IO_Type
.
SL_TrayLocation1_Before
).
Equals
(
IO_VALUE
.
LOW
)
&&
LogUtil
.
error
(
Name
+
"TrayLCylinderAfter:提升轴当前不在下降位置P2,不后退定位气缸"
);
IOValue
(
IO_Type
.
SL_TrayLocation2_After
).
Equals
(
IO_VALUE
.
HIGH
)
&&
IOValue
(
IO_Type
.
SL_TrayLocation2_Before
).
Equals
(
IO_VALUE
.
LOW
))
{
}
else
{
WarnMsg
=
Name
+
"TrayLCylinderAfter:提升轴当前不在下降位置P2,不后退定位气缸"
;
Alarm
(
LineAlarmType
.
IoSingleTimeOut
);
LogUtil
.
error
(
Name
+
"TrayLCylinderAfter:提升轴当前不在下降位置P2,不后退定位气缸"
);
}
}
}
if
(
moveinfo
!=
null
)
if
(
moveinfo
!=
null
)
{
{
...
@@ -700,7 +710,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -700,7 +710,7 @@ namespace OnlineStore.DeviceLibrary
//}
//}
//发送料架信息给调度系统
//发送料架信息给调度系统
AgvClient
.
SendRFID
(
Config
.
AgvInName
,
data
);
AgvClient
.
SendRFID
(
Config
.
AgvInName
,
data
);
LogUtil
.
info
(
Name
+
"
定位工位
料架编号:"
+
CurrShelfId
);
LogUtil
.
info
(
Name
+
"
读取到
料架编号:"
+
CurrShelfId
);
}
}
catch
(
Exception
ex
)
catch
(
Exception
ex
)
{
{
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @
fcf38b5
...
@@ -363,7 +363,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -363,7 +363,7 @@ namespace OnlineStore.DeviceLibrary
}
}
else
if
(
MoveInfo
.
IsTimeOut
(
180
))
else
if
(
MoveInfo
.
IsTimeOut
(
180
))
{
{
WarnMsg
=
SecondMoveInfo
.
Name
+
"["
+
SecondMoveInfo
.
MoveType
+
"]["
+
SecondMoveInfo
.
MoveStep
+
"]
等待横移机构空闲可出库超时
["
+
Math
.
Round
(
MoveInfo
.
StepSpan
().
TotalSeconds
,
1
)
+
"]秒"
;
WarnMsg
=
SecondMoveInfo
.
Name
+
"["
+
SecondMoveInfo
.
MoveType
+
"]["
+
SecondMoveInfo
.
MoveStep
+
"]
等待开始紧急出料移栽超时
["
+
Math
.
Round
(
MoveInfo
.
StepSpan
().
TotalSeconds
,
1
)
+
"]秒"
;
LogUtil
.
error
(
WarnMsg
,
DeviceID
+
11
);
LogUtil
.
error
(
WarnMsg
,
DeviceID
+
11
);
Alarm
(
LineAlarmType
.
IoSingleTimeOut
);
Alarm
(
LineAlarmType
.
IoSingleTimeOut
);
}
}
...
@@ -1007,7 +1007,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -1007,7 +1007,7 @@ namespace OnlineStore.DeviceLibrary
{
{
if
(
NeedSaveParam
)
if
(
NeedSaveParam
)
{
{
LogInfo
(
" 【"
+
info
.
ToStr
()
+
"】需要出库
,参数信息:"
+
param
.
ToStr
()
);
LogInfo
(
" 【"
+
info
.
ToStr
()
+
"】需要出库
,拦截托盘 "
);
CheckParam
=
param
;
CheckParam
=
param
;
}
}
return
true
;
return
true
;
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
查看文件 @
fcf38b5
此文件的差异被折叠,
点击展开。
source/DeviceLibrary/assemblyLine/LineBean.cs
查看文件 @
fcf38b5
...
@@ -982,10 +982,10 @@ namespace OnlineStore.DeviceLibrary
...
@@ -982,10 +982,10 @@ namespace OnlineStore.DeviceLibrary
string
msg
=
""
;
string
msg
=
""
;
// int tLength = 20;
// int tLength = 20;
msg
+=
"横移41托盘: "
+
Sw41TrayNum
+
"\n"
;
msg
+=
"横移41托盘: "
+
Sw41TrayNum
+
"\n"
;
msg
+=
"横移23托盘:"
+
Sw23TrayNum
+
"\n"
;
msg
+=
"横移23托盘:"
+
Sw23TrayNum
+
"\n"
;
msg
+=
"runS: "
+
runStatus
+
"\n"
;
msg
+=
"runS: "
+
runStatus
+
"\n"
;
msg
+=
"lineS: "
+
lineStatus
+
"\n"
;
msg
+=
"lineS: "
+
lineStatus
+
"\n"
;
msg
+=
"alarm: "
+
alarmType
+
"\n"
;
msg
+=
"MoveT:"
+
MoveInfo
.
MoveType
+
"\n"
;
msg
+=
"MoveT:"
+
MoveInfo
.
MoveType
+
"\n"
;
msg
+=
"MoveS: "
+
MoveInfo
.
SLog
+
"\n"
;
msg
+=
"MoveS: "
+
MoveInfo
.
SLog
+
"\n"
;
msg
+=
"SW41: "
+
SW41_MoveInfo
.
MoveType
+
" "
+
SW41_MoveInfo
.
MoveStep
+
"\n"
;
msg
+=
"SW41: "
+
SW41_MoveInfo
.
MoveType
+
" "
+
SW41_MoveInfo
.
MoveStep
+
"\n"
;
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论