Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 27663f30
由
LN
编写于
2020-05-27 19:04:49 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
皮带线优化。上料逻辑优化。
1 个父辈
c8629e31
全部展开
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
43 行增加
和
30 行删除
dll/Asa.IOModule.AIOBOX.xml
source/DeviceLibrary/DeviceLibrary.csproj
source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
source/DeviceLibrary/model/StoreStep.cs
dll/Asa.IOModule.AIOBOX.xml
查看文件 @
27663f3
...
@@ -50,9 +50,14 @@
...
@@ -50,9 +50,14 @@
是否连接
是否连接
</summary>
</summary>
</member>
</member>
<member
name=
"P:Asa.IOModule.AIOBOX.
ErrInfo
"
>
<member
name=
"P:Asa.IOModule.AIOBOX.
MonitorDI
"
>
<summary>
<summary>
错误信息
监控DI输入,索引数组
</summary>
</member>
<member
name=
"P:Asa.IOModule.AIOBOX.MonitorDO"
>
<summary>
监控DO输出,索引数组
</summary>
</summary>
</member>
</member>
<member
name=
"M:Asa.IOModule.AIOBOX.Connect"
>
<member
name=
"M:Asa.IOModule.AIOBOX.Connect"
>
...
...
source/DeviceLibrary/DeviceLibrary.csproj
查看文件 @
27663f3
...
@@ -36,9 +36,6 @@
...
@@ -36,9 +36,6 @@
<Prefer32Bit>false</Prefer32Bit>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
</PropertyGroup>
<ItemGroup>
<ItemGroup>
<Reference Include="Asa.IOModule.AIOBOX">
<HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath>
</Reference>
<Reference Include="Client, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Client, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\dll\Client.dll</HintPath>
<HintPath>..\..\dll\Client.dll</HintPath>
...
@@ -84,6 +81,7 @@
...
@@ -84,6 +81,7 @@
<Compile Include="baan\AxisBean.cs" />
<Compile Include="baan\AxisBean.cs" />
<Compile Include="baan\WaitUtil.cs" />
<Compile Include="baan\WaitUtil.cs" />
<Compile Include="deviceLibrary\halcon\CodeManager.cs" />
<Compile Include="deviceLibrary\halcon\CodeManager.cs" />
<Compile Include="deviceLibrary\IO\AIOBOX\AIOBOX.cs" />
<Compile Include="deviceLibrary\IO\AIOBOX\AIOBOXManager.cs" />
<Compile Include="deviceLibrary\IO\AIOBOX\AIOBOXManager.cs" />
<Compile Include="deviceLibrary\IO\IOManager.cs" />
<Compile Include="deviceLibrary\IO\IOManager.cs" />
<Compile Include="assemblyLine\LineBean.cs" />
<Compile Include="assemblyLine\LineBean.cs" />
...
...
source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs
查看文件 @
27663f3
此文件的差异被折叠,
点击展开。
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @
27663f3
...
@@ -815,7 +815,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -815,7 +815,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_20_SaveSize
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_20_SaveSize
);
if
(
MoveCylineIsUp
())
if
(
MoveCylineIsUp
())
{
{
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_2
2
_CylinderGive
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_2
1
_CylinderGive
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料横移气缸放料SOL"
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料横移气缸放料SOL"
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Take
,
IO_Type
.
SL_MoveCylinder_Give
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Take
,
IO_Type
.
SL_MoveCylinder_Give
);
}
}
...
@@ -858,20 +858,22 @@ namespace OnlineStore.DeviceLibrary
...
@@ -858,20 +858,22 @@ namespace OnlineStore.DeviceLibrary
}
}
else
else
{
{
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":记录 高度【"
+
LastHeight
+
"】宽度【"
+
LastWidth
+
"】,此时未检测到料盘,上料轴位置【"
+
currP
+
"】不在P3:"
+
Config
.
BatchAxisP3
+
""
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":记录 高度【"
+
LastHeight
+
"】宽度【"
+
LastWidth
+
"】,此时未检测到料盘,上料轴位置【"
+
currP
+
"】不在P3:"
+
Config
.
BatchAxisP3
+
",预扫码"
);
YuScanCode
();
}
}
}
}
else
else
{
{
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":记录 高度【"
+
LastHeight
+
"】宽度【"
+
LastWidth
+
"】"
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":记录 高度【"
+
LastHeight
+
"】宽度【"
+
LastWidth
+
"】,预扫码"
);
YuScanCode
();
}
}
}
}
else
if
(
MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
FI_20_SaveSize
))
else
if
(
MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
FI_20_SaveSize
))
{
{
if
(
MoveCylineIsUp
())
if
(
MoveCylineIsUp
())
{
{
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_2
2
_CylinderGive
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_2
1
_CylinderGive
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料横移气缸放料SOL"
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料横移气缸放料SOL"
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Take
,
IO_Type
.
SL_MoveCylinder_Give
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Take
,
IO_Type
.
SL_MoveCylinder_Give
);
}
}
...
@@ -882,17 +884,25 @@ namespace OnlineStore.DeviceLibrary
...
@@ -882,17 +884,25 @@ namespace OnlineStore.DeviceLibrary
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Down
,
IO_Type
.
SL_MoveCylinder_Up
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Down
,
IO_Type
.
SL_MoveCylinder_Up
);
}
}
}
}
else
if
(
MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
FI_22_CylinderGive
))
else
if
(
MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
FI_21_CylinderGive
))
{
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_22_BatchAxisDown
);
if
(!
MoveInfo
.
ShelfNoTray
)
{
FI_BatchAxisDown
();
}
}
else
if
(
MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
FI_22_BatchAxisDown
))
{
{
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_23_WaitTray
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_23_WaitTray
);
int
targetPositon
=
Config
.
GetUpdownP2Detial
(
LastHeight
,
LastWidth
);
int
targetPositon
=
Config
.
GetUpdownP2Detial
(
LastHeight
,
LastWidth
);
string
log
=
":移栽伺服下降到P2:"
+
targetPositon
;
string
log
=
":移栽伺服下降到P2:"
+
targetPositon
;
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":等待空托盘到达 "
+
log
+
""
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":等待空托盘到达 "
+
log
+
""
);
UpdownAxis
.
AbsMove
(
MoveInfo
,
targetPositon
,
Config
.
UpdownAxis_P2Speed
);
UpdownAxis
.
AbsMove
(
MoveInfo
,
targetPositon
,
Config
.
UpdownAxis_P2Speed
);
if
(!
MoveInfo
.
ShelfNoTray
)
//
if (!MoveInfo.ShelfNoTray)
{
//
{
YuScanCode
();
//
YuScanCode();
}
//
}
}
}
else
if
(
MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
FI_23_WaitTray
))
//TODO
else
if
(
MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
FI_23_WaitTray
))
//TODO
{
{
...
@@ -900,15 +910,15 @@ namespace OnlineStore.DeviceLibrary
...
@@ -900,15 +910,15 @@ namespace OnlineStore.DeviceLibrary
{
{
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_24_CylinderDown
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_24_CylinderDown
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Up
,
IO_Type
.
SL_MoveCylinder_Down
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Up
,
IO_Type
.
SL_MoveCylinder_Down
);
if
(!
MoveInfo
.
ShelfNoTray
)
//
if (!MoveInfo.ShelfNoTray)
{
//
{
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料机构下降, 托盘号【"
+
currTrayNum
+
"】,更新托盘为有料,获取库位号 , 提升轴下降指定位置"
);
//
InLog("料盘移栽" + MoveInfo.SLog + ":上料机构下降, 托盘号【" + currTrayNum + "】,更新托盘为有料,获取库位号 , 提升轴下降指定位置");
FI_21_BatchAxisDown
();
//
FI_21_BatchAxisDown();
}
//
}
else
//
else
{
//
{
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料机构下降, 托盘号【"
+
currTrayNum
+
"】,更新托盘为有料,获取库位号 ,"
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料机构下降, 托盘号【"
+
currTrayNum
+
"】,更新托盘为有料,获取库位号 ,"
);
}
//
}
string
code
=
CodeManager
.
ProcessCode
(
LastCodeList
);
string
code
=
CodeManager
.
ProcessCode
(
LastCodeList
);
lastcode
=
code
;
lastcode
=
code
;
TrayManager
.
UpdateTrayInfo
(
currTrayNum
,
true
,
ReelType
.
InStore
,
new
InOutParam
(
currTrayNum
,
code
,
""
,
LastHeight
,
LastWidth
,
false
),
""
);
TrayManager
.
UpdateTrayInfo
(
currTrayNum
,
true
,
ReelType
.
InStore
,
new
InOutParam
(
currTrayNum
,
code
,
""
,
LastHeight
,
LastWidth
,
false
),
""
);
...
@@ -935,7 +945,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -935,7 +945,7 @@ namespace OnlineStore.DeviceLibrary
}
}
catch
(
Exception
ex
)
catch
(
Exception
ex
)
{
{
LogUtil
.
error
(
Name
+
"托盘【"
+
currTrayNum
+
"】【"
+
code
+
"】获取库位号报错:"
+
ex
.
ToString
());
LogUtil
.
error
(
Name
+
"托盘【"
+
currTrayNum
+
"】【"
+
code
+
"】获取库位号报错:"
+
ex
.
ToString
());
}
}
});
});
...
@@ -997,7 +1007,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -997,7 +1007,7 @@ namespace OnlineStore.DeviceLibrary
}
}
else
else
{
{
LogUtil
.
error
(
Name
+
"["
+
MoveInfo
.
MoveType
+
"]["
+
MoveInfo
.
SLog
+
"] 获取库位号还未完成,状态:"
+
getPosTask
.
Status
);
LogUtil
.
error
(
Name
+
"["
+
MoveInfo
.
MoveType
+
"]["
+
MoveInfo
.
SLog
+
"] 获取库位号还未完成,状态:"
+
getPosTask
.
Status
);
}
}
}
}
#
endregion
#
endregion
...
@@ -1119,7 +1129,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -1119,7 +1129,7 @@ namespace OnlineStore.DeviceLibrary
CylinderMove
(
null
,
IO_Type
.
FL_TopCylinder_Up
,
IO_Type
.
FL_TopCylinder_Down
);
CylinderMove
(
null
,
IO_Type
.
FL_TopCylinder_Up
,
IO_Type
.
FL_TopCylinder_Down
);
}
}
}
}
private
void
FI_
21_
BatchAxisDown
()
private
void
FI_BatchAxisDown
()
{
{
// MoveInfo.NextMoveStep(LineMoveStep.FI_21_BatchAxisDown);
// MoveInfo.NextMoveStep(LineMoveStep.FI_21_BatchAxisDown);
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
...
...
source/DeviceLibrary/model/StoreStep.cs
查看文件 @
27663f3
...
@@ -656,15 +656,15 @@ namespace OnlineStore.DeviceLibrary
...
@@ -656,15 +656,15 @@ namespace OnlineStore.DeviceLibrary
/// 料盘移栽:记录高度尺寸
/// 料盘移栽:记录高度尺寸
/// </summary>
/// </summary>
FI_20_SaveSize
,
FI_20_SaveSize
,
///// <summary>
///// 提升轴下降到料盘不溢出的位置
///// </summary>
//FI_21_BatchAxisDown,
/// <summary>
/// <summary>
/// 料盘移栽: 上料横移气缸放料SOL
/// 料盘移栽: 上料横移气缸放料SOL
/// </summary>
/// </summary>
FI_22_CylinderGive
,
FI_21_CylinderGive
,
/// <summary>
/// 提升轴下降到料盘不溢出的位置
/// </summary>
FI_22_BatchAxisDown
,
/// <summary>
/// <summary>
/// 料盘移栽:等待空托盘到达,移栽伺服下降到P2,并预扫码
/// 料盘移栽:等待空托盘到达,移栽伺服下降到P2,并预扫码
/// </summary>
/// </summary>
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论