Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 19012230
由
LN
编写于
2019-12-08 13:12:34 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
1
1 个父辈
1904f46e
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
66 行增加
和
28 行删除
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
source/AssemblyLineClient/FrmFeedingEquip.cs
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
source/DeviceLibrary/assemblymanager/TrayManager.cs
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
查看文件 @
1901223
此文件的差异被折叠,
点击展开。
source/AssemblyLineClient/FrmFeedingEquip.cs
查看文件 @
1901223
...
...
@@ -557,6 +557,18 @@ namespace OnlineStore.AssemblyLine
{
BtnMove
(
btnOLine
,
"SL出料线体运转"
,
"SL出料线体停止"
,
IO_Type
.
SL_OutLine_Run
);
}
private
void
btnFLStop1_Click
(
object
sender
,
EventArgs
e
)
{
BtnMove
(
btnFLStop1
,
"FL阻挡1下降"
,
"FL阻挡1上升"
,
IO_Type
.
FL_StopCylinder_Down1
);
}
private
void
btnFLStop2Down_Click
(
object
sender
,
EventArgs
e
)
{
BtnMove
(
btnFLStop2Down
,
"FL阻挡2下降"
,
"FL阻挡2上升"
,
IO_Type
.
FL_StopCylinder_Down2
);
}
}
}
...
...
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
查看文件 @
1901223
类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
PRO,0,设备是否处于调试状态(1=调试,0=正常),IsDebug,
0
,,,,,
PRO,0,设备是否处于调试状态(1=调试,0=正常),IsDebug,
1
,,,,,
PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,GigE:MV-CE200-10GC (00D77519112),,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,对应的横移模块,SidesWayNum,2,,,,,
...
...
@@ -25,7 +25,7 @@ PRO,0,提升上料轴高度转换系数(1mm对应的脉冲),Height_ChangeValue,38000,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,6,COM5,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,,,,
PRO,0,移栽上下轴P2移栽机构下降位置,UpDownP2List,0=90000,,,,,
PRO,0,移栽上下轴P3取料位置,UpDownAxisP3,2
7
8294,,,,,
PRO,0,移栽上下轴P3取料位置,UpDownAxisP3,2
6
8294,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
PRO,0,移栽上下轴减速度,UpdownAxis_DelSpeed,400,,,,,
...
...
@@ -108,4 +108,4 @@ DO,0,SL3移载3伺服运转ON,UpDownAxis_ServoOn,11,PRO_AOI_IP_16,0,SL3移载3伺服运转ON
DO,0,SL3出料线体运转,SL_OutLine_Run,12,PRO_AOI_IP_16,0,SL3出料线体运转,Y213,Y213
,,,,13,PRO_AOI_IP_16,0,,Y214,Y214
,,,,14,PRO_AOI_IP_16,0,,Y215,Y215
,,,,15,PRO_AOI_IP_16,0,,Y216,Y216
\ No newline at end of file
,,,,15,PRO_AOI_IP_16,0,,Y216,Y216
source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
查看文件 @
1901223
...
...
@@ -19,7 +19,7 @@ PRO,0,提升上料轴原点高速,BatchAxis_HomeHighSpeed,500,,,,,
PRO,0,提升上料轴原点加速度,BatchAxis_HomeAddSpeed,500,,,,,
PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,2800,,,,,
PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,2800,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,
1
000,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,
2
000,,,,,
PRO,0,提升上料轴高度转换系数(1mm对应的脉冲),Height_ChangeValue,38000,,,,,
,,,,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,8,COM5,0,,,
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
查看文件 @
1901223
...
...
@@ -362,19 +362,23 @@ namespace OnlineStore.DeviceLibrary
{
if
(
Config
.
SidesWayNum
<=
0
)
{
LogInfo
(
"下降
阻挡气缸,下降顶升气缸
"
);
LogInfo
(
"下降
放料阻挡12 ,下降FL顶升气缸,上升横移机构
"
);
IOMove
(
IO_Type
.
FL_StopCylinder_Down1
,
IO_VALUE
.
HIGH
);
IOMove
(
IO_Type
.
FL_StopCylinder_Down2
,
IO_VALUE
.
HIGH
);
//顶升气缸下降
CylinderMove
(
null
,
IO_Type
.
FL_TopCylinder_Up
,
IO_Type
.
FL_TopCylinder_Down
);
CylinderMove
(
null
,
IO_Type
.
FL_TopCylinder_Up
,
IO_Type
.
FL_TopCylinder_Down
);
}
else
{
LogInfo
(
" 上升横移机构 "
);
}
CylinderMove
(
null
,
IO_Type
.
SL_MoveCylinder_Down
,
IO_Type
.
SL_MoveCylinder_Up
);
}
internal
override
void
CloseCylinderStop
()
{
{
if
(
Config
.
SidesWayNum
<=
0
)
{
LogInfo
(
"上升
阻挡气缸,关闭 顶升气缸IO
"
);
LogInfo
(
"上升
放料阻挡12,关闭顶升气缸,关闭横移上下气缸
"
);
IOMove
(
IO_Type
.
FL_StopCylinder_Down1
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
FL_StopCylinder_Down2
,
IO_VALUE
.
LOW
);
...
...
@@ -382,6 +386,10 @@ namespace OnlineStore.DeviceLibrary
IOMove
(
IO_Type
.
FL_TopCylinder_Up
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
FL_TopCylinder_Down
,
IO_VALUE
.
LOW
);
}
else
{
LogInfo
(
" 关闭横移上下气缸"
);
}
IOMove
(
IO_Type
.
SL_MoveCylinder_Down
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
SL_MoveCylinder_Up
,
IO_VALUE
.
LOW
);
}
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @
1901223
...
...
@@ -642,8 +642,26 @@ namespace OnlineStore.DeviceLibrary
if
(
SecondMoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
MO_11_CodeRember
))
{
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_21_MoveCylinder_Down
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料机构下降"
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料机构下降
,托盘号【"
+
currTrayNum
+
"】,获取库位号,更新托盘信息
"
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Up
,
IO_Type
.
SL_MoveCylinder_Down
);
Task
.
Factory
.
StartNew
(
delegate
{
//更新托盘条码信息
string
code
=
CodeManager
.
ProcessCode
(
LastCodeList
);
TrayManager
.
UpdateTrayInfo
(
currTrayNum
,
true
,
1
,
code
,
""
,
LastHeight
,
LastWidth
);
if
(
code
.
Equals
(
""
))
{
TrayManager
.
UpdateInStoreNG
(
currTrayNum
,
true
,
"扫码失败"
);
}
//从服务器获取库位号
string
result
=
StoreServerManager
.
CodeReceived
(
Name
,
currTrayNum
,
LastCodeList
,
LastHeight
,
LastWidth
);
if
(!
result
.
Equals
(
""
))
{
TrayManager
.
UpdateInStoreNG
(
currTrayNum
,
true
,
result
);
LogUtil
.
error
(
Name
+
"托盘【"
+
currTrayNum
+
"】"
+
result
);
}
});
}
else
{
...
...
@@ -678,25 +696,25 @@ namespace OnlineStore.DeviceLibrary
else
if
(
MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
FI_24_UpDownAxisToP1
))
{
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_25_MoveCylinder_Up
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料横移机构上升,
记录托盘尺寸,
托盘开始放行"
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料横移机构上升, 托盘开始放行"
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Down
,
IO_Type
.
SL_MoveCylinder_Up
);
Task
.
Factory
.
StartNew
(
delegate
{
//更新托盘条码信息
string
code
=
CodeManager
.
ProcessCode
(
LastCodeList
);
TrayManager
.
UpdateTrayInfo
(
currTrayNum
,
true
,
1
,
code
,
""
,
LastHeight
,
LastWidth
);
if
(
code
.
Equals
(
""
))
{
TrayManager
.
UpdateInStoreNG
(
currTrayNum
,
true
,
"扫码失败"
);
}
//从服务器获取库位号
string
result
=
StoreServerManager
.
CodeReceived
(
Name
,
currTrayNum
,
LastCodeList
,
LastHeight
,
LastWidth
);
if
(!
result
.
Equals
(
""
))
{
TrayManager
.
UpdateInStoreNG
(
currTrayNum
,
true
,
result
);
LogUtil
.
error
(
Name
+
"托盘【"
+
currTrayNum
+
"】"
+
result
);
}
});
//
Task.Factory.StartNew(delegate
//
{
//
//更新托盘条码信息
//
string code = CodeManager.ProcessCode(LastCodeList);
//
TrayManager.UpdateTrayInfo(currTrayNum, true, 1, code, "", LastHeight, LastWidth);
//
if (code.Equals(""))
//
{
//
TrayManager.UpdateInStoreNG(currTrayNum, true, "扫码失败");
//
}
//
//从服务器获取库位号
//
string result = StoreServerManager.CodeReceived(Name, currTrayNum, LastCodeList, LastHeight, LastWidth);
//
if (!result.Equals(""))
//
{
//
TrayManager.UpdateInStoreNG(currTrayNum, true, result);
//
LogUtil.error(Name + "托盘【" + currTrayNum + "】" + result);
//
}
//
});
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MO_12_MoveOk
);
}
...
...
source/DeviceLibrary/assemblymanager/TrayManager.cs
查看文件 @
1901223
...
...
@@ -215,7 +215,7 @@ namespace OnlineStore.DeviceLibrary
}
}
catch
(
Exception
ex
)
{
LogUtil
.
error
(
"ReadRFID["
+
ip
+
"]出错:"
+
ex
.
ToString
());
//
LogUtil.error("ReadRFID["+ip+"]出错:" + ex.ToString());
}
return
new
RFIDData
(-
1
,
'X'
);
}
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论