Skip to content

张东亮 / SO1057-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit e131aee1 由 张东亮
选项

入料机构根据料盘尺寸信息升降轴到不同位置

1 个父辈 409e4b19
全部展开
内嵌 并排
正在显示 22 个修改的文件 包含 400 行增加 和 235 行删除
source/Common/Setting_Init.cs
......@@ -118,5 +118,6 @@ namespace OnlineStore.Common
/// 禁用光栅
/// </summary>
public static string DisSecurityAccess = "DisSecurityAccess";
public static string ReelHeightOffset = "ReelHeightOffset";
}
}
source/DeviceLibrary/Config/Config_BoxEquip.csv
......@@ -39,18 +39,10 @@ PRO,0,行走机构_安全位置,MoveAxis_SafePos,80000,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,料斗拉取进出轴_待机点P1,PullAxis_Inout_P1,10000,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,移栽升降轴_待机点P1,Updown_P1,880000,,,,,,,,,,,,
PRO,0,移栽升降轴_A上暂存区取料高点P2,Updown_P2,1506534,,,,,,,,,,,,
PRO,0,移栽升降轴_A上暂存区取料低点P3,Updown_P3,1362525,,,,,,,,,,,,
PRO,0,移栽升降轴_A下暂存区放料高点P4,Updown_P4,827531,,,,,,,,,,,,
PRO,0,移栽升降轴_A下暂存区放料低点P5,Updown_P5,670000,,,,,,,,,,,,
PRO,0,移栽升降轴_B上暂存区取料高点P8,Updown_P8,1506534,,,,,,,,,,,,
PRO,0,移栽升降轴_B上暂存区取料低点P9,Updown_P9,1338069,,,,,,,,,,,,
PRO,0,移栽升降轴_B下暂存区取料高点P10,Updown_P10,827531,,,,,,,,,,,,
PRO,0,移栽升降轴_B下暂存区取料低点P11,Updown_P11,651000,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,料斗拉取升降轴_待机点P1,PullAxis_Updown_P1,0,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,移栽升降轴_待机点P1,Updown_P1,0,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,A面移栽X轴_待机点P1,XAxis_A_P1,939289,,,,,,,,,,,,
PRO,0,A面移栽X轴_A进出料暂存区取放料点P2,XAxis_A_P2,1245809,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
......
source/DeviceLibrary/Config/Config_InputEquip.csv
......@@ -35,15 +35,19 @@ PRO,0,取料升降轴_待机点,Updown_P1,310000,,,,,,,,,,,,
PRO,0,取料升降轴_A料口取料点,Updown_P2_ATake,394000,,,,,,,,,,,,
PRO,0,取料升降轴_B料口取料点,Updown_P3_BTake,405356,,,,,,,,,,,,
PRO,0,取料升降轴_A上暂存区放料高点,Updown_P4_AUpperH,18000,,,,,,,,,,,,
PRO,0,取料升降轴_A上暂存区放料低点,Updown_P5_AUpperL,65798,,,,,,,,,,,,
PRO,0,取料升降轴_A上暂存区7寸放料低点,Updown_P5_AUpperL7,65798,,,,,,,,,,,,
PRO,0,取料升降轴_A下暂存区取料高点,Updown_P6_AUnderH,310000,,,,,,,,,,,,
PRO,0,取料升降轴_A下暂存区取料低点,Updown_P7_AUnderL,368000,,,,,,,,,,,,
PRO,0,取料升降轴_A下暂存区7寸取料低点,Updown_P7_AUnderL7,368000,,,,,,,,,,,,
PRO,0,取料升降轴_NG料区放料高点,Updown_P8_NGH,310000,,,,,,,,,,,,
PRO,0,取料升降轴_NG料区放料低点,Updown_P9_NGL,310000,,,,,,,,,,,,
PRO,0,取料升降轴_B上暂存区放料高点,Updown_P10_BUpperH,18000,,,,,,,,,,,,
PRO,0,取料升降轴_B上暂存区放料低点,Updown_P11_BUpperL,65798,,,,,,,,,,,,
PRO,0,取料升降轴_B上暂存区7寸放料低点,Updown_P11_BUpperL7,65798,,,,,,,,,,,,
PRO,0,取料升降轴_B下暂存区取料高点,Updown_P12_BUnderH,310000,,,,,,,,,,,,
PRO,0,取料升降轴_B下暂存区取料低点,Updown_P13_BUnderL,370000,,,,,,,,,,,,
PRO,0,取料升降轴_B下暂存区7寸取料低点,Updown_P13_BUnderL7,370000,,,,,,,,,,,,
PRO,0,取料升降轴_A上暂存区13寸放料低点,Updown_P14_AUpperL13,65798,,,,,,,,,,,,
PRO,0,取料升降轴_A下暂存区13寸取料低点,Updown_P15_AUnderL13,368000,,,,,,,,,,,,
PRO,0,取料升降轴_B上暂存区13寸放料低点,Updown_P16_BUpperL13,65798,,,,,,,,,,,,
PRO,0,取料升降轴_B下暂存区13寸取料低点,Updown_P17_BUnderL13,370000,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,取料升降轴_P1速度,Updown_P1_Speed,45000,,,,,,,,,,,,
PRO,1,取料升降轴_P2速度,Updown_P2_Speed,45000,,,,,,,,,,,,
......@@ -58,6 +62,10 @@ PRO,9,取料升降轴_P10速度,Updown_P10_Speed,45000,,,,,,,,,,,,
PRO,10,取料升降轴_P11速度,Updown_P11_Speed,45000,,,,,,,,,,,,
PRO,11,取料升降轴_P12速度,Updown_P12_Speed,45000,,,,,,,,,,,,
PRO,12,取料升降轴_P13速度,Updown_P13_Speed,45000,,,,,,,,,,,,
PRO,13,取料升降轴_P14速度,Updown_P14_Speed,45000,,,,,,,,,,,,
PRO,14,取料升降轴_P15速度,Updown_P15_Speed,45000,,,,,,,,,,,,
PRO,15,取料升降轴_P16速度,Updown_P16_Speed,45000,,,,,,,,,,,,
PRO,16,取料升降轴_P17速度,Updown_P17_Speed,45000,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,取料旋转轴_待机点,Middle_P1,126912,,,,,,,,,,,,
PRO,0,取料旋转轴_A料口取料点,Middle_P2_ATake,161600,,,,,,,,,,,,
......@@ -79,8 +87,14 @@ PRO,7,取料旋转轴_P8速度,Middle_P8_Speed,100000,,,,,,,,,,,,
PRO,0,取料旋转轴_反向间隙补偿值,MiddleAxis_Reverse_Offset,300,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,取料进出轴_待机点,Inout_P1,126912,,,,,,,,,,,,
PRO,0,取料进出轴_取料点,Inout_P2,126912,,,,,,,,,,,,
PRO,0,取料进出轴_拍照点,Inout_P3,126912,,,,,,,,,,,,
PRO,0,取料进出轴_A缓存区点,Inout_P2,126912,,,,,,,,,,,,
PRO,0,取料进出轴_B缓存区点,Inout_P3,126912,,,,,,,,,,,,
PRO,0,取料进出轴_A上料区点,Inout_P4,126912,,,,,,,,,,,,
PRO,0,取料进出轴_B上料区点,Inout_P5,126912,,,,,,,,,,,,
PRO,0,取料进出轴_NG区点,Inout_P6,126912,,,,,,,,,,,,
PRO,0,取料进出轴_P1速度,Inout_P1_Speed,100000,,,,,,,,,,,,
PRO,1,取料进出轴_P2速度,Inout_P2_Speed,100000,,,,,,,,,,,,
PRO,2,取料进出轴_P3速度,Inout_P3_Speed,100000,,,,,,,,,,,,
PRO,3,取料进出轴_P4速度,Inout_P4_Speed,100000,,,,,,,,,,,,
PRO,4,取料进出轴_P5速度,Inout_P5_Speed,100000,,,,,,,,,,,,
PRO,5,取料进出轴_P6速度,Inout_P6_Speed,100000,,,,,,,,,,,,
\ No newline at end of file
source/DeviceLibrary/Config/Config_Store.csv
......@@ -84,6 +84,10 @@ DI,1,进料防护门上升端,UpperArea_InstoreDoor_UpCheck,69,HC,X69,,,,,,,,,,,
DI,1,进料防护门下降端,UpperArea_InstoreDoor_DownCheck,70,HC,X70,,,,,,,,,,,,
DI,1,出料防护门上升端,UnderArea_OutstoreDoor_UpCheck,71,HC,X71,,,,,,,,,,,,
DI,1,出料防护门下降端,UnderArea_OutstoreDoor_DownCheck,72,HC,X72,,,,,,,,,,,,
DI,2,进料防护门上升端,UpperArea_InstoreDoor_UpCheck,69,HC,X69,,,,,,,,,,,,
DI,2,进料防护门下降端,UpperArea_InstoreDoor_DownCheck,70,HC,X70,,,,,,,,,,,,
DI,2,出料防护门上升端,UnderArea_OutstoreDoor_UpCheck,71,HC,X71,,,,,,,,,,,,
DI,2,出料防护门下降端,UnderArea_OutstoreDoor_DownCheck,72,HC,X72,,,,,,,,,,,,
DI,1,上料机构左侧防护门门禁,Feeding_LDoor_Limit,73,HC,X73,,,,,,,,,,,,
DI,1,上料机构右侧防护门门禁,Feeding_RDoor_Limit,74,HC,X74,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
......
source/DeviceLibrary/manager/model/DeviceStep.cs
......@@ -694,14 +694,14 @@ namespace OnlineStore.DeviceLibrary
/// 入料模块复位: 开始回原点，批量轴复位
/// </summary>
IR01_Wait = 1001,
/// <summary>
/// 入料模块复位: 判断旋转轴是否应该到高点
/// 1，处于A,B,NG料口是，可以直接回取料升降轴。
/// 2，处于A, B两个暂存区时，升降轴先运动到该暂存区的取放料高点，旋转轴再回原点或待机点。
/// </summary>
IR02_UpdownUpMove,
IR02_1_InoutHome,
IR02_2_InoutToP1,
/// <summary>
/// 入料模块复位: 旋转轴回原点
/// </summary>
......@@ -740,6 +740,10 @@ namespace OnlineStore.DeviceLibrary
/// 入库料串取料：升降轴到达P1
/// </summary>
II01_UpdownToP1 = 1101,
///// <summary>
///// 入料料串取料：判断进出轴是否在P1,不在的话直接到P1
///// </summary>
II01_InoutToP1,
/// <summary>
/// 入库料串取料A：取料旋转轴SVD13运动到P2（A料口取料点）
......@@ -760,7 +764,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
II06_UpdownToP3,
II07_InoutToP4P5,
/// <summary>
/// 入库料串取料：夹爪夹紧，判断到位
/// </summary>
......@@ -798,9 +802,9 @@ namespace OnlineStore.DeviceLibrary
II40_UpdownToP4,
/// <summary>
///入料->A侧：暂存区不为空，先旋转轴到P4附近位置
///入料->A侧：旋转轴到P4
/// </summary>
II41_MiddleTWaitP4,
II41_MiddleToP4,
/// <summary>
/// 入料->A侧：等待A上暂存区无料
......@@ -808,9 +812,9 @@ namespace OnlineStore.DeviceLibrary
II42_WaitNoReel = 1140,
/// <summary>
/// 入料->A侧：取料旋转轴 到P4(A上暂存区放料点)
/// 入料->A侧：取料进出轴 到P2(A暂存区放料点)
/// </summary>
II43_MiddleToP4,
II43_InoutToP2,
/// <summary>
/// 入料->A侧：取料升降轴 到P5(A上暂存区放料低点)
......@@ -825,6 +829,7 @@ namespace OnlineStore.DeviceLibrary
/// 入料->A侧：取料升降轴 到P4(A上暂存区放料高点)
/// </summary>
II46_UpdownToP4,
II47_1_InoutToP1,
/// <summary>
/// 入料->A侧：取料旋转轴 到P1(待机点)
/// </summary>
......@@ -840,15 +845,15 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 入料->B侧：暂存区有物料，旋转轴先到P5附近等待
/// </summary>
II61_MiddleToWaitP5,
II61_MiddleToP5,
/// <summary>
/// 入料->B侧：等待B上暂存区无料
/// </summary>
II62_WaitNoReel,
/// <summary>
/// 入料->B侧：取料旋转轴 到P5 (B上暂存区放料点)
/// 入料->B侧：取料进出轴 到P5 (B上暂存区放料点)
/// </summary>
II63_MiddleToP5,
II63_InoutToP3,
/// <summary>
/// 入料->B侧：取料升降轴 到P11 (B上暂存区放料低点)
......@@ -863,6 +868,7 @@ namespace OnlineStore.DeviceLibrary
/// 入料->B侧：取料升降轴 到P10 (B上暂存区放料高点)
/// </summary>
II66_UpdownToP10,
II67_1_InoutToP1,
/// <summary>
/// 入料->B侧：取料旋转轴 到P1(待机点)
/// </summary>
......@@ -871,14 +877,13 @@ namespace OnlineStore.DeviceLibrary
#region 入料->NG 1180开始
/// <summary>
/// 入料->NG：取料升降轴SVD12 运动到P8（NG料区放料高点）
/// 入料->NG：取料旋转轴SVD13 运动到P6（NG料区放料点）
/// </summary>
II81_UpdownToP8 = 1180,
II81_MiddleToNg = 1180,
/// <summary>
/// 入料->NG：取料旋转轴SVD13 运动到P6（NG料区放料点）
/// 入料->NG：取料进出轴SVD12 运动到P6（NG料区放料点）
/// </summary>
II82_MiddleToNg,
II82_InoutToP6,
/// <summary>
/// 入料->NG：取料升降轴SVD12 运动到P9（NG料区放料低点）
......@@ -893,6 +898,10 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
II85_UpdownToP8,
/// <summary>
/// 入料->NG：取料进出轴SVD 运动到P1（待机点）
/// </summary>
II86_1_InoutToP1,
/// <summary>
/// 入料->NG：取料旋转轴SVD13 运动到P1（待机点）
/// </summary>
II86_MiddleToP1,
......@@ -915,9 +924,9 @@ namespace OnlineStore.DeviceLibrary
IO02_UpdownToP6,
/// <summary>
/// A侧出料：取料旋转轴SVD13 运动到P7（A下暂存区取料点）
/// A侧出料：取料进出轴SVD13 运动到P2（A暂存区点）
/// </summary>
IO03_MiddleToP7,
IO03_InoutToP2,
/// <summary>
/// A侧出料：取料升降轴SVD12 运动到P7（A下暂存区取料低点）
......@@ -933,6 +942,7 @@ namespace OnlineStore.DeviceLibrary
/// A侧出料：取料升降轴SVD12 运动到P6（A下暂存区取料高点）
/// </summary>
IO06_UpdownToP6,
IO07_1_InoutToP1,
/// <summary>
/// A侧出料: 等待等待 X54（A出料下暂存区料盘检测）=0
/// </summary>
......@@ -952,9 +962,9 @@ namespace OnlineStore.DeviceLibrary
IO12_UpdownToP12,
/// <summary>
/// B侧出料：取料旋转轴SVD13 运动到P8（B下暂存区取料点）
/// B侧出料：取料进出轴SVD13 运动到P3（B暂存区点）
/// </summary>
IO13_MiddleToP8,
IO13_InoutToP3,
/// <summary>
/// B侧出料：取料升降轴SVD12 运动到P13（B下暂存区取料低点）
......@@ -970,7 +980,7 @@ namespace OnlineStore.DeviceLibrary
/// B侧出料：取料升降轴SVD12 运动到P12（B下暂存区取料高点）
/// </summary>
IO16_UpdownToP6,
IO17_1_InoutToP1,
/// <summary>
/// B侧出料：等待 X56（A出料下暂存区料盘检测）=0
/// </summary>
......@@ -995,9 +1005,9 @@ namespace OnlineStore.DeviceLibrary
IO23_MiddleToP2,
/// <summary>
/// 出库->A料串：取料升降轴SVD12 运动到P2（A料口取料点）
/// 出库->A料串：取料进出轴SVD12 运动到P4（A料口取料点）
/// </summary>
IO24_UpdownToP2,
IO24_InoutToP4,
/// <summary>
/// 出库->B料串：批量轴运动到位
......@@ -1010,9 +1020,9 @@ namespace OnlineStore.DeviceLibrary
IO27_MiddleToP3,
/// <summary>
/// 出库->B料串：取料升降轴SVD12 运动到P3（B料口取料点）
/// 出库->B料串：取料进出轴SVD12 运动到P5（B料口取料点）
/// </summary>
IO28_UpdownToP3,
IO28_InoutToP5,
/// <summary>
/// 出库 ：电卡爪放松 判断到位
......
source/DeviceLibrary/manager/model/InOutParam.cs
......@@ -270,7 +270,14 @@ namespace OnlineStore.DeviceLibrary
ComAxis_AB_P2 = position.ComAxis_AB_P2;
ComAxis_AB_P3 = position.ComAxis_AB_P3;
MoveAxis_P3 = position.MoveAxis_P3;
Updown_P2 = position.Updown_P2;
Updown_P3 = position.Updown_P3;
Updown_P4 = position.Updown_P4;
Updown_P5 = position.Updown_P5;
Updown_P8 = position.Updown_P8;
Updown_P9 = position.Updown_P9;
Updown_P10 = position.Updown_P10;
Updown_P11 = position.Updown_P11;
}
/// <summary>
/// 加载固定点位位置
......@@ -281,14 +288,6 @@ namespace OnlineStore.DeviceLibrary
MoveAxis_P2 = equip_Config.MoveAxis_P2;
PullAxis_Inout_P1 = equip_Config.PullAxis_Inout_P1;
Updown_P1 = equip_Config.Updown_P1;
Updown_P2 = equip_Config.Updown_P2;
Updown_P3 = equip_Config.Updown_P3;
Updown_P4 = equip_Config.Updown_P4;
Updown_P5 = equip_Config.Updown_P5;
Updown_P8 = equip_Config.Updown_P8;
Updown_P9 = equip_Config.Updown_P9;
Updown_P10 = equip_Config.Updown_P10;
Updown_P11 = equip_Config.Updown_P11;
PullAxis_Updown_P1 = equip_Config.PullAxis_Updown_P1;
XAxis_A_P1 = equip_Config.XAxis_A_P1;
XAxis_A_P2 = equip_Config.XAxis_A_P2;
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
......@@ -466,21 +466,21 @@ namespace OnlineStore.DeviceLibrary
if (IOValue(IO_Type.FeedingA_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW) || IOValue(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW))
{
MoveInfo.NextMoveStep(StepEnum.BOX_H0103_ToAInputHighPos);
if (UpdownAxis.GetAclPosition() >= (Config.Updown_P5 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P4 + axisDiff)
if (UpdownAxis.GetAclPosition() >= (MoveInfo.MoveParam.MoveP.Updown_P5 - axisDiff) && UpdownAxis.GetAclPosition() <= (MoveInfo.MoveParam.MoveP.Updown_P4 + axisDiff)
&& (BufferDataManager.AOutStoreInfo == null || IOValue(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW)))
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A下暂存区低点和高点之间,到高点P4,A面移栽X轴去暂存区P2,A面压紧轴到压紧前点P2");
ComAxis_A.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_A_P2_Speed);
XAxis_A.AbsMove(MoveInfo, Config.XAxis_A_P2, Config.XAxis_A_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P4, Config.Updown_P4_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P4, Config.Updown_P4_Speed);
}
else if (UpdownAxis.GetAclPosition() >= (Config.Updown_P3 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P2 + axisDiff)
else if (UpdownAxis.GetAclPosition() >= (MoveInfo.MoveParam.MoveP.Updown_P3 - axisDiff) && UpdownAxis.GetAclPosition() <= (MoveInfo.MoveParam.MoveP.Updown_P2 + axisDiff)
&& (BufferDataManager.AInStoreInfo == null || IOValue(IO_Type.FeedingA_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW)))
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A上暂存区低点和高点之间,到高点P2,A面移栽X轴去暂存区P2，A面压紧轴到压紧前点P2");
ComAxis_A.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_A_P2_Speed);
XAxis_A.AbsMove(MoveInfo, Config.XAxis_A_P2, Config.XAxis_A_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P2, Config.Updown_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P2, Config.Updown_P2_Speed);
}
else
{
......@@ -496,15 +496,15 @@ namespace OnlineStore.DeviceLibrary
break;
case StepEnum.BOX_H0103_ToAInputHighPos:
MoveInfo.NextMoveStep(StepEnum.BOX_H0104_ToAInputLowPos);
if (UpdownAxis.IsInPosition(Config.Updown_P2))
if (UpdownAxis.IsInPosition(MoveInfo.MoveParam.MoveP.Updown_P2))
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A上暂存区低点P3");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P3, Config.Updown_P3_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P3, Config.Updown_P3_Speed);
}
else if (UpdownAxis.IsInPosition(Config.Updown_P4))
else if (UpdownAxis.IsInPosition(MoveInfo.MoveParam.MoveP.Updown_P4))
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在A下暂存区低点P5");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P5, Config.Updown_P5_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P5, Config.Updown_P5_Speed);
}
else
{
......@@ -521,21 +521,21 @@ namespace OnlineStore.DeviceLibrary
if (IOValue(IO_Type.FeedingB_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW) || IOValue(IO_Type.FeedingB_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW))
{
MoveInfo.NextMoveStep(StepEnum.BOX_H0105_ToBInputHighPos);
if (UpdownAxis.GetAclPosition() >= (Config.Updown_P11 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P10 + axisDiff) &&
if (UpdownAxis.GetAclPosition() >= (MoveInfo.MoveParam.MoveP.Updown_P11 - axisDiff) && UpdownAxis.GetAclPosition() <= (MoveInfo.MoveParam.MoveP.Updown_P10 + axisDiff) &&
(BufferDataManager.BOutStoreInfo == null || IOValue(IO_Type.FeedingB_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW)))
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B下暂存区低点和高点之间,到高点P10,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2");
ComAxis_B.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_B_P2_Speed);
XAxis_B.AbsMove(MoveInfo, Config.XAxis_B_P2, Config.XAxis_B_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P10, Config.Updown_P10_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P10, Config.Updown_P10_Speed);
}
else if (UpdownAxis.GetAclPosition() >= (Config.Updown_P9 - axisDiff) && UpdownAxis.GetAclPosition() <= (Config.Updown_P8 + axisDiff) &&
else if (UpdownAxis.GetAclPosition() >= (MoveInfo.MoveParam.MoveP.Updown_P9 - axisDiff) && UpdownAxis.GetAclPosition() <= (MoveInfo.MoveParam.MoveP.Updown_P8 + axisDiff) &&
(BufferDataManager.BInStoreInfo == null || IOValue(IO_Type.FeedingB_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW)))
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B上暂存区低点和高点之间,到高点P8,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2");
ComAxis_B.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComAxis_AB_P2, Config.ComAxis_B_P2_Speed);
XAxis_B.AbsMove(MoveInfo, Config.XAxis_B_P2, Config.XAxis_B_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P8, Config.Updown_P8_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P8, Config.Updown_P8_Speed);
}
else
{
......@@ -552,15 +552,15 @@ namespace OnlineStore.DeviceLibrary
break;
case StepEnum.BOX_H0105_ToBInputHighPos:
MoveInfo.NextMoveStep(StepEnum.BOX_H0106_ToBInputLowPos);
if (UpdownAxis.IsInPosition(Config.Updown_P8))
if (UpdownAxis.IsInPosition(MoveInfo.MoveParam.MoveP.Updown_P8))
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B上暂存区低点P9");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P9, Config.Updown_P9_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P9, Config.Updown_P9_Speed);
}
else if (UpdownAxis.IsInPosition(Config.Updown_P10))
else if (UpdownAxis.IsInPosition(MoveInfo.MoveParam.MoveP.Updown_P10))
{
LogInfo($"复位 {MoveInfo.SLog}：移栽升降轴在B下暂存区低点P11");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P11, Config.Updown_P11_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P11, Config.Updown_P11_Speed);
}
else
{
......@@ -642,8 +642,9 @@ namespace OnlineStore.DeviceLibrary
case StepEnum.BOX_R03_XAxis_AB_ToP1:
MoveInfo.NextMoveStep(StepEnum.BOX_R04_OtherAxisToP1);
LogInfo($"复位 {MoveInfo.SLog}：行走机构、移栽升降轴、AB面移栽旋转轴返回待机位P1");
LogInfo($"复位 {MoveInfo.SLog}：行走机构、移栽升降轴、料斗升降轴，AB面移栽旋转轴返回待机位P1");
MoveAxis.AbsMove(MoveInfo, Config.MoveAxis_P1, Config.MoveAxis_P1_Speed);
PullAxis_Updown.AbsMove(MoveInfo, Config.PullAxis_Updown_P1, Config.PullAxis_Updown_P1_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P1, Config.Updown_P1_Speed);
MiddleAxis_A.AbsMove(MoveInfo, Config.MiddleAxis_A_P1, Config.MiddleAxis_A_P1_Speed);
MiddleAxis_B.AbsMove(MoveInfo, Config.MiddleAxis_B_P1, Config.MiddleAxis_B_P1_Speed);
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
......@@ -367,16 +367,16 @@ namespace OnlineStore.DeviceLibrary
if (CheckASide())
{
if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P4, Config.UpdownAxis_FindPosSpeed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P4, Config.UpdownAxis_FindPosSpeed);
else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P4, Config.Updown_P4_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P4, Config.Updown_P4_Speed);
}
else
{
if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P10, Config.UpdownAxis_FindPosSpeed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P10, Config.UpdownAxis_FindPosSpeed);
else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P10, Config.Updown_P10_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P10, Config.Updown_P10_Speed);
}
}
/// <summary>
......@@ -387,16 +387,16 @@ namespace OnlineStore.DeviceLibrary
if (CheckASide())
{
if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P2, Config.UpdownAxis_FindPosSpeed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P2, Config.UpdownAxis_FindPosSpeed);
else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P2, Config.Updown_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P2, Config.Updown_P2_Speed);
}
else
{
if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P8, Config.UpdownAxis_FindPosSpeed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P8, Config.UpdownAxis_FindPosSpeed);
else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P8, Config.Updown_P8_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P8, Config.Updown_P8_Speed);
}
}
/// <summary>
......@@ -407,16 +407,16 @@ namespace OnlineStore.DeviceLibrary
if (CheckASide())
{
if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P3, Config.UpdownAxis_FindPosSpeed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P3, Config.UpdownAxis_FindPosSpeed);
else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P3, Config.Updown_P3_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P3, Config.Updown_P3_Speed);
}
else
{
if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P9, Config.UpdownAxis_FindPosSpeed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P9, Config.UpdownAxis_FindPosSpeed);
else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P9, Config.Updown_P9_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P9, Config.Updown_P9_Speed);
}
}
/// <summary>
......@@ -427,16 +427,16 @@ namespace OnlineStore.DeviceLibrary
if (CheckASide())
{
if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P5, Config.UpdownAxis_FindPosSpeed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P5, Config.UpdownAxis_FindPosSpeed);
else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P5, Config.Updown_P5_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P5, Config.Updown_P5_Speed);
}
else
{
if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P11, Config.UpdownAxis_FindPosSpeed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P11, Config.UpdownAxis_FindPosSpeed);
else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P11, Config.Updown_P11_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P11, Config.Updown_P11_Speed);
}
}
#endregion
......@@ -862,6 +862,34 @@ namespace OnlineStore.DeviceLibrary
case "A_Col6_Sig_Shield":
res = Config.A_Col6_Sig_Shield;
break;
case "A_Col7_Sig_Shield":
res = Config.A_Col7_Sig_Shield;
break;
case "A_Col8_Sig_Shield":
res = Config.A_Col8_Sig_Shield;
break;
case "A_Col9_Sig_Shield":
res = Config.A_Col9_Sig_Shield;
break;
case "A_Col10_Sig_Shield":
res = Config.A_Col10_Sig_Shield;
break;
case "A_Col11_Sig_Shield":
res = Config.A_Col11_Sig_Shield;
break;
case "A_Col12_Sig_Shield":
res = Config.A_Col12_Sig_Shield;
break;
case "A_Col13_Sig_Shield":
res = Config.A_Col13_Sig_Shield;
break;
case "A_Col14_Sig_Shield":
res = Config.A_Col14_Sig_Shield;
break;
case "A_Col15_Sig_Shield":
res = Config.A_Col15_Sig_Shield;
break;
case "B_Col1_Sig_Shield":
res = Config.B_Col1_Sig_Shield;
break;
......@@ -880,6 +908,33 @@ namespace OnlineStore.DeviceLibrary
case "B_Col6_Sig_Shield":
res = Config.B_Col6_Sig_Shield;
break;
case "B_Col7_Sig_Shield":
res = Config.B_Col7_Sig_Shield;
break;
case "B_Col8_Sig_Shield":
res = Config.B_Col8_Sig_Shield;
break;
case "B_Col9_Sig_Shield":
res = Config.B_Col9_Sig_Shield;
break;
case "B_Col10_Sig_Shield":
res = Config.B_Col10_Sig_Shield;
break;
case "B_Col11_Sig_Shield":
res = Config.B_Col11_Sig_Shield;
break;
case "B_Col12_Sig_Shield":
res = Config.B_Col12_Sig_Shield;
break;
case "B_Col13_Sig_Shield":
res = Config.B_Col13_Sig_Shield;
break;
case "B_Col14_Sig_Shield":
res = Config.B_Col14_Sig_Shield;
break;
case "B_Col15_Sig_Shield":
res = Config.B_Col15_Sig_Shield;
break;
}
LogInfo(string.Format("列信号屏蔽状态：{0}={1}", name, res == 0 ? "屏蔽" : "开启"));
return res == 0 ? true : false;
......@@ -948,10 +1003,6 @@ namespace OnlineStore.DeviceLibrary
return true;
return false;
}
private bool UpdownAxisCanMove()
{
return false;
}
#region 相机检查库位
#endregion
......
source/DeviceLibrary/storeBean/inputBean/InputEquip.cs
......@@ -41,17 +41,24 @@ namespace OnlineStore.DeviceLibrary
this.DeviceID = config.Id;
baseConfig = config;
this.Config = config;
string[] offsetMap = ConfigAppSettings.GetValue(Setting_Init.ReelHeightOffset).Split('#');
foreach (var item in offsetMap)
{
string[] maps = item.Split('=');
if (maps != null && maps.Length == 2)
reelHeightOffset.Add(int.Parse(maps[0]), int.Parse(maps[1]));
}
IsDebug = config.IsDebug.Equals(1);
Init();
ledProcessTimer.Elapsed += LedProcess;
IoCheckTimer.Elapsed += IoCheckTimerProcess;
MiddleAxis = new AxisBean(config.TakeAxis_Middle, Name, false);
UpdownAxis = new AxisBean(config.TakeAxis_Updown, Name, false);
InOutAxis = new AxisBean(config.TakeAxis_Inout, Name, false);
MiddleAxis = new AxisBean(config.TakeAxis_Middle, Name, true);
UpdownAxis = new AxisBean(config.TakeAxis_Updown, Name, true);
InOutAxis = new AxisBean(config.TakeAxis_Inout, Name, true);
BatchAxis_A = new AxisBean(config.BatchAxis_A, Name, true);
BatchAxis_B = new AxisBean(config.BatchAxis_B, Name, true);
moveAxisArray = new AxisBean[] { MiddleAxis, UpdownAxis,InOutAxis};
moveAxisArray = new AxisBean[] { MiddleAxis, UpdownAxis, InOutAxis };
if (config.UseClampJaw.Equals(1))
{
ClampJaw = new ClampJawBean(StoreManager.Config.CLAW_Input);
......@@ -192,14 +199,14 @@ namespace OnlineStore.DeviceLibrary
if (MiddleAxis.IsInPosition(Config.Middle_P4_AUpper, middleWucha) || MiddleAxis.IsInPosition(Config.Middle_P7_AUnder, middleWucha))
{
//如果升降轴低于下方高点
if (updownP > Config.Updown_P6_AUnderH - updownWucha)
if (updownP < Config.Updown_P6_AUnderH + updownWucha)
{
MoveInfo.NextMoveStep(StepEnum.IR02_UpdownUpMove);
LogInfo($"复位 {MoveInfo.SLog}：当前旋转轴在 A侧暂存区{middleP}，升降轴当前位置{updownP}，低于下方高点，升降轴先到P6:{Config.Updown_P6_AUnderH}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P6_AUnderH, Config.Updown_P6_Speed);
}
//升降轴高于上方低点
else if (updownP < Config.Updown_P5_AUpperL + updownWucha)
else if (updownP > Config.Updown_P5_AUpperL7 - updownWucha)
{
MoveInfo.NextMoveStep(StepEnum.IR02_UpdownUpMove);
LogInfo($"复位 {MoveInfo.SLog}：当前旋转轴在 A侧暂存区{middleP}，升降轴当前位置{updownP}，高于上方低点，升降轴到上方高点P4:{Config.Updown_P4_AUpperH}");
......@@ -214,14 +221,14 @@ namespace OnlineStore.DeviceLibrary
else if (MiddleAxis.IsInPosition(Config.Middle_P5_BUpper, middleWucha) || MiddleAxis.IsInPosition(Config.Middle_P8_BUnder, middleWucha))
{
//如果升降轴低于下方高点
if (updownP > Config.Updown_P12_BUnderH - updownWucha)
if (updownP < Config.Updown_P12_BUnderH + updownWucha)
{
MoveInfo.NextMoveStep(StepEnum.IR02_UpdownUpMove);
LogInfo($"复位 {MoveInfo.SLog}：当前旋转轴在 B侧暂存区{middleP}，升降轴当前位置{updownP}，低于下方高点，升降轴先到12:{Config.Updown_P12_BUnderH}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P12_BUnderH, Config.Updown_P12_BUnderH);
}
//升降轴高于上方低点
else if (updownP < Config.Updown_P11_BUpperL + updownWucha)
else if (updownP > Config.Updown_P11_BUpperL7 - updownWucha)
{
MoveInfo.NextMoveStep(StepEnum.IR02_UpdownUpMove);
LogInfo($"复位 {MoveInfo.SLog}：当前旋转轴在 B侧暂存区{middleP}，升降轴当前位置{updownP}，高于上方低点，升降轴到上方高点P10:{Config.Updown_P10_BUpperH}");
......@@ -235,21 +242,38 @@ namespace OnlineStore.DeviceLibrary
}
else
{
if (MiddleAxis.IsNeedHome)
if (InOutAxis.IsNeedHome)
{
MoveInfo.NextMoveStep(StepEnum.IR03_MiddleHome);
LogInfo($"复位{MoveInfo.SLog}：旋转轴回原点");
MiddleAxis.HomeMove(MoveInfo);
MoveInfo.NextMoveStep(StepEnum.IR02_1_InoutHome);
LogInfo($"复位{MoveInfo.SLog}：进出轴回原点");
InOutAxis.HomeMove(MoveInfo);
}
else
{
IR04_MiddleToP1();
IR02_1_InoutToP1();
}
}
}
else if (MoveInfo.IsStep(StepEnum.IR02_UpdownUpMove))
{
if (InOutAxis.IsNeedHome)
{
MoveInfo.NextMoveStep(StepEnum.IR02_1_InoutHome);
LogInfo($"复位{MoveInfo.SLog}：进出轴回原点");
InOutAxis.HomeMove(MoveInfo);
}
else
{
IR02_1_InoutToP1();
}
}
else if (MoveInfo.IsStep(StepEnum.IR02_1_InoutHome))
{
IR02_1_InoutToP1();
}
else if (MoveInfo.IsStep(StepEnum.IR02_2_InoutToP1))
{
if (MiddleAxis.IsNeedHome)
{
MoveInfo.NextMoveStep(StepEnum.IR03_MiddleHome);
......@@ -269,7 +293,7 @@ namespace OnlineStore.DeviceLibrary
{
//旋转轴到达P1结束，设置反向补偿间隙
HCBoardManager.SetAxBacklash(MiddleAxis.Config.GetAxisValue(), Config.MiddleAxis_Reverse_Offset, MiddleAxis.Config.HomeLowSpeed, -1);
LogInfo($"复位{MoveInfo.SLog}：旋转轴回待机点P1完成，设置反向补偿：axisNo【{MiddleAxis.Config.GetAxisValue() }】补偿值【{Config.MiddleAxis_Reverse_Offset}】速度【{MiddleAxis.Config.HomeLowSpeed}】");
LogInfo($"复位{MoveInfo.SLog}：旋转轴回待机点P1完成，设置反向补偿：axisNo【{MiddleAxis.Config.GetAxisValue()}】补偿值【{Config.MiddleAxis_Reverse_Offset}】速度【{MiddleAxis.Config.HomeLowSpeed}】");
if (UpdownAxis.IsNeedHome)
......@@ -385,6 +409,12 @@ namespace OnlineStore.DeviceLibrary
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
}
}
private void IR02_1_InoutToP1()
{
MoveInfo.NextMoveStep(StepEnum.IR02_2_InoutToP1);
LogInfo($"复位{MoveInfo.SLog}：进出轴到待机点：" + Config.Inout_P1);
InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
}
private void IR04_MiddleToP1()
{
......@@ -663,7 +693,7 @@ namespace OnlineStore.DeviceLibrary
}
}
//升降轴高于上方低点
else if (updownP < Config.Updown_P5_AUpperL + updownWucha)
else if (updownP < Config.Updown_P5_AUpperL7 + updownWucha)
{
if (areaNums.Contains(1))
{
......@@ -689,7 +719,7 @@ namespace OnlineStore.DeviceLibrary
}
}
//升降轴高于上方低点
else if (updownP < Config.Updown_P11_BUpperL + updownWucha)
else if (updownP < Config.Updown_P11_BUpperL7 + updownWucha)
{
if (areaNums.Contains(3))
{
......@@ -806,12 +836,12 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.MoveType.Equals(MoveType.None))
{
SetWarnMsg("光栅被遮挡，暂停运动");
LogUtil.info($"{Name }光栅被遮挡，暂停运动，MoveStop={MoveStop}，{msg}，稍后复位");
LogUtil.info($"{Name}光栅被遮挡，暂停运动，MoveStop={MoveStop}，{msg}，稍后复位");
}
else
{
SetWarnMsg("光栅被遮挡，暂停当前运动");
LogUtil.info($"{Name }光栅被遮挡，停止当前运动{MoveInfo.MoveType},{MoveInfo.MoveStep}，{msg}，稍后复位");
LogUtil.info($"{Name}光栅被遮挡，停止当前运动{MoveInfo.MoveType},{MoveInfo.MoveStep}，{msg}，稍后复位");
}
}
......@@ -840,11 +870,11 @@ namespace OnlineStore.DeviceLibrary
if (!MoveInfo.MoveType.Equals(MoveType.None))
{
MoveInfo.LastSetpTime = DateTime.Now;
LogUtil.info($"{Name }光栅已恢复，恢复当前运动{MoveInfo.MoveType},{MoveInfo.MoveStep} ");
LogUtil.info($"{Name}光栅已恢复，恢复当前运动{MoveInfo.MoveType},{MoveInfo.MoveStep} ");
}
else
{
LogUtil.info($"{Name }光栅已恢复，取消暂停运动");
LogUtil.info($"{Name}光栅已恢复，取消暂停运动");
}
}
}
......
source/LoadCVSLibrary/position/BoxPosition.cs
......@@ -81,6 +81,53 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
[CSVAttribute("料斗拉取升降轴_料屉提取水平点P2")]
public int PullAxis_Updown_P2 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_A上暂存区取料高点P2,Updown_P2,100,,,,,,,,,,,,
/// </summary>
[CSVAttribute("移栽升降轴_A上暂存区取料高点P2")]
public int Updown_P2 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_A上暂存区取料低点P3,Updown_P3,100,,,,,,,,,,,,
/// </summary>
[CSVAttribute("移栽升降轴_A上暂存区取料低点P3")]
public int Updown_P3 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_A下暂存区放料高点P4,Updown_P4,100,,,,,,,,,,,,
/// </summary>
[CSVAttribute("移栽升降轴_A下暂存区放料高点P4")]
public int Updown_P4 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_A下暂存区放料低点P5,Updown_P5,100,,,,,,,,,,,,
/// </summary>
[CSVAttribute("移栽升降轴_A下暂存区放料低点P5")]
public int Updown_P5 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_B上暂存区取料高点P8,Updown_P8,100,,,,,,,,,,,,
/// </summary>
[CSVAttribute("移栽升降轴_B上暂存区取料高点P8")]
public int Updown_P8 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_B上暂存区取料低点P9,Updown_P9,100,,,,,,,,,,,,
/// </summary>
[CSVAttribute("移栽升降轴_B上暂存区取料低点P9")]
public int Updown_P9 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_B下暂存区取料高点P10,Updown_P10,100,,,,,,,,,,,,
/// </summary>
[CSVAttribute("移栽升降轴_B下暂存区取料高点P10")]
public int Updown_P10 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_B下暂存区取料低点P11,Updown_P11,100,,,,,,,,,,,,
/// </summary>
[CSVAttribute("移栽升降轴_B下暂存区取料低点P11")]
public int Updown_P11 { get; set; }
public static bool CheckPosition(BoxPosition position, BoxEquip_Config Config)
{
try
......
source/LoadCVSLibrary/storeConfig/config/BoxEquip_Config.cs
......@@ -215,54 +215,6 @@ namespace OnlineStore.LoadCSVLibrary
public int Updown_P1 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_A上暂存区取料高点P2,Updown_P2,100,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P2")]
public int Updown_P2 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_A上暂存区取料低点P3,Updown_P3,100,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P3")]
public int Updown_P3 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_A下暂存区放料高点P4,Updown_P4,100,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P4")]
public int Updown_P4 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_A下暂存区放料低点P5,Updown_P5,100,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P5")]
public int Updown_P5 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_B上暂存区取料高点P8,Updown_P8,100,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P8")]
public int Updown_P8 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_B上暂存区取料低点P9,Updown_P9,100,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P9")]
public int Updown_P9 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_B下暂存区取料高点P10,Updown_P10,100,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P10")]
public int Updown_P10 { get; set; }
/// <summary>
/// PRO,0,移栽升降轴_B下暂存区取料低点P11,Updown_P11,100,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P11")]
public int Updown_P11 { get; set; }
/// <summary>
/// PRO,0,料斗拉取升降轴_待机点P1,PullAxis_Updown_P1,100,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("PullAxis_Updown_P1")]
......
source/LoadCVSLibrary/storeConfig/config/InputEquip_Config.cs
......@@ -155,20 +155,20 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Updown_P4_AUpperH")]
public int Updown_P4_AUpperH { get; set; }
/// <summary>
/// PRO,0,取料升降轴_A上暂存区放料低点,Updown_P5_AUpperL,104,,,,,,,,,,,,
/// PRO,0,取料升降轴_A上暂存区7寸放料低点,Updown_P5_AUpperL7,65798,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P5_AUpperL")]
public int Updown_P5_AUpperL { get; set; }
[ConfigProAttribute("Updown_P5_AUpperL7")]
public int Updown_P5_AUpperL7 { get; set; }
/// <summary>
/// PRO,0,取料升降轴_A下暂存区取料高点,Updown_P6_AUnderH,105,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P6_AUnderH")]
public int Updown_P6_AUnderH { get; set; }
/// <summary>
/// PRO,0,取料升降轴_A下暂存区取料低点,Updown_P7_AUnderL,106,,,,,,,,,,,,
/// PRO,0,取料升降轴_A下暂存区7寸取料低点,Updown_P7_AUnderL7,368000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P7_AUnderL")]
public int Updown_P7_AUnderL { get; set; }
[ConfigProAttribute("Updown_P7_AUnderL7")]
public int Updown_P7_AUnderL7 { get; set; }
/// <summary>
/// PRO,0,取料升降轴_NG料区放料高点,Updown_P8_NGH,107,,,,,,,,,,,,
/// </summary>
......@@ -185,20 +185,41 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Updown_P10_BUpperH")]
public int Updown_P10_BUpperH { get; set; }
/// <summary>
/// PRO,0,取料升降轴_B上暂存区放料低点,Updown_P11_BUpperL,110,,,,,,,,,,,,
/// PRO,0,取料升降轴_B上暂存区7寸放料低点,Updown_P11_BUpperL7,65798,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P11_BUpperL")]
public int Updown_P11_BUpperL { get; set; }
[ConfigProAttribute("Updown_P11_BUpperL7")]
public int Updown_P11_BUpperL7 { get; set; }
/// <summary>
/// PRO,0,取料升降轴_B下暂存区取料高点,Updown_P12_BUnderH,111,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P12_BUnderH")]
public int Updown_P12_BUnderH { get; set; }
/// <summary>
/// PRO,0,取料升降轴_B下暂存区取料低点,Updown_P13_BUnderL,112,,,,,,,,,,,,
/// PRO,0,取料升降轴_B下暂存区7寸取料低点,Updown_P13_BUnderL7,370000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P13_BUnderL")]
public int Updown_P13_BUnderL { get; set; }
[ConfigProAttribute("Updown_P13_BUnderL7")]
public int Updown_P13_BUnderL7 { get; set; }
/// <summary>
/// PRO,0,取料升降轴_A上暂存区13寸放料低点,Updown_P14_AUpperL13,65798,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P14_AUpperL13")]
public int Updown_P14_AUpperL13 { get; set; }
/// <summary>
/// PRO,0,取料升降轴_A下暂存区13寸取料低点,Updown_P15_AUnderL13,368000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P15_AUnderL13")]
public int Updown_P15_AUnderL13 { get; set; }
/// <summary>
/// PRO,0,取料升降轴_B上暂存区13寸放料低点,Updown_P16_BUpperL13,65798,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P16_BUpperL13")]
public int Updown_P16_BUpperL13 { get; set; }
/// <summary>
/// PRO,0,取料升降轴_B下暂存区13寸取料低点,Updown_P17_BUnderL13,370000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P17_BUnderL13")]
public int Updown_P17_BUnderL13 { get; set; }
/// <summary>
/// PRO,0,取料升降轴_P1速度,Updown_P1_Speed,108,,,,,,,,,,,,
/// </summary>
......@@ -265,6 +286,26 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Updown_P13_Speed")]
public int Updown_P13_Speed { get; set; }
/// <summary>
/// PRO,13,取料升降轴_P14速度,Updown_P14_Speed,45000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P14_Speed")]
public int Updown_P14_Speed { get; set; }
/// <summary>
/// PRO,14,取料升降轴_P15速度,Updown_P15_Speed,45000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P15_Speed")]
public int Updown_P15_Speed { get; set; }
/// <summary>
/// PRO,15,取料升降轴_P16速度,Updown_P16_Speed,45000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P16_Speed")]
public int Updown_P16_Speed { get; set; }
/// <summary>
/// PRO,16,取料升降轴_P17速度,Updown_P17_Speed,45000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Updown_P17_Speed")]
public int Updown_P17_Speed { get; set; }
/// <summary>
/// PRO,0,取料升降轴_待机点,Middle_P1,100,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Middle_P1")]
......@@ -373,16 +414,31 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Inout_P1", false)]
public int Inout_P1 { get; set; }
/// <summary>
/// PRO,0,取料进出轴_取料点,Inout_P2,126912,,,,,,,,,,,,
/// PRO,0,取料进出轴_A缓存区点,Inout_P2,126912,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Inout_P2", false)]
public int Inout_P2 { get; set; }
/// <summary>
/// PRO,0,取料进出轴_拍照点,Inout_P3,126912,,,,,,,,,,,,
/// PRO,0,取料进出轴_B缓存区点,Inout_P3,126912,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Inout_P3", false)]
public int Inout_P3 { get; set; }
/// <summary>
/// PRO,0,取料进出轴_A上料区点,Inout_P4,126912,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Inout_P4", false)]
public int Inout_P4 { get; set; }
/// <summary>
/// PRO,0,取料进出轴_B上料区点,Inout_P5,126912,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Inout_P5", false)]
public int Inout_P5 { get; set; }
/// <summary>
/// PRO,0,取料进出轴_NG区点,Inout_P6,126912,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Inout_P6", false)]
public int Inout_P6 { get; set; }
/// <summary>
/// PRO,0,取料进出轴_P1速度,Inout_P1_Speed,100000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Inout_P1_Speed", false)]
......@@ -397,6 +453,21 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
[ConfigProAttribute("Inout_P3_Speed", false)]
public int Inout_P3_Speed { get; set; }
/// <summary>
/// PRO,3,取料进出轴_P4速度,Inout_P4_Speed,100000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Inout_P4_Speed", false)]
public int Inout_P4_Speed { get; set; }
/// <summary>
/// PRO,4,取料进出轴_P5速度,Inout_P5_Speed,100000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Inout_P5_Speed", false)]
public int Inout_P5_Speed { get; set; }
/// <summary>
/// PRO,5,取料进出轴_P6速度,Inout_P6_Speed,100000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("Inout_P6_Speed", false)]
public int Inout_P6_Speed { get; set; }
private List<string> CameraList = null;
......
source/XLRStoreClient/App.config
......@@ -71,6 +71,8 @@
<add key="AShelfInfo" value="{&quot;ShelfRfid&quot;:&quot;000&quot;,&quot;ShelfState&quot;:2,&quot;XuniRfid&quot;:&quot;&quot;}"/>
<add key="UseSecurityAccess" value="1"/>
<add key="UseBuzzer" value="0"/>
<!--料盘厚度对应的偏移量-->
<add key="ReelHeightOffset" value="12=0#16=100#24=200#32=300"/>
</appSettings>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
source/XLRStoreClient/boxForm/FrmAxisMove.cs
......@@ -57,8 +57,8 @@ namespace OnlineStore.XLRStore
LoadBoxPostion(ktkPosition);
InOutPosInfo posInfo = new InOutPosInfo();
posInfo.PosId = posId;
posSide = posInfo.GetPosSide();
groupBox13.Text = $"库位位置信息[{posId}]";
posSide = posInfo.GetPosSide();
tabControl1.TabPages[1].Text = $"库位[{posId}][{ktkPosition.BagWidth}*{ktkPosition.BagHigh}]位置信息";
groupBox19.Text = posSide + "面移栽X轴";
groupBox24.Text = posSide + "面移栽压紧轴";
if (posSide.Equals("A"))
......@@ -100,14 +100,6 @@ namespace OnlineStore.XLRStore
txtPullAxis_Inout_P1.Text = boxEquip.Config.PullAxis_Inout_P1.ToString();
txtPullAxis_Updown_P1.Text = boxEquip.Config.PullAxis_Updown_P1.ToString();
txtUpdown_P1.Text = boxEquip.Config.Updown_P1.ToString();
txtUpdown_P10.Text = boxEquip.Config.Updown_P10.ToString();
txtUpdown_P11.Text = boxEquip.Config.Updown_P11.ToString();
txtUpdown_P2.Text = boxEquip.Config.Updown_P2.ToString();
txtUpdown_P3.Text = boxEquip.Config.Updown_P3.ToString();
txtUpdown_P4.Text = boxEquip.Config.Updown_P4.ToString();
txtUpdown_P5.Text = boxEquip.Config.Updown_P5.ToString();
txtUpdown_P8.Text = boxEquip.Config.Updown_P8.ToString();
txtUpdown_P9.Text = boxEquip.Config.Updown_P9.ToString();
txtXAxis_A_P1.Text = boxEquip.Config.XAxis_A_P1.ToString();
txtXAxis_A_P2.Text = boxEquip.Config.XAxis_A_P2.ToString();
txtXAxis_B_P1.Text = boxEquip.Config.XAxis_B_P1.ToString();
......@@ -128,8 +120,16 @@ namespace OnlineStore.XLRStore
txtUpdown_P6_P12.Text = boxPosition.Updown_P6_P12.ToString();
txtUpdown_P7_P13.Text = boxPosition.Updown_P7_P13.ToString();
txtXAxis_AB_P3.Text = boxPosition.XAxis_AB_P3.ToString();
txtUpdown_P10.Text = boxPosition.Updown_P10.ToString();
txtUpdown_P11.Text = boxPosition.Updown_P11.ToString();
txtUpdown_P2.Text = boxPosition.Updown_P2.ToString();
txtUpdown_P3.Text = boxPosition.Updown_P3.ToString();
txtUpdown_P4.Text = boxPosition.Updown_P4.ToString();
txtUpdown_P5.Text = boxPosition.Updown_P5.ToString();
txtUpdown_P8.Text = boxPosition.Updown_P8.ToString();
txtUpdown_P9.Text = boxPosition.Updown_P9.ToString();
}
internal void DebugStatus(bool isDebug)
public void DebugStatus(bool isDebug)
{
axisMoveControl1.Enabled = isDebug;
tabControl1.Enabled = isDebug;
......@@ -507,47 +507,7 @@ namespace OnlineStore.XLRStore
{
boxEquip.Config.Updown_P1 = FormUtil.GetIntValue(txtUpdown_P1);
needUpdate = true;
}
if (boxEquip.Config.Updown_P10 != FormUtil.GetIntValue(txtUpdown_P10))
{
boxEquip.Config.Updown_P10 = FormUtil.GetIntValue(txtUpdown_P10);
needUpdate = true;
}
if (boxEquip.Config.Updown_P11 != FormUtil.GetIntValue(txtUpdown_P11))
{
boxEquip.Config.Updown_P11 = FormUtil.GetIntValue(txtUpdown_P11);
needUpdate = true;
}
if (boxEquip.Config.Updown_P2 != FormUtil.GetIntValue(txtUpdown_P2))
{
boxEquip.Config.Updown_P2 = FormUtil.GetIntValue(txtUpdown_P2);
needUpdate = true;
}
if (boxEquip.Config.Updown_P3 != FormUtil.GetIntValue(txtUpdown_P3))
{
boxEquip.Config.Updown_P3 = FormUtil.GetIntValue(txtUpdown_P3);
needUpdate = true;
}
if (boxEquip.Config.Updown_P4 != FormUtil.GetIntValue(txtUpdown_P4))
{
boxEquip.Config.Updown_P4 = FormUtil.GetIntValue(txtUpdown_P4);
needUpdate = true;
}
if (boxEquip.Config.Updown_P5 != FormUtil.GetIntValue(txtUpdown_P5))
{
boxEquip.Config.Updown_P5 = FormUtil.GetIntValue(txtUpdown_P5);
needUpdate = true;
}
if (boxEquip.Config.Updown_P8 != FormUtil.GetIntValue(txtUpdown_P8))
{
boxEquip.Config.Updown_P8 = FormUtil.GetIntValue(txtUpdown_P8);
needUpdate = true;
}
if (boxEquip.Config.Updown_P9 != FormUtil.GetIntValue(txtUpdown_P9))
{
boxEquip.Config.Updown_P9 = FormUtil.GetIntValue(txtUpdown_P9);
needUpdate = true;
}
}
if (boxEquip.Config.XAxis_A_P1 != FormUtil.GetIntValue(txtXAxis_A_P1))
{
boxEquip.Config.XAxis_A_P1 = FormUtil.GetIntValue(txtXAxis_A_P1);
......@@ -615,6 +575,14 @@ namespace OnlineStore.XLRStore
ktkPosition.Updown_P6_P12 = FormUtil.GetIntValue(txtUpdown_P6_P12);
ktkPosition.Updown_P7_P13 = FormUtil.GetIntValue(txtUpdown_P7_P13);
ktkPosition.XAxis_AB_P3 = FormUtil.GetIntValue(txtXAxis_AB_P3);
ktkPosition.Updown_P10 = FormUtil.GetIntValue(txtUpdown_P10);
ktkPosition.Updown_P11 = FormUtil.GetIntValue(txtUpdown_P11);
ktkPosition.Updown_P2 = FormUtil.GetIntValue(txtUpdown_P2);
ktkPosition.Updown_P3 = FormUtil.GetIntValue(txtUpdown_P3);
ktkPosition.Updown_P4 = FormUtil.GetIntValue(txtUpdown_P4);
ktkPosition.Updown_P5 = FormUtil.GetIntValue(txtUpdown_P5);
ktkPosition.Updown_P8 = FormUtil.GetIntValue(txtUpdown_P8);
ktkPosition.Updown_P9 = FormUtil.GetIntValue(txtUpdown_P9);
}
//位置配置
string appPath = Application.StartupPath;
......
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
......@@ -535,6 +535,7 @@ namespace OnlineStore.XLRStore
}
else
{
frmAxisMove.DebugStatus(boxBean.IsDebug);
frmAxisMove.ShowDialog();
}
}
......
source/XLRStoreClient/inputForm/FrmInputEquip.cs
......@@ -331,7 +331,7 @@ namespace OnlineStore.XLRStore
clampJawControl1.ShowData();
}
axisMoveControl1.LoadData(inputEquip, new AxisBean[] { inputEquip.MiddleAxis, inputEquip.UpdownAxis });
axisMoveControl1.LoadData(inputEquip, new AxisBean[] { inputEquip.MiddleAxis, inputEquip.UpdownAxis,inputEquip.InOutAxis});
FrmBatchMove frmMove1 = new FrmBatchMove(inputEquip.BatchMove_A);
AddForm(tabControl1, " " + inputEquip.BatchMove_A.Name + " ", frmMove1);
......@@ -358,16 +358,27 @@ namespace OnlineStore.XLRStore
updownAxisP2.SetMoveData(inputEquip.UpdownAxis, config.Updown_P2_Speed,config.Updown_P2_ATake);
updownAxisP3.SetMoveData(inputEquip.UpdownAxis, config.Updown_P3_Speed,config.Updown_P3_BTake);
updownAxisP4.SetMoveData(inputEquip.UpdownAxis, config.Updown_P4_Speed,config.Updown_P4_AUpperH);
updownAxisP5.SetMoveData(inputEquip.UpdownAxis, config.Updown_P5_Speed,config.Updown_P5_AUpperL);
updownAxisP5.SetMoveData(inputEquip.UpdownAxis, config.Updown_P5_Speed,config.Updown_P5_AUpperL7);
updownAxisP6.SetMoveData(inputEquip.UpdownAxis, config.Updown_P6_Speed,config.Updown_P6_AUnderH);
updownAxisP7.SetMoveData(inputEquip.UpdownAxis, config.Updown_P7_Speed,config.Updown_P7_AUnderL);
updownAxisP7.SetMoveData(inputEquip.UpdownAxis, config.Updown_P7_Speed,config.Updown_P7_AUnderL7);
updownAxisP8.SetMoveData(inputEquip.UpdownAxis, config.Updown_P8_Speed,config.Updown_P8_NGH);
updownAxisP9.SetMoveData(inputEquip.UpdownAxis, config.Updown_P9_Speed,config.Updown_P9_NGL);
updownAxisP10.SetMoveData(inputEquip.UpdownAxis, config.Updown_P10_Speed,config.Updown_P10_BUpperH);
updownAxisP11.SetMoveData(inputEquip.UpdownAxis, config.Updown_P11_Speed,config.Updown_P11_BUpperL);
updownAxisP11.SetMoveData(inputEquip.UpdownAxis, config.Updown_P11_Speed,config.Updown_P11_BUpperL7);
updownAxisP12.SetMoveData(inputEquip.UpdownAxis, config.Updown_P12_Speed,config.Updown_P12_BUnderH);
updownAxisP13.SetMoveData(inputEquip.UpdownAxis, config.Updown_P13_Speed,config.Updown_P13_BUnderL);
updownAxisP13.SetMoveData(inputEquip.UpdownAxis, config.Updown_P13_Speed,config.Updown_P13_BUnderL7);
updownAxisP14.SetMoveData(inputEquip.UpdownAxis, config.Updown_P14_Speed, config.Updown_P14_AUpperL13);
updownAxisP15.SetMoveData(inputEquip.UpdownAxis, config.Updown_P15_Speed, config.Updown_P15_AUnderL13);
updownAxisP16.SetMoveData(inputEquip.UpdownAxis, config.Updown_P16_Speed, config.Updown_P16_BUpperL13);
updownAxisP17.SetMoveData(inputEquip.UpdownAxis, config.Updown_P17_Speed, config.Updown_P17_BUnderL13);
inoutAxisP1.SetMoveData(inputEquip.InOutAxis, config.Inout_P1_Speed, config.Inout_P1);
inoutAxisP2.SetMoveData(inputEquip.InOutAxis, config.Inout_P2_Speed, config.Inout_P2);
inoutAxisP3.SetMoveData(inputEquip.InOutAxis, config.Inout_P3_Speed, config.Inout_P3);
inoutAxisP4.SetMoveData(inputEquip.InOutAxis, config.Inout_P4_Speed, config.Inout_P4);
inoutAxisP5.SetMoveData(inputEquip.InOutAxis, config.Inout_P5_Speed, config.Inout_P5);
inoutAxisP6.SetMoveData(inputEquip.InOutAxis, config.Inout_P6_Speed, config.Inout_P6);
}
protected void AddForm(TabControl tabcon, string text, Form form)
{
......@@ -583,15 +594,19 @@ namespace OnlineStore.XLRStore
inputEquip.Config.Updown_P2_ATake = updownAxisP2.PointValue;
inputEquip.Config.Updown_P3_BTake = updownAxisP3.PointValue;
inputEquip.Config.Updown_P4_AUpperH = updownAxisP4.PointValue;
inputEquip.Config.Updown_P5_AUpperL = updownAxisP5.PointValue;
inputEquip.Config.Updown_P5_AUpperL7 = updownAxisP5.PointValue;
inputEquip.Config.Updown_P6_AUnderH = updownAxisP6.PointValue;
inputEquip.Config.Updown_P7_AUnderL = updownAxisP7.PointValue;
inputEquip.Config.Updown_P7_AUnderL7 = updownAxisP7.PointValue;
inputEquip.Config.Updown_P8_NGH = updownAxisP8.PointValue;
inputEquip.Config.Updown_P9_NGL = updownAxisP9.PointValue;
inputEquip.Config.Updown_P10_BUpperH = updownAxisP10.PointValue;
inputEquip.Config.Updown_P11_BUpperL = updownAxisP11.PointValue;
inputEquip.Config.Updown_P11_BUpperL7 = updownAxisP11.PointValue;
inputEquip.Config.Updown_P12_BUnderH = updownAxisP12.PointValue;
inputEquip.Config.Updown_P13_BUnderL = updownAxisP13.PointValue;
inputEquip.Config.Updown_P13_BUnderL7 = updownAxisP13.PointValue;
inputEquip.Config.Updown_P14_AUpperL13 = updownAxisP14.PointValue;
inputEquip.Config.Updown_P15_AUnderL13 = updownAxisP15.PointValue;
inputEquip.Config.Updown_P16_BUpperL13 = updownAxisP16.PointValue;
inputEquip.Config.Updown_P17_BUnderL13 = updownAxisP17.PointValue;
inputEquip.Config.Middle_P1 = mideleAxisP1.PointValue;
inputEquip.Config.Middle_P2_ATake = mideleAxisP2.PointValue;
......@@ -602,6 +617,12 @@ namespace OnlineStore.XLRStore
inputEquip.Config.Middle_P7_AUnder = mideleAxisP7.PointValue;
inputEquip.Config.Middle_P8_BUnder = mideleAxisP8.PointValue;
inputEquip.Config.Inout_P1 = inoutAxisP1.PointValue;
inputEquip.Config.Inout_P2 = inoutAxisP2.PointValue;
inputEquip.Config.Inout_P3 = inoutAxisP3.PointValue;
inputEquip.Config.Inout_P4 = inoutAxisP4.PointValue;
inputEquip.Config.Inout_P5 = inoutAxisP5.PointValue;
inputEquip.Config.Inout_P6 = inoutAxisP6.PointValue;
StoreManager.SaveInputEquipConfig(inputEquip.Config);
MessageBox.Show("保存成功");
......@@ -765,6 +786,7 @@ namespace OnlineStore.XLRStore
{
inputEquip.ClampRelax(null);
}
}
}
......
source/XLRStoreClient/useControl/AxisMoveControl.cs
......@@ -149,9 +149,9 @@ namespace OnlineStore.XLRStore
MessageBox.Show("无法对行走机构进行回原操作，因进料防护门未开", "警告", MessageBoxButtons.OK);
return false;
}
if (!boxEquip.UpdownAxis.WithinRange(boxEquip.Config.Updown_P9, boxEquip.Config.Updown_P8))
if (!boxEquip.UpdownAxis.IsInPosition(boxEquip.Config.Updown_P1))
{
MessageBox.Show("无法对行走机构进行回原操作，因移栽升降轴不在上暂存区高低点的范围内", "警告", MessageBoxButtons.OK);
MessageBox.Show("无法对行走机构进行回原操作，因移栽升降轴不在待机点", "警告", MessageBoxButtons.OK);
return false;
}
break;
......
source/XLRStoreClient/useControl/AxisPointControl.Designer.cs
......@@ -45,7 +45,7 @@ namespace OnlineStore.XLRStore.useControl
this.btnMove.Location = new System.Drawing.Point(3, 3);
this.btnMove.Name = "btnMove";
this.btnMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMove.Size = new System.Drawing.Size(154, 34);
this.btnMove.Size = new System.Drawing.Size(154, 29);
this.btnMove.TabIndex = 315;
this.btnMove.Text = "上升待机点P1：";
this.btnMove.UseVisualStyleBackColor = true;
......@@ -58,7 +58,7 @@ namespace OnlineStore.XLRStore.useControl
this.txtPoint.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtPoint.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPoint.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtPoint.Location = new System.Drawing.Point(160, 6);
this.txtPoint.Location = new System.Drawing.Point(160, 3);
this.txtPoint.MaxLength = 12;
this.txtPoint.Name = "txtPoint";
this.txtPoint.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -73,7 +73,7 @@ namespace OnlineStore.XLRStore.useControl
this.Controls.Add(this.txtPoint);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "AxisPointControl";
this.Size = new System.Drawing.Size(233, 41);
this.Size = new System.Drawing.Size(233, 34);
this.ResumeLayout(false);
this.PerformLayout();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!