Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 61a3ba83
由
LN
编写于
2019-12-06 16:25:39 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
横移IO修改
1 个父辈
faa942e9
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
25 行增加
和
19 行删除
source/AssemblyLineClient/FrmLineStore.cs
source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_17.csv
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
source/AssemblyLineClient/FrmLineStore.cs
查看文件 @
61a3ba8
...
...
@@ -631,6 +631,7 @@ namespace OnlineStore.AssemblyLine
private
void
退出
ToolStripMenuItem_Click_1
(
object
sender
,
EventArgs
e
)
{
LogUtil
.
info
(
"点击:退出系统"
);
ExitApp
();
}
...
...
source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
查看文件 @
61a3ba8
...
...
@@ -63,7 +63,7 @@ DI,0,SL1上料横移气缸放料端,SL_MoveCylinder_Give,6,PRO_AOI_IP_12,0,SL1上料横移气
DI,0,SL1上料气缸放松端,SL_MoveCylinder_Slack,7,PRO_AOI_IP_12,0,SL1上料气缸放松端,X128,X128
DI,0,SL1上料气缸夹紧端,SL_MoveCylinder_Tighten,8,PRO_AOI_IP_12,0,SL1上料气缸夹紧端,X129,X129
DI,1000,环形线横移1托盘检测,SW1_TrayCheck,9,PRO_AOI_IP_12,0,环形线横移1托盘检测,X130,X130
DI
,1000,环形线横移1料盘检测1,SW1_ReelCheck,10,PRO_AOI_IP_12,0,环形线横移1料盘检测1,X131,X131
,1000,环形线横移1料盘检测1,SW1_ReelCheck,10,PRO_AOI_IP_12,0,环形线横移1料盘检测1,X131,X131
DI,1000,环形线横移1顶升上升端,SW1_TopCylinder_Up,11,PRO_AOI_IP_12,0,环形线横移1顶升上升端,X132,X132
DI,1000,环形线横移1顶升下降端,SW1_TopCylinder_Down,12,PRO_AOI_IP_12,0,环形线横移1顶升下降端,X133,X133
DI,1000,环形线横移1定位上升端,SW1_LocationCylinder_Up,13,PRO_AOI_IP_12,0,环形线横移1定位上升端,X134,X134
...
...
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
查看文件 @
61a3ba8
...
...
@@ -61,9 +61,12 @@ DI,0,SL3上料横移机构下降端,SL_MoveCylinder_Down,4,PRO_AOI_IP_16,0,SL3上料横移机
DI,0,SL3上料横移气缸取料端,SL_MoveCylinder_Take,5,PRO_AOI_IP_16,0,SL3上料横移气缸取料端,X206,X206
DI,0,SL3上料横移气缸放料端,SL_MoveCylinder_Give,6,PRO_AOI_IP_16,0,SL3上料横移气缸放料端,X207,X207
DI,0,SL3上料气缸放松端,SL_MoveCylinder_Slack,7,PRO_AOI_IP_16,0,SL3上料气缸放松端,X208,X208
DI,0,SL3上料气缸夹紧端,SL_MoveCylinder_Tighten,8,PRO_AOI_IP_16,0,SL3上料气缸夹紧端,X209,X209
DI,0,SL3上料气缸夹紧端,SL_MoveCylinder_Tighten,8,PRO_AOI_IP_16,0,SL3上料气缸夹紧端,X209,X209
,,,,,,,,,
DI,1000,环形线横移2阻挡检测,SW2_StopCheck,2,PRO_AOI_IP_28,0,环形线横移2阻挡检测,X403,X403
,,,,,,,,,
DI,1000,环形线横移2托盘检测,SW2_TrayCheck,9,PRO_AOI_IP_16,0,环形线横移2托盘检测,X210,X210
DI
,1000,环形线横移2料盘检测1,SW2_ReelCheck,10,PRO_AOI_IP_16,0,环形线横移2料盘检测1,X211,X211
,1000,环形线横移2料盘检测1,SW2_ReelCheck,10,PRO_AOI_IP_16,0,环形线横移2料盘检测1,X211,X211
DI,1000,环形线横移2顶升上升端,SW2_TopCylinder_Up,11,PRO_AOI_IP_16,0,环形线横移2顶升上升端,X212,X212
DI,1000,环形线横移2顶升下降端,SW2_TopCylinder_Down,12,PRO_AOI_IP_16,0,环形线横移2顶升下降端,X213,X213
DI,1000,环形线横移2定位上升端,SW2_LocationCylinder_Up,13,PRO_AOI_IP_16,0,环形线横移2定位上升端,X214,X214
...
...
@@ -89,7 +92,11 @@ DO,0,SL3上料横移气缸放料SOL,SL_MoveCylinder_Give,15,PRO_AOI_IP_15,0,SL3上料横移
DO,0,SL3上料气缸放松SOL,SL_MoveCylinder_Slack,0,PRO_AOI_IP_16,0,SL3上料气缸放松SOL,Y201,Y201
DO,0,SL3上料气缸夹紧SOL,SL_MoveCylinder_Tighten,1,PRO_AOI_IP_16,0,SL3上料气缸夹紧SOL,Y202,Y202
DO,0,SL3升降盘定位气缸1前进SOL,SL_TrayLocation_Before,2,PRO_AOI_IP_16,0,SL3升降盘定位气缸1前进SOL,Y203,Y203
DO,0,SL3升降盘定位气缸1后退SOL,SL_TrayLocation_After,3,PRO_AOI_IP_16,0,SL3升降盘定位气缸1后退SOL,Y204,Y204
DO,0,SL3升降盘定位气缸1后退SOL,SL_TrayLocation_After,3,PRO_AOI_IP_16,0,SL3升降盘定位气缸1后退SOL,Y204,Y204
,,,,,,,,,
DO,1000,环形线横移2阻挡下降SOL,SW2_StopDown,4,PRO_AOI_IP_28,0,环形线横移2阻挡下降SOL,Y405,Y405
,,,,,,,,,
DO,1000,环形线横移2顶升上升SOL,SW2_TopCylinder_Up,4,PRO_AOI_IP_16,0,环形线横移2顶升上升SOL,Y205,Y205
DO,1000,环形线横移2顶升下降SOL,SW2_TopCylinder_Down,5,PRO_AOI_IP_16,0,环形线横移2顶升下降SOL,Y206,Y206
DO,1000,环形线横移2定位上升SOL,SW2_LocationCylinder_Up,6,PRO_AOI_IP_16,0,环形线横移2定位上升SOL,Y207,Y207
...
...
@@ -101,7 +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
DI,1000,环形线横移2阻挡检测,SW2_StopCheck,2,PRO_AOI_IP_28,0,环形线横移2阻挡检测,X403,X403
DO,1000,环形线横移2阻挡下降SOL,SW2_StopDown,4,PRO_AOI_IP_28,0,环形线横移2阻挡下降SOL,Y405,Y405
,,,,15,PRO_AOI_IP_16,0,,Y216,Y216
\ No newline at end of file
source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
查看文件 @
61a3ba8
...
...
@@ -63,7 +63,7 @@ DI,0,SL4上料横移气缸放料端,SL_MoveCylinder_Give,6,PRO_AOI_IP_18,0,SL4上料横移气
DI,0,SL4上料气缸放松端,SL_MoveCylinder_Slack,7,PRO_AOI_IP_18,0,SL4上料气缸放松端,X248,X248
DI,0,SL4上料气缸夹紧端,SL_MoveCylinder_Tighten,8,PRO_AOI_IP_18,0,SL4上料气缸夹紧端,X249,X249
DI,1000,环形线横移3托盘检测,SW3_TrayCheck,9,PRO_AOI_IP_18,0,环形线横移3托盘检测,X250,X250
DI
,1000,环形线横移3料盘检测1,SW3_ReelCheck,10,PRO_AOI_IP_18,0,环形线横移3料盘检测1,X251,X251
,1000,环形线横移3料盘检测1,SW3_ReelCheck,10,PRO_AOI_IP_18,0,环形线横移3料盘检测1,X251,X251
DI,1000,环形线横移3顶升上升端,SW3_TopCylinder_Up,11,PRO_AOI_IP_18,0,环形线横移3顶升上升端,X252,X252
DI,1000,环形线横移3顶升下降端,SW3_TopCylinder_Down,12,PRO_AOI_IP_18,0,环形线横移3顶升下降端,X253,X253
DI,1000,环形线横移3定位上升端,SW3_LocationCylinder_Up,13,PRO_AOI_IP_18,0,环形线横移3定位上升端,X254,X254
...
...
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_17.csv
查看文件 @
61a3ba8
...
...
@@ -80,13 +80,14 @@ DO,1,进仓1升降上升SOL,UpDownCylinder_Up,12,PRO_AOI_IP_36,,进仓1升降上升SOL,Y563,
DO,1,进仓1升降下降SOL,UpDownCylinder_Down,13,PRO_AOI_IP_36,,进仓1升降下降SOL,Y564,Y564
,,,,14,PRO_AOI_IP_36,,,Y565,Y565
,,,,,,,,,
DI,1000,环形线横移4阻挡检测,SW4_StopCheck,4,PRO_AOI_IP_36,0,出料4阻挡1托盘检测,X555,X555
,,,,,,,,,
DI,1000,环形线横移4托盘检测,SW4_TrayCheck,5,PRO_AOI_IP_36,0,环形线横移4托盘检测,X556,X556
DI,1000,环形线横移4料盘检测1,SW4_ReelCheck,6,PRO_AOI_IP_36,0,环形线横移4料盘检测1,X557,X557
DI,1000,环形线横移4顶升上升端,SW4_TopCylinder_Up,7,PRO_AOI_IP_36,0,环形线横移4顶升上升端,X558,X558
DI,1000,环形线横移4顶升下降端,SW4_TopCylinder_Down,8,PRO_AOI_IP_36,0,环形线横移4顶升下降端,X559,X559
,,,,,,,,,
DO,1000,环形线横移4阻挡下降SOL,SW4_StopDown,4,PRO_AOI_IP_36,0,出料4阻挡1下降SOL,Y555,Y555
,,,,,,,,,
DO,1000,环形线横移4顶升上升SOL,SW4_TopCylinder_Up,6,PRO_AOI_IP_36,0,环形线横移4顶升上升SOL,Y557,Y557
DO,1000,环形线横移4顶升下降SOL,SW4_TopCylinder_Down,7,PRO_AOI_IP_36,0,环形线横移4顶升下降SOL,Y558,Y558
,,,,,,,,,
DI,1000,环形线横移4阻挡检测,SW4_StopCheck,6,PRO_AOI_IP_36,0,环形线横移4阻挡检测,X557,X557
DO,1000,环形线横移4阻挡下降SOL,SW4_StopDown,4,PRO_AOI_IP_36,0,环形线横移4阻挡下降,Y555,Y555
\ No newline at end of file
,,,,,,,,,
\ No newline at end of file
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @
61a3ba8
...
...
@@ -51,7 +51,7 @@ namespace OnlineStore.DeviceLibrary
int
num
=
TrayManager
.
GetTrayNum
(
DeviceID
);
bool
isTestNeed
=
(
LineManager
.
Line
.
runStatus
<=
LineRunStatus
.
Wait
);
bool
isNeedTray
=
(
num
>
0
)
&&
(
LineManager
.
Line
.
SwNoProcess
(
Config
.
SidesWayNum
));
if
(
IOValue
(
IO_Type
.
SW_TrayCheck
).
Equals
(
IO_VALUE
.
HIGH
)
&&
IOValue
(
IO_Type
.
SW_ReelCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
(
isTestNeed
||
isNeedTray
))
if
(
IOValue
(
IO_Type
.
SW_TrayCheck
).
Equals
(
IO_VALUE
.
HIGH
)
&&
(
isTestNeed
||
isNeedTray
))
{
//判断是否是需要的托盘
if
(
NeedCurrTray
())
...
...
@@ -966,7 +966,7 @@ namespace OnlineStore.DeviceLibrary
if
(
Config
.
IsCanOut
.
Equals
(
1
))
{
//此托盘是紧急出料盘,需要通过料架出库
if
((
IOValue
(
IO_Type
.
SW_ReelCheck
).
Equals
(
IO_VALUE
.
HIGH
)
||
IOValue
(
IO_Type
.
FL_ReelCheck
).
Equals
(
IO_VALUE
.
HIGH
))
&&
info
.
EmergencyOut
)
if
((
IOValue
(
IO_Type
.
FL_ReelCheck
).
Equals
(
IO_VALUE
.
HIGH
))
&&
info
.
EmergencyOut
)
{
if
(
isFull
&&
runStatus
.
Equals
(
LineRunStatus
.
Runing
)
&&
MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
OutStore
))
{
...
...
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
查看文件 @
61a3ba8
...
...
@@ -561,10 +561,10 @@ namespace OnlineStore.LoadCSVLibrary
/// DI 环形线横移1托盘检测 SW_TrayCheck X130
/// </summary>
public
static
string
SW_TrayCheck
=
"SW_TrayCheck"
;
/// <summary>
/// DI 环形线横移1料盘检测1 SW_ReelCheck X131
/// </summary>
public
static
string
SW_ReelCheck
=
"SW_ReelCheck"
;
///
//
<summary>
///
//
DI 环形线横移1料盘检测1 SW_ReelCheck X131
///
//
</summary>
//
public static string SW_ReelCheck = "SW_ReelCheck";
/// <summary>
/// DI /DO 环形线横移1顶升上升端 SW_TopCylinder_Up X132
/// </summary>
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论