Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-ACPackingStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 74f9149e
由
LN
编写于
2020-04-09 17:32:15 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
压紧轴压紧前点P3-压紧轴压紧点P2的差值,7寸盘和其他的分开配置。
1 个父辈
5453792d
全部展开
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
46 行增加
和
17 行删除
source/ACPackingStore/FrmBox.Designer.cs
source/ACPackingStore/FrmBox.cs
source/DeviceLibrary/ACPackingStore/StoreManager.cs
source/DeviceLibrary/StoreConfig/BoxConfig_1.csv
source/DeviceLibrary/StoreConfig/BoxConfig_2.csv
source/LoadCVSLibrary/storeConfig/config/AC_Box_Config.cs
source/ACPackingStore/FrmBox.Designer.cs
查看文件 @
74f9149
此文件的差异被折叠,
点击展开。
source/ACPackingStore/FrmBox.cs
查看文件 @
74f9149
...
@@ -75,6 +75,7 @@ namespace OnlineStore.ACPackingStore
...
@@ -75,6 +75,7 @@ namespace OnlineStore.ACPackingStore
txtComP4
.
Text
=
BoxBean
.
Config
.
CompAxis_P4_Position
.
ToString
();
txtComP4
.
Text
=
BoxBean
.
Config
.
CompAxis_P4_Position
.
ToString
();
txtComMaxP3
.
Text
=
BoxBean
.
Config
.
CompAxis_Max_P3
.
ToString
();
txtComMaxP3
.
Text
=
BoxBean
.
Config
.
CompAxis_Max_P3
.
ToString
();
txtComP3_P2
.
Text
=
BoxBean
.
Config
.
CompAxis_P3_P2_Value
.
ToString
();
txtComP3_P2
.
Text
=
BoxBean
.
Config
.
CompAxis_P3_P2_Value
.
ToString
();
txtCom7_P3_P2
.
Text
=
BoxBean
.
Config
.
CompAxis7_P3_P2_Value
.
ToString
();
if
(
shelrfP
!=
null
)
if
(
shelrfP
!=
null
)
{
{
txtInoutP101
.
Text
=
shelrfP
.
InoutAxis_P101
.
ToString
();
txtInoutP101
.
Text
=
shelrfP
.
InoutAxis_P101
.
ToString
();
...
@@ -327,7 +328,7 @@ namespace OnlineStore.ACPackingStore
...
@@ -327,7 +328,7 @@ namespace OnlineStore.ACPackingStore
int
comP2
=
BoxBean
.
Config
.
GetComP2
(
acPosition
.
BagHigh
).
TargetComP2
();
int
comP2
=
BoxBean
.
Config
.
GetComP2
(
acPosition
.
BagHigh
).
TargetComP2
();
txtComP2
.
Text
=
comP2
.
ToString
();
txtComP2
.
Text
=
comP2
.
ToString
();
txtComP3
.
Text
=
(
comP2
+
BoxBean
.
Config
.
CompAxis_P3_P2_Value
).
ToString
();
txtComP3
.
Text
=
(
comP2
+
BoxBean
.
Config
.
GetCom_P3_P2
(
acPosition
.
BagWidth
)
).
ToString
();
btnComP2
.
Text
=
""
+
acPosition
.
BagHigh
+
"mm压紧点P2:"
;
btnComP2
.
Text
=
""
+
acPosition
.
BagHigh
+
"mm压紧点P2:"
;
btnComP3
.
Text
=
""
+
acPosition
.
BagHigh
+
"mm压紧前点P3:"
;
btnComP3
.
Text
=
""
+
acPosition
.
BagHigh
+
"mm压紧前点P3:"
;
lblSize
.
Text
=
"尺寸:"
+
acPosition
.
BagWidth
+
"*"
+
acPosition
.
BagHigh
;
lblSize
.
Text
=
"尺寸:"
+
acPosition
.
BagWidth
+
"*"
+
acPosition
.
BagHigh
;
...
@@ -893,12 +894,12 @@ namespace OnlineStore.ACPackingStore
...
@@ -893,12 +894,12 @@ namespace OnlineStore.ACPackingStore
int
minValue
=
FormUtil
.
GetIntValue
(
txtComMin
);
int
minValue
=
FormUtil
.
GetIntValue
(
txtComMin
);
int
maxValue
=
FormUtil
.
GetIntValue
(
txtComMax
);
int
maxValue
=
FormUtil
.
GetIntValue
(
txtComMax
);
ComP2Info
p2Info
=
new
ComP2Info
(
height
,
minValue
,
maxValue
);
ComP2Info
p2Info
=
new
ComP2Info
(
height
,
minValue
,
maxValue
);
if
(
minValue
>
BoxBean
.
Config
.
CompAxis_P1_Position
&&
maxValue
>
BoxBean
.
Config
.
CompAxis_P1_Position
)
if
(
minValue
>
BoxBean
.
Config
.
CompAxis_P1_Position
&&
maxValue
>
BoxBean
.
Config
.
CompAxis_P1_Position
)
{
{
}
}
else
else
{
{
MessageBox
.
Show
(
"保存失败:"
+
" 盘高【"
+
height
+
"】范围【"
+
minValue
+
"~"
+
maxValue
+
"】无效,压紧点需大于待机点【"
+
BoxBean
.
Config
.
CompAxis_P1_Position
+
"】"
);
MessageBox
.
Show
(
"保存失败:"
+
" 盘高【"
+
height
+
"】范围【"
+
minValue
+
"~"
+
maxValue
+
"】无效,压紧点需大于待机点【"
+
BoxBean
.
Config
.
CompAxis_P1_Position
+
"】"
);
return
;
return
;
}
}
BoxBean
.
Config
.
UpdateComP2
(
height
,
p2Info
);
BoxBean
.
Config
.
UpdateComP2
(
height
,
p2Info
);
...
@@ -906,11 +907,13 @@ namespace OnlineStore.ACPackingStore
...
@@ -906,11 +907,13 @@ namespace OnlineStore.ACPackingStore
BoxBean
.
Config
.
CompAxis_P4_Position
=
FormUtil
.
GetIntValue
(
txtComP4
);
BoxBean
.
Config
.
CompAxis_P4_Position
=
FormUtil
.
GetIntValue
(
txtComP4
);
BoxBean
.
Config
.
CompAxis_Max_P3
=
FormUtil
.
GetIntValue
(
txtComMaxP3
);
BoxBean
.
Config
.
CompAxis_Max_P3
=
FormUtil
.
GetIntValue
(
txtComMaxP3
);
BoxBean
.
Config
.
CompAxis_P3_P2_Value
=
FormUtil
.
GetIntValue
(
txtComP3_P2
);
BoxBean
.
Config
.
CompAxis_P3_P2_Value
=
FormUtil
.
GetIntValue
(
txtComP3_P2
);
BoxBean
.
Config
.
CompAxis7_P3_P2_Value
=
FormUtil
.
GetIntValue
(
txtCom7_P3_P2
);
if
(
StoreManager
.
UpdateBoxConfig
(
BoxBean
.
Config
))
if
(
StoreManager
.
UpdateBoxConfig
(
BoxBean
.
Config
))
{
{
LogUtil
.
info
(
BoxBean
.
Name
+
"更新ComP2【 "
+
BoxBean
.
Config
.
CompAxis_P2_List
+
"】CompAxis_P4_Position【"
+
LogUtil
.
info
(
BoxBean
.
Name
+
"更新ComP2【 "
+
BoxBean
.
Config
.
CompAxis_P2_List
+
"】CompAxis_P4_Position【"
+
BoxBean
.
Config
.
CompAxis_P4_Position
+
"】CompAxis_Max_P3【"
+
BoxBean
.
Config
.
CompAxis_Max_P3
+
"】CompAxis_P3_P2_Value【"
+
BoxBean
.
Config
.
CompAxis_P3_P2_Value
+
"】"
);
BoxBean
.
Config
.
CompAxis_P4_Position
+
"】CompAxis_Max_P3【"
+
BoxBean
.
Config
.
CompAxis_Max_P3
+
"】CompAxis_P3_P2_Value【"
+
BoxBean
.
Config
.
CompAxis_P3_P2_Value
+
"】CompAxis7_P3_P2_Value【"
+
BoxBean
.
Config
.
CompAxis7_P3_P2_Value
+
"】"
);
}
}
else
else
{
{
...
...
source/DeviceLibrary/ACPackingStore/StoreManager.cs
查看文件 @
74f9149
...
@@ -201,6 +201,14 @@ namespace OnlineStore.DeviceLibrary
...
@@ -201,6 +201,14 @@ namespace OnlineStore.DeviceLibrary
LogUtil
.
error
(
box
.
Name
+
"GetPositon["
+
param
.
ShelfPosID
+
"]=null,没有库位不能执行出入库"
);
LogUtil
.
error
(
box
.
Name
+
"GetPositon["
+
param
.
ShelfPosID
+
"]=null,没有库位不能执行出入库"
);
return
false
;
return
false
;
}
}
if
(
String
.
IsNullOrEmpty
(
param
.
PlateH
))
{
param
.
PlateH
=
position
.
BagHigh
.
ToString
();
}
if
(
string
.
IsNullOrEmpty
(
param
.
PlateW
))
{
param
.
PlateW
=
position
.
BagWidth
.
ToString
();
}
if
(
sp
!=
null
)
if
(
sp
!=
null
)
{
{
p
.
InOut_P101
=
sp
.
InoutAxis_P101
;
p
.
InOut_P101
=
sp
.
InoutAxis_P101
;
...
@@ -225,7 +233,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -225,7 +233,7 @@ namespace OnlineStore.DeviceLibrary
p
.
UpDown_P12
=
box
.
Config
.
UpDownAxis_P12
;
p
.
UpDown_P12
=
box
.
Config
.
UpDownAxis_P12
;
p
.
ComPress_P2
=
box
.
Config
.
GetComP2
(
position
.
BagHigh
).
TargetComP2
();
p
.
ComPress_P2
=
box
.
Config
.
GetComP2
(
position
.
BagHigh
).
TargetComP2
();
p
.
ComPress_P3
=
p
.
ComPress_P2
+
box
.
Config
.
CompAxis_P3_P2_Value
;
p
.
ComPress_P3
=
p
.
ComPress_P2
+
box
.
Config
.
GetCom_P3_P2
(
param
.
PlateW
)
;
p
.
InOut_P3
=
position
.
InoutAxis_P3
;
p
.
InOut_P3
=
position
.
InoutAxis_P3
;
p
.
Middle_P2
=
position
.
MiddleAxis_P2
;
p
.
Middle_P2
=
position
.
MiddleAxis_P2
;
p
.
UpDown_P3
=
position
.
UpdownAxis_IH_P3
;
p
.
UpDown_P3
=
position
.
UpdownAxis_IH_P3
;
...
@@ -234,14 +242,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -234,14 +242,7 @@ namespace OnlineStore.DeviceLibrary
p
.
UpDown_P6
=
position
.
UpdownAxis_OL_P6
;
p
.
UpDown_P6
=
position
.
UpdownAxis_OL_P6
;
param
.
MoveP
=
p
;
param
.
MoveP
=
p
;
if
(
String
.
IsNullOrEmpty
(
param
.
PlateH
))
{
param
.
PlateH
=
position
.
BagHigh
.
ToString
();
}
if
(
string
.
IsNullOrEmpty
(
param
.
PlateW
))
{
param
.
PlateW
=
position
.
BagWidth
.
ToString
();
}
return
true
;
return
true
;
}
}
return
true
;
return
true
;
...
...
source/DeviceLibrary/StoreConfig/BoxConfig_1.csv
查看文件 @
74f9149
...
@@ -58,7 +58,8 @@ PRO,进出轴(轴3)P1待机点,InOutAxis_P1_Position,1000,,,,,,,
...
@@ -58,7 +58,8 @@ PRO,进出轴(轴3)P1待机点,InOutAxis_P1_Position,1000,,,,,,,
PRO,压紧轴(轴4)P1待机点,CompAxis_P1_Position,140000,,,,,,,
PRO,压紧轴(轴4)P1待机点,CompAxis_P1_Position,140000,,,,,,,
PRO,压紧轴(轴4)P3最大压紧前点,CompAxis_Max_P3,180000,,,,,,,
PRO,压紧轴(轴4)P3最大压紧前点,CompAxis_Max_P3,180000,,,,,,,
PRO,压紧轴(轴4)P4目标压紧点,CompAxis_P4_Position,315000,,,,,,,
PRO,压紧轴(轴4)P4目标压紧点,CompAxis_P4_Position,315000,,,,,,,
PRO,压紧轴(轴4)取料时的压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-90000,,,,,,,
PRO,压紧轴(轴4)非七寸盘压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-90000,,,,,,,
PRO,压紧轴(轴4)七寸盘压紧前点相对压紧点的位置,CompAxis7_P3_P2_Value,-50000,,,,,,,
PRO,压紧轴(轴4)压紧确认信号收到之后下降的位置,CompAxis_Down_Position,77500,,,,,,,
PRO,压紧轴(轴4)压紧确认信号收到之后下降的位置,CompAxis_Down_Position,77500,,,,,,,
PRO,压紧轴(轴4)P2压紧点范围对应值(8=1000;2000#),CompAxis_P2_List,8=385001;424000#12=383001;385000#16=379001;383000#24=360001;368000#32=315001;330000#48=200000;231560#20=368001;379000#28=330001;360000#36=298001;315000#40=256101;298000#44=231561;256100#,,,,,,,
PRO,压紧轴(轴4)P2压紧点范围对应值(8=1000;2000#),CompAxis_P2_List,8=385001;424000#12=383001;385000#16=379001;383000#24=360001;368000#32=315001;330000#48=200000;231560#20=368001;379000#28=330001;360000#36=298001;315000#40=256101;298000#44=231561;256100#,,,,,,,
,,,,,,,,,,
,,,,,,,,,,
...
...
source/DeviceLibrary/StoreConfig/BoxConfig_2.csv
查看文件 @
74f9149
...
@@ -57,7 +57,8 @@ PRO,进出轴(轴3)P1待机点,InOutAxis_P1_Position,1000,,,,,,,
...
@@ -57,7 +57,8 @@ PRO,进出轴(轴3)P1待机点,InOutAxis_P1_Position,1000,,,,,,,
PRO,压紧轴(轴4)P1待机点,CompAxis_P1_Position,140000,,,,,,,
PRO,压紧轴(轴4)P1待机点,CompAxis_P1_Position,140000,,,,,,,
PRO,压紧轴(轴4)P3最大压紧前点,CompAxis_Max_P3,180000,,,,,,,
PRO,压紧轴(轴4)P3最大压紧前点,CompAxis_Max_P3,180000,,,,,,,
PRO,压紧轴(轴4)P4目标压紧点,CompAxis_P4_Position,317000,,,,,,,
PRO,压紧轴(轴4)P4目标压紧点,CompAxis_P4_Position,317000,,,,,,,
PRO,压紧轴(轴4)取料时的压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-100000,,,,,,,
PRO,压紧轴(轴4)非七寸盘压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-100000,,,,,,,
PRO,压紧轴(轴4)七寸盘压紧前点相对压紧点的位置,CompAxis7_P3_P2_Value,-50000,,,,,,,
PRO,压紧轴(轴4)压紧确认信号收到之后下降的位置,CompAxis_Down_Position,81000,,,,,,,
PRO,压紧轴(轴4)压紧确认信号收到之后下降的位置,CompAxis_Down_Position,81000,,,,,,,
PRO,压紧轴(轴4)P2压紧点范围对应值(8=1000;2000#),CompAxis_P2_List,8=419201;421200#12=384501;419200#16=379501;384500#24=358001;366000#32=308001;318000#48=200000;234000#44=234001;274000#40=274001;287500#36=287501;308000#28=318001;358000#20=366001;379500#,,,,,,,
PRO,压紧轴(轴4)P2压紧点范围对应值(8=1000;2000#),CompAxis_P2_List,8=419201;421200#12=384501;419200#16=379501;384500#24=358001;366000#32=308001;318000#48=200000;234000#44=234001;274000#40=274001;287500#36=287501;308000#28=318001;358000#20=366001;379500#,,,,,,,
,,,,,,,,,,
,,,,,,,,,,
...
...
source/LoadCVSLibrary/storeConfig/config/AC_Box_Config.cs
查看文件 @
74f9149
...
@@ -516,12 +516,35 @@ namespace OnlineStore.LoadCSVLibrary
...
@@ -516,12 +516,35 @@ namespace OnlineStore.LoadCSVLibrary
private
List
<
string
>
CameraList
=
null
;
private
List
<
string
>
CameraList
=
null
;
/// <summary>
/// <summary>
/// PRO,压紧轴(轴4)取料时的压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-50000,,,,,,,
/// PRO,压紧轴(轴4)
非七寸
取料时的压紧前点相对压紧点的位置,CompAxis_P3_P2_Value,-50000,,,,,,,
/// /// </summary>
/// /// </summary>
[
ConfigProAttribute
(
"CompAxis_P3_P2_Value"
)]
[
ConfigProAttribute
(
"CompAxis_P3_P2_Value"
)]
public
int
CompAxis_P3_P2_Value
{
get
;
set
;
}
public
int
CompAxis_P3_P2_Value
{
get
;
set
;
}
/// <summary>
/// <summary>
/// PRO,压紧轴(轴4)七寸盘取料时的压紧前点相对压紧点的位置,CompAxis7_P3_P2_Value,-50000,,,,,,,
/// </summary>
[
ConfigProAttribute
(
"CompAxis7_P3_P2_Value"
)]
public
int
CompAxis7_P3_P2_Value
{
get
;
set
;
}
public
int
GetCom_P3_P2
(
int
width
=
13
)
{
if
(
width
.
Equals
(
7
))
{
return
CompAxis7_P3_P2_Value
;
}
return
CompAxis_P3_P2_Value
;
}
public
int
GetCom_P3_P2
(
string
width
=
"13"
)
{
if
(
width
.
Equals
(
"7"
))
{
return
CompAxis7_P3_P2_Value
;
}
return
CompAxis_P3_P2_Value
;
}
/// <summary>
/// PRO 压紧轴(轴4)P2压紧点范围对应值 CompAxis_P2_List 8 = 1000; 2000#12=2001;3000#16=3001;4000#20=4001;5000#22=5001;6000#24=6001;7000#
/// PRO 压紧轴(轴4)P2压紧点范围对应值 CompAxis_P2_List 8 = 1000; 2000#12=2001;3000#16=3001;4000#20=4001;5000#22=5001;6000#24=6001;7000#
/// </summary>
/// </summary>
[
ConfigProAttribute
(
"CompAxis_P2_List"
)]
[
ConfigProAttribute
(
"CompAxis_P2_List"
)]
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论