Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
刘韬
/
SO815-AutoInOutStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
图表
网络
创建新的问题
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit a0e18cdf
由
几米阳光
编写于
2018-12-26 17:13:33 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
进出轴仓门出库点改为P4
1 个父辈
9d2a7c0d
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
68 行增加
和
23 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
source/ACSingleStore/FrmStoreBox.cs
source/DeviceLibrary/StoreConfig/AC/linePositions.csv
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
source/DeviceLibrary/store/LineMoveP.cs
source/LoadCVSLibrary/position/AutoStorePosition.cs
source/ACSingleStore/FrmStoreBox.Designer.cs
查看文件 @
a0e18cd
此文件的差异被折叠,
点击展开。
source/ACSingleStore/FrmStoreBox.cs
查看文件 @
a0e18cd
...
...
@@ -83,8 +83,8 @@ namespace OnlineStore.AutoInOutStore
txtComP2
.
Text
=
Position
.
CompressAxis_Position_P2
.
ToString
();
txtComP3
.
Text
=
Position
.
CompressAxis_CPosition_P3
.
ToString
();
txtInOutP3
.
Text
=
Position
.
InOutAxis_Position_P3
.
ToString
();
txtInOutP2
.
Text
=
Position
.
InOutAxis_
DoorPosition
_P2
.
ToString
();
txtInOutP2
.
Text
=
Position
.
InOutAxis_
Batch
_P2
.
ToString
();
txtInoutP4
.
Text
=
Position
.
InOutAxis_DoorOutPosition_P4
.
ToString
();
//txtUpDownP1.Text = ktkPosition.UpDownAxis_DoorOPosition_P1.ToString();
}
txtSpeed
.
Text
=
store
.
Config
.
CompressAxis_EndSpeed
.
ToString
();
...
...
@@ -316,7 +316,7 @@ namespace OnlineStore.AutoInOutStore
}
lblOutInfo
.
Visible
=
!
lblWaitTragGo
.
Visible
;
lblOutInfo
.
Text
=
"
累积处理
入库:"
+
AutomaticBaiting
.
BatchInStoreCount
+
"盘共"
+
AutomaticBaiting
.
BatchInStoreHeight
+
"mm,"
+
lblOutInfo
.
Text
=
"
批量出入库信息:
入库:"
+
AutomaticBaiting
.
BatchInStoreCount
+
"盘共"
+
AutomaticBaiting
.
BatchInStoreHeight
+
"mm,"
+
"出库: "
+
AutomaticBaiting
.
BatchOutStoreCount
+
"盘共"
+
AutomaticBaiting
.
BatchOutStoreHeight
+
"mm"
;
if
(
HumitureController
.
IsRun
)
{
...
...
@@ -507,6 +507,7 @@ namespace OnlineStore.AutoInOutStore
ktk
.
ComPress_P3
=
FormUtil
.
GetIntValue
(
txtComP3
);
ktk
.
InOut_P1
=
FormUtil
.
GetIntValue
(
txtInOutP1
);
ktk
.
InOut_P2
=
FormUtil
.
GetIntValue
(
txtInOutP2
);
ktk
.
InOut_P4
=
FormUtil
.
GetIntValue
(
txtInoutP4
);
ktk
.
InOut_P3
=
FormUtil
.
GetIntValue
(
txtInOutP3
);
ktk
.
Middle_P1
=
FormUtil
.
GetIntValue
(
txtMiddleP1
);
ktk
.
Middle_P2
=
FormUtil
.
GetIntValue
(
txtMiddleP2
);
...
...
@@ -552,7 +553,8 @@ namespace OnlineStore.AutoInOutStore
txtComP2
.
Text
=
ktkPosition
.
CompressAxis_Position_P2
.
ToString
();
txtComP3
.
Text
=
ktkPosition
.
CompressAxis_CPosition_P3
.
ToString
();
txtInOutP3
.
Text
=
ktkPosition
.
InOutAxis_Position_P3
.
ToString
();
txtInOutP2
.
Text
=
ktkPosition
.
InOutAxis_DoorPosition_P2
.
ToString
();
txtInOutP2
.
Text
=
ktkPosition
.
InOutAxis_Batch_P2
.
ToString
();
txtInoutP4
.
Text
=
ktkPosition
.
InOutAxis_DoorOutPosition_P4
.
ToString
();
txtUpDownP1
.
Text
=
store
.
Config
.
GetUpDownP1
(
ktkPosition
.
BagHeight
).
ToString
();
//txtUpDownP2.Text = ktkPosition.UpDownAxis_DoorIPosition_P2.ToString();
//txtUpDownP7.Text = ktkPosition.UpDownAxis_DoorOBPosition_P7.ToString();
...
...
@@ -695,8 +697,8 @@ namespace OnlineStore.AutoInOutStore
ktkPosition
.
UpDownAxis_OHPosition_P5
=
FormUtil
.
GetIntValue
(
txtUpDownP5
);
ktkPosition
.
UpDownAxis_OLPosition_P6
=
FormUtil
.
GetIntValue
(
txtUpDownP6
);
ktkPosition
.
CompressAxis_Position_P2
=
FormUtil
.
GetIntValue
(
txtComP2
);
ktkPosition
.
InOutAxis_
DoorPosition
_P2
=
FormUtil
.
GetIntValue
(
txtInOutP2
);
ktkPosition
.
InOutAxis_
Batch
_P2
=
FormUtil
.
GetIntValue
(
txtInOutP2
);
ktkPosition
.
InOutAxis_DoorOutPosition_P4
=
FormUtil
.
GetIntValue
(
txtInoutP4
);
//ktkPosition.UpDownAxis_DoorIPosition_P2 = FormUtil.GetIntValue(txtUpDownP2);
//ktkPosition.UpDownAxis_DoorOBPosition_P7 = FormUtil.GetIntValue(txtUpDownP7);
//ktkPosition.UpDownAxis_DoorIBPosition_P8 = FormUtil.GetIntValue(txtUpDownP8);
...
...
@@ -1673,5 +1675,28 @@ namespace OnlineStore.AutoInOutStore
int
speed
=
FormUtil
.
GetIntValue
(
txtASpeed
);
ACServerManager
.
SetSpeed
(
portName
,
SlvAddr
,
speed
);
}
private
void
btnInOutP4_Click
(
object
sender
,
EventArgs
e
)
{
if
(
store
.
InOutAxisCanMove
().
Equals
(
false
))
{
MessageBox
.
Show
(
"定位气缸不在下降端,不能移动进出轴"
,
"警告"
,
MessageBoxButtons
.
OK
,
MessageBoxIcon
.
Warning
);
return
;
}
int
value
=
FormUtil
.
GetIntValue
(
txtInoutP4
);
AxisABSMove
(
store
.
Config
.
InOut_Axis
,
value
,
store
.
Config
.
InOutAxis_P2_Speed
);
}
private
void
上料模块复位
ToolStripMenuItem_Click
(
object
sender
,
EventArgs
e
)
{
if
(!
AutomaticBaiting
.
DoorIsClose
())
{
MessageBox
.
Show
(
"请先关闭批量上下料门"
);
return
;
}
AutomaticBaiting
.
BatchDoorClose
(
false
);
bool
result
=
AutomaticBaiting
.
Reset
(
false
);
}
}
}
source/DeviceLibrary/StoreConfig/AC/linePositions.csv
查看文件 @
a0e18cd
位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴仓门
取料点P2
,进出轴吸盘取料点P2
1#AC1_1_1_4,774,8,7,1,80750,407400,415100,415100,407400,73000,-
22000,-1
0000,83600,5000
位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴仓门
出料点P4
,进出轴吸盘取料点P2
1#AC1_1_1_4,774,8,7,1,80750,407400,415100,415100,407400,73000,-
95000,-7
0000,83600,5000
1#AC1_1_1_5,773,12,7,s,211783,67807,71168,71168,67807,5000,-110000,-75000,5000,5000
1#AC1_1_1_6,772,8,7,,211783,83730,87091,87091,83730,68000,-110000,-75000,81000,81000
1#AC1_1_1_7,771,8,7,,211783,99653,103014,103014,99653,68000,-110000,-75000,81000,81000
...
...
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
查看文件 @
a0e18cd
...
...
@@ -38,7 +38,11 @@ namespace OnlineStore.DeviceLibrary
{
return
false
;
}
int
height
=
8
;
int
height
=
24
;
if
(
Config
.
Default_TrayWidth
.
Equals
(
7
))
{
height
=
8
;
}
//加载位置
if
(
param
.
MoveP
==
null
)
{
...
...
@@ -56,11 +60,12 @@ namespace OnlineStore.DeviceLibrary
p
.
UpDown_Door_P7
=
Config
.
UpDownAxis_Door_P7
;
p
.
UpDown_OutHigh_P2
=
Config
.
UpDownAxis_OutHigh_P2
;
p
.
UpDown_OutLow_P8
=
Config
.
UpDownAxis_OutLow_P8
;
p
.
InOut_P2
=
position
.
InOutAxis_DoorPosition_P2
;
if
(
IsBatch
)
{
p
.
InOut_P2
=
position
.
InOutAxis_Batch_P2
;
}
p
.
InOut_P2
=
position
.
InOutAxis_Batch_P2
;
p
.
InOut_P4
=
position
.
InOutAxis_DoorOutPosition_P4
;
//if (IsBatch)
//{
// p.InOut_P2 = position.InOutAxis_Batch_P2;
//}
p
.
UpDown_P1
=
Config
.
GetUpDownP1
(
position
.
BagHeight
);
p
.
ComPress_P2
=
position
.
CompressAxis_Position_P2
;
...
...
@@ -385,9 +390,10 @@ namespace OnlineStore.DeviceLibrary
{
if
(!
StoreMove
.
IsNeedInStore
)
{
InStoreLog
(
"送出料盘:SI_21 ,需要操作人员拿走料盘,进出轴(叉子)到门口位置P7 "
);
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
SI_21_DeviceToDoor
);
InStoreLog
(
"送出料盘:SI_21 ,需要操作人员拿走料盘,进出轴(叉子)到
仓门出料点P4,升降轴到
门口位置P7 "
);
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
SI_21_DeviceToDoor
);
ACAxisMove
(
Config
.
UpDown_Axis
,
moveP
.
UpDown_Door_P7
,
Config
.
UpDownAxis_P7_Speed
);
ACAxisMove
(
Config
.
InOut_Axis
,
moveP
.
InOut_P4
,
Config
.
InOutAxis_P2_Speed
);
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SafetyLightCurtains
,
IO_VALUE
.
HIGH
));
}
else
...
...
@@ -876,8 +882,16 @@ namespace OnlineStore.DeviceLibrary
{
LineMoveP
moveP
=
StoreMove
.
MoveParam
.
MoveP
;
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
SO_10_DeviceToDoor
);
OutStoreLog
(
"出库:SO_10 叉子进出料口,进出轴至P2(进料口取料点) "
);
ACAxisMove
(
Config
.
InOut_Axis
,
moveP
.
InOut_P2
,
Config
.
InOutAxis_P2_Speed
);
if
(
StoreMove
.
IsBatchInOutStore
)
{
OutStoreLog
(
"出库:SO_10 叉子进出料口,进出轴至P2(进料口吸盘取料点) "
);
ACAxisMove
(
Config
.
InOut_Axis
,
moveP
.
InOut_P2
,
Config
.
InOutAxis_P2_Speed
);
}
else
{
OutStoreLog
(
"出库:SO_10 叉子进出料口,进出轴至P4(仓门出料点) "
);
ACAxisMove
(
Config
.
InOut_Axis
,
moveP
.
InOut_P4
,
Config
.
InOutAxis_P2_Speed
);
}
}
#
endregion
...
...
source/DeviceLibrary/store/LineMoveP.cs
查看文件 @
a0e18cd
...
...
@@ -64,7 +64,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public
int
InOut_P1
{
get
;
set
;
}
/// <summary>
/// 轴3进出轴 进料口取料点P2
/// 轴3进出轴 进料口
吸盘
取料点P2
/// </summary>
public
int
InOut_P2
{
get
;
set
;
}
/// <summary>
...
...
@@ -73,6 +73,12 @@ namespace OnlineStore.DeviceLibrary
public
int
InOut_P3
{
get
;
set
;
}
/// <summary>
/// 轴3进出轴 仓门出库点P4
/// </summary>
public
int
InOut_P4
{
get
;
set
;
}
/// <summary>
/// 轴4( 压紧轴)待机原位点P1
/// </summary>
public
int
ComPress_P1
{
get
;
set
;
}
...
...
source/LoadCVSLibrary/position/AutoStorePosition.cs
查看文件 @
a0e18cd
...
...
@@ -59,10 +59,10 @@ namespace OnlineStore.LoadCSVLibrary
public
int
CompressAxis_CPosition_P3
{
get
;
set
;
}
/// <summary>
/// 轴3(进出轴) 进
料口取料点P2
,料仓门口取料放料点
/// 轴3(进出轴) 进
出轴仓门出料点P4
,料仓门口取料放料点
/// </summary>
[
CSVAttribute
(
"进出轴仓门
取料点P2
"
)]
public
int
InOutAxis_Door
Position_P2
{
get
;
set
;
}
[
CSVAttribute
(
"进出轴仓门
出料点P4
"
)]
public
int
InOutAxis_Door
OutPosition_P4
{
get
;
set
;
}
/// <summary>
/// 轴3(进出轴) 进出轴吸盘取料点P2 ,吸盘下方取放料点,批量出入库时使用
/// </summary>
...
...
@@ -86,7 +86,7 @@ namespace OnlineStore.LoadCSVLibrary
{
int
iMin
=
Config
.
InOut_Axis
.
PositionMin
;
int
iMax
=
Config
.
InOut_Axis
.
PositionMax
;
if
(
iMin
>
position
.
InOutAxis_Door
Position_P2
||
iMax
<
position
.
InOutAxis_DoorPosition_P2
)
if
(
iMin
>
position
.
InOutAxis_Door
OutPosition_P4
||
iMax
<
position
.
InOutAxis_DoorOutPosition_P4
)
{
LogUtil
.
error
(
position
.
PositionNum
+
" InOutAxis_DoorPosition_P2位置超出"
+
Config
.
InOut_Axis
.
Explain
+
"上下限("
+
iMin
+
"-"
+
iMax
+
")"
);
return
false
;
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论