Commit e131aee1 张东亮

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

1 个父辈 409e4b19
...@@ -118,5 +118,6 @@ namespace OnlineStore.Common ...@@ -118,5 +118,6 @@ namespace OnlineStore.Common
/// 禁用光栅 /// 禁用光栅
/// </summary> /// </summary>
public static string DisSecurityAccess = "DisSecurityAccess"; public static string DisSecurityAccess = "DisSecurityAccess";
public static string ReelHeightOffset = "ReelHeightOffset";
} }
} }
...@@ -39,18 +39,10 @@ PRO,0,行走机构_安全位置,MoveAxis_SafePos,80000,,,,,,,,,,,, ...@@ -39,18 +39,10 @@ PRO,0,行走机构_安全位置,MoveAxis_SafePos,80000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,料斗拉取进出轴_待机点P1,PullAxis_Inout_P1,10000,,,,,,,,,,,, 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,PullAxis_Updown_P1,0,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,移栽升降轴_待机点P1,Updown_P1,0,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,A面移栽X轴_待机点P1,XAxis_A_P1,939289,,,,,,,,,,,, PRO,0,A面移栽X轴_待机点P1,XAxis_A_P1,939289,,,,,,,,,,,,
PRO,0,A面移栽X轴_A进出料暂存区取放料点P2,XAxis_A_P2,1245809,,,,,,,,,,,, PRO,0,A面移栽X轴_A进出料暂存区取放料点P2,XAxis_A_P2,1245809,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
......
...@@ -35,15 +35,19 @@ PRO,0,取料升降轴_待机点,Updown_P1,310000,,,,,,,,,,,, ...@@ -35,15 +35,19 @@ PRO,0,取料升降轴_待机点,Updown_P1,310000,,,,,,,,,,,,
PRO,0,取料升降轴_A料口取料点,Updown_P2_ATake,394000,,,,,,,,,,,, PRO,0,取料升降轴_A料口取料点,Updown_P2_ATake,394000,,,,,,,,,,,,
PRO,0,取料升降轴_B料口取料点,Updown_P3_BTake,405356,,,,,,,,,,,, PRO,0,取料升降轴_B料口取料点,Updown_P3_BTake,405356,,,,,,,,,,,,
PRO,0,取料升降轴_A上暂存区放料高点,Updown_P4_AUpperH,18000,,,,,,,,,,,, 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_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_P8_NGH,310000,,,,,,,,,,,,
PRO,0,取料升降轴_NG料区放料低点,Updown_P9_NGL,310000,,,,,,,,,,,, PRO,0,取料升降轴_NG料区放料低点,Updown_P9_NGL,310000,,,,,,,,,,,,
PRO,0,取料升降轴_B上暂存区放料高点,Updown_P10_BUpperH,18000,,,,,,,,,,,, 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_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,0,取料升降轴_P1速度,Updown_P1_Speed,45000,,,,,,,,,,,,
PRO,1,取料升降轴_P2速度,Updown_P2_Speed,45000,,,,,,,,,,,, PRO,1,取料升降轴_P2速度,Updown_P2_Speed,45000,,,,,,,,,,,,
...@@ -58,6 +62,10 @@ PRO,9,取料升降轴_P10速度,Updown_P10_Speed,45000,,,,,,,,,,,, ...@@ -58,6 +62,10 @@ PRO,9,取料升降轴_P10速度,Updown_P10_Speed,45000,,,,,,,,,,,,
PRO,10,取料升降轴_P11速度,Updown_P11_Speed,45000,,,,,,,,,,,, PRO,10,取料升降轴_P11速度,Updown_P11_Speed,45000,,,,,,,,,,,,
PRO,11,取料升降轴_P12速度,Updown_P12_Speed,45000,,,,,,,,,,,, PRO,11,取料升降轴_P12速度,Updown_P12_Speed,45000,,,,,,,,,,,,
PRO,12,取料升降轴_P13速度,Updown_P13_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,取料旋转轴_待机点,Middle_P1,126912,,,,,,,,,,,,
PRO,0,取料旋转轴_A料口取料点,Middle_P2_ATake,161600,,,,,,,,,,,, PRO,0,取料旋转轴_A料口取料点,Middle_P2_ATake,161600,,,,,,,,,,,,
...@@ -79,8 +87,14 @@ PRO,7,取料旋转轴_P8速度,Middle_P8_Speed,100000,,,,,,,,,,,, ...@@ -79,8 +87,14 @@ PRO,7,取料旋转轴_P8速度,Middle_P8_Speed,100000,,,,,,,,,,,,
PRO,0,取料旋转轴_反向间隙补偿值,MiddleAxis_Reverse_Offset,300,,,,,,,,,,,, PRO,0,取料旋转轴_反向间隙补偿值,MiddleAxis_Reverse_Offset,300,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,取料进出轴_待机点,Inout_P1,126912,,,,,,,,,,,, PRO,0,取料进出轴_待机点,Inout_P1,126912,,,,,,,,,,,,
PRO,0,取料进出轴_取料点,Inout_P2,126912,,,,,,,,,,,, PRO,0,取料进出轴_A缓存区点,Inout_P2,126912,,,,,,,,,,,,
PRO,0,取料进出轴_拍照点,Inout_P3,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,0,取料进出轴_P1速度,Inout_P1_Speed,100000,,,,,,,,,,,,
PRO,1,取料进出轴_P2速度,Inout_P2_Speed,100000,,,,,,,,,,,, PRO,1,取料进出轴_P2速度,Inout_P2_Speed,100000,,,,,,,,,,,,
PRO,2,取料进出轴_P3速度,Inout_P3_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 \ No newline at end of file
...@@ -84,6 +84,10 @@ DI,1,进料防护门上升端,UpperArea_InstoreDoor_UpCheck,69,HC,X69,,,,,,,,,,, ...@@ -84,6 +84,10 @@ DI,1,进料防护门上升端,UpperArea_InstoreDoor_UpCheck,69,HC,X69,,,,,,,,,,,
DI,1,进料防护门下降端,UpperArea_InstoreDoor_DownCheck,70,HC,X70,,,,,,,,,,,, DI,1,进料防护门下降端,UpperArea_InstoreDoor_DownCheck,70,HC,X70,,,,,,,,,,,,
DI,1,出料防护门上升端,UnderArea_OutstoreDoor_UpCheck,71,HC,X71,,,,,,,,,,,, DI,1,出料防护门上升端,UnderArea_OutstoreDoor_UpCheck,71,HC,X71,,,,,,,,,,,,
DI,1,出料防护门下降端,UnderArea_OutstoreDoor_DownCheck,72,HC,X72,,,,,,,,,,,, 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_LDoor_Limit,73,HC,X73,,,,,,,,,,,,
DI,1,上料机构右侧防护门门禁,Feeding_RDoor_Limit,74,HC,X74,,,,,,,,,,,, DI,1,上料机构右侧防护门门禁,Feeding_RDoor_Limit,74,HC,X74,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,
......
...@@ -694,14 +694,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -694,14 +694,14 @@ namespace OnlineStore.DeviceLibrary
/// 入料模块复位: 开始回原点,批量轴复位 /// 入料模块复位: 开始回原点,批量轴复位
/// </summary> /// </summary>
IR01_Wait = 1001, IR01_Wait = 1001,
/// <summary> /// <summary>
/// 入料模块复位: 判断旋转轴是否应该到高点 /// 入料模块复位: 判断旋转轴是否应该到高点
/// 1,处于A,B,NG料口是,可以直接回取料升降轴。 /// 1,处于A,B,NG料口是,可以直接回取料升降轴。
/// 2,处于A, B两个暂存区时,升降轴先运动到该暂存区的取放料高点,旋转轴再回原点或待机点。 /// 2,处于A, B两个暂存区时,升降轴先运动到该暂存区的取放料高点,旋转轴再回原点或待机点。
/// </summary> /// </summary>
IR02_UpdownUpMove, IR02_UpdownUpMove,
IR02_1_InoutHome,
IR02_2_InoutToP1,
/// <summary> /// <summary>
/// 入料模块复位: 旋转轴回原点 /// 入料模块复位: 旋转轴回原点
/// </summary> /// </summary>
...@@ -740,6 +740,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -740,6 +740,10 @@ namespace OnlineStore.DeviceLibrary
/// 入库料串取料:升降轴到达P1 /// 入库料串取料:升降轴到达P1
/// </summary> /// </summary>
II01_UpdownToP1 = 1101, II01_UpdownToP1 = 1101,
///// <summary>
///// 入料料串取料:判断进出轴是否在P1,不在的话直接到P1
///// </summary>
II01_InoutToP1,
/// <summary> /// <summary>
/// 入库料串取料A:取料旋转轴SVD13运动到P2(A料口取料点) /// 入库料串取料A:取料旋转轴SVD13运动到P2(A料口取料点)
...@@ -760,7 +764,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -760,7 +764,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
II06_UpdownToP3, II06_UpdownToP3,
II07_InoutToP4P5,
/// <summary> /// <summary>
/// 入库料串取料:夹爪夹紧,判断到位 /// 入库料串取料:夹爪夹紧,判断到位
/// </summary> /// </summary>
...@@ -798,9 +802,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -798,9 +802,9 @@ namespace OnlineStore.DeviceLibrary
II40_UpdownToP4, II40_UpdownToP4,
/// <summary> /// <summary>
///入料->A侧:暂存区不为空,先旋转轴到P4附近位置 ///入料->A侧:旋转轴到P4
/// </summary> /// </summary>
II41_MiddleTWaitP4, II41_MiddleToP4,
/// <summary> /// <summary>
/// 入料->A侧:等待A上暂存区无料 /// 入料->A侧:等待A上暂存区无料
...@@ -808,9 +812,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -808,9 +812,9 @@ namespace OnlineStore.DeviceLibrary
II42_WaitNoReel = 1140, II42_WaitNoReel = 1140,
/// <summary> /// <summary>
/// 入料->A侧:取料旋转轴 到P4(A上暂存区放料点) /// 入料->A侧:取料进出轴 到P2(A暂存区放料点)
/// </summary> /// </summary>
II43_MiddleToP4, II43_InoutToP2,
/// <summary> /// <summary>
/// 入料->A侧:取料升降轴 到P5(A上暂存区放料低点) /// 入料->A侧:取料升降轴 到P5(A上暂存区放料低点)
...@@ -825,6 +829,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -825,6 +829,7 @@ namespace OnlineStore.DeviceLibrary
/// 入料->A侧:取料升降轴 到P4(A上暂存区放料高点) /// 入料->A侧:取料升降轴 到P4(A上暂存区放料高点)
/// </summary> /// </summary>
II46_UpdownToP4, II46_UpdownToP4,
II47_1_InoutToP1,
/// <summary> /// <summary>
/// 入料->A侧:取料旋转轴 到P1(待机点) /// 入料->A侧:取料旋转轴 到P1(待机点)
/// </summary> /// </summary>
...@@ -840,15 +845,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -840,15 +845,15 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 入料->B侧:暂存区有物料,旋转轴先到P5附近等待 /// 入料->B侧:暂存区有物料,旋转轴先到P5附近等待
/// </summary> /// </summary>
II61_MiddleToWaitP5, II61_MiddleToP5,
/// <summary> /// <summary>
/// 入料->B侧:等待B上暂存区无料 /// 入料->B侧:等待B上暂存区无料
/// </summary> /// </summary>
II62_WaitNoReel, II62_WaitNoReel,
/// <summary> /// <summary>
/// 入料->B侧:取料旋转轴 到P5 (B上暂存区放料点) /// 入料->B侧:取料进出轴 到P5 (B上暂存区放料点)
/// </summary> /// </summary>
II63_MiddleToP5, II63_InoutToP3,
/// <summary> /// <summary>
/// 入料->B侧:取料升降轴 到P11 (B上暂存区放料低点) /// 入料->B侧:取料升降轴 到P11 (B上暂存区放料低点)
...@@ -863,6 +868,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -863,6 +868,7 @@ namespace OnlineStore.DeviceLibrary
/// 入料->B侧:取料升降轴 到P10 (B上暂存区放料高点) /// 入料->B侧:取料升降轴 到P10 (B上暂存区放料高点)
/// </summary> /// </summary>
II66_UpdownToP10, II66_UpdownToP10,
II67_1_InoutToP1,
/// <summary> /// <summary>
/// 入料->B侧:取料旋转轴 到P1(待机点) /// 入料->B侧:取料旋转轴 到P1(待机点)
/// </summary> /// </summary>
...@@ -871,14 +877,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -871,14 +877,13 @@ namespace OnlineStore.DeviceLibrary
#region 入料->NG 1180开始 #region 入料->NG 1180开始
/// <summary> /// <summary>
/// 入料->NG:取料升降轴SVD12 运动到P8(NG料区放料高点) /// 入料->NG:取料旋转轴SVD13 运动到P6(NG料区放料点)
/// </summary> /// </summary>
II81_UpdownToP8 = 1180, II81_MiddleToNg = 1180,
/// <summary> /// <summary>
/// 入料->NG:取料旋转轴SVD13 运动到P6(NG料区放料点) /// 入料->NG:取料进出轴SVD12 运动到P6(NG料区放料点)
/// </summary> /// </summary>
II82_MiddleToNg, II82_InoutToP6,
/// <summary> /// <summary>
/// 入料->NG:取料升降轴SVD12 运动到P9(NG料区放料低点) /// 入料->NG:取料升降轴SVD12 运动到P9(NG料区放料低点)
...@@ -893,6 +898,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -893,6 +898,10 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
II85_UpdownToP8, II85_UpdownToP8,
/// <summary> /// <summary>
/// 入料->NG:取料进出轴SVD 运动到P1(待机点)
/// </summary>
II86_1_InoutToP1,
/// <summary>
/// 入料->NG:取料旋转轴SVD13 运动到P1(待机点) /// 入料->NG:取料旋转轴SVD13 运动到P1(待机点)
/// </summary> /// </summary>
II86_MiddleToP1, II86_MiddleToP1,
...@@ -915,9 +924,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -915,9 +924,9 @@ namespace OnlineStore.DeviceLibrary
IO02_UpdownToP6, IO02_UpdownToP6,
/// <summary> /// <summary>
/// A侧出料:取料旋转轴SVD13 运动到P7(A下暂存区取料点) /// A侧出料:取料进出轴SVD13 运动到P2(A暂存区点)
/// </summary> /// </summary>
IO03_MiddleToP7, IO03_InoutToP2,
/// <summary> /// <summary>
/// A侧出料:取料升降轴SVD12 运动到P7(A下暂存区取料低点) /// A侧出料:取料升降轴SVD12 运动到P7(A下暂存区取料低点)
...@@ -933,6 +942,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -933,6 +942,7 @@ namespace OnlineStore.DeviceLibrary
/// A侧出料:取料升降轴SVD12 运动到P6(A下暂存区取料高点) /// A侧出料:取料升降轴SVD12 运动到P6(A下暂存区取料高点)
/// </summary> /// </summary>
IO06_UpdownToP6, IO06_UpdownToP6,
IO07_1_InoutToP1,
/// <summary> /// <summary>
/// A侧出料: 等待等待 X54(A出料下暂存区料盘检测)=0 /// A侧出料: 等待等待 X54(A出料下暂存区料盘检测)=0
/// </summary> /// </summary>
...@@ -952,9 +962,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -952,9 +962,9 @@ namespace OnlineStore.DeviceLibrary
IO12_UpdownToP12, IO12_UpdownToP12,
/// <summary> /// <summary>
/// B侧出料:取料旋转轴SVD13 运动到P8(B下暂存区取料点) /// B侧出料:取料进出轴SVD13 运动到P3(B暂存区点)
/// </summary> /// </summary>
IO13_MiddleToP8, IO13_InoutToP3,
/// <summary> /// <summary>
/// B侧出料:取料升降轴SVD12 运动到P13(B下暂存区取料低点) /// B侧出料:取料升降轴SVD12 运动到P13(B下暂存区取料低点)
...@@ -970,7 +980,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -970,7 +980,7 @@ namespace OnlineStore.DeviceLibrary
/// B侧出料:取料升降轴SVD12 运动到P12(B下暂存区取料高点) /// B侧出料:取料升降轴SVD12 运动到P12(B下暂存区取料高点)
/// </summary> /// </summary>
IO16_UpdownToP6, IO16_UpdownToP6,
IO17_1_InoutToP1,
/// <summary> /// <summary>
/// B侧出料:等待 X56(A出料下暂存区料盘检测)=0 /// B侧出料:等待 X56(A出料下暂存区料盘检测)=0
/// </summary> /// </summary>
...@@ -995,9 +1005,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -995,9 +1005,9 @@ namespace OnlineStore.DeviceLibrary
IO23_MiddleToP2, IO23_MiddleToP2,
/// <summary> /// <summary>
/// 出库->A料串:取料升降轴SVD12 运动到P2(A料口取料点) /// 出库->A料串:取料进出轴SVD12 运动到P4(A料口取料点)
/// </summary> /// </summary>
IO24_UpdownToP2, IO24_InoutToP4,
/// <summary> /// <summary>
/// 出库->B料串:批量轴运动到位 /// 出库->B料串:批量轴运动到位
...@@ -1010,9 +1020,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -1010,9 +1020,9 @@ namespace OnlineStore.DeviceLibrary
IO27_MiddleToP3, IO27_MiddleToP3,
/// <summary> /// <summary>
/// 出库->B料串:取料升降轴SVD12 运动到P3(B料口取料点) /// 出库->B料串:取料进出轴SVD12 运动到P5(B料口取料点)
/// </summary> /// </summary>
IO28_UpdownToP3, IO28_InoutToP5,
/// <summary> /// <summary>
/// 出库 :电卡爪放松 判断到位 /// 出库 :电卡爪放松 判断到位
......
...@@ -270,7 +270,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -270,7 +270,14 @@ namespace OnlineStore.DeviceLibrary
ComAxis_AB_P2 = position.ComAxis_AB_P2; ComAxis_AB_P2 = position.ComAxis_AB_P2;
ComAxis_AB_P3 = position.ComAxis_AB_P3; ComAxis_AB_P3 = position.ComAxis_AB_P3;
MoveAxis_P3 = position.MoveAxis_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> /// <summary>
/// 加载固定点位位置 /// 加载固定点位位置
...@@ -281,14 +288,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -281,14 +288,6 @@ namespace OnlineStore.DeviceLibrary
MoveAxis_P2 = equip_Config.MoveAxis_P2; MoveAxis_P2 = equip_Config.MoveAxis_P2;
PullAxis_Inout_P1 = equip_Config.PullAxis_Inout_P1; PullAxis_Inout_P1 = equip_Config.PullAxis_Inout_P1;
Updown_P1 = equip_Config.Updown_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; PullAxis_Updown_P1 = equip_Config.PullAxis_Updown_P1;
XAxis_A_P1 = equip_Config.XAxis_A_P1; XAxis_A_P1 = equip_Config.XAxis_A_P1;
XAxis_A_P2 = equip_Config.XAxis_A_P2; XAxis_A_P2 = equip_Config.XAxis_A_P2;
......
...@@ -466,21 +466,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -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)) 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); 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))) && (BufferDataManager.AOutStoreInfo == null || IOValue(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW)))
{ {
LogInfo($"复位 {MoveInfo.SLog}:移栽升降轴在A下暂存区低点和高点之间,到高点P4,A面移栽X轴去暂存区P2,A面压紧轴到压紧前点P2"); 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); 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); 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))) && (BufferDataManager.AInStoreInfo == null || IOValue(IO_Type.FeedingA_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW)))
{ {
LogInfo($"复位 {MoveInfo.SLog}:移栽升降轴在A上暂存区低点和高点之间,到高点P2,A面移栽X轴去暂存区P2,A面压紧轴到压紧前点P2"); 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); 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); 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 else
{ {
...@@ -496,15 +496,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -496,15 +496,15 @@ namespace OnlineStore.DeviceLibrary
break; break;
case StepEnum.BOX_H0103_ToAInputHighPos: case StepEnum.BOX_H0103_ToAInputHighPos:
MoveInfo.NextMoveStep(StepEnum.BOX_H0104_ToAInputLowPos); 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"); 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"); 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 else
{ {
...@@ -521,21 +521,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -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)) 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); 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))) (BufferDataManager.BOutStoreInfo == null || IOValue(IO_Type.FeedingB_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW)))
{ {
LogInfo($"复位 {MoveInfo.SLog}:移栽升降轴在B下暂存区低点和高点之间,到高点P10,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2"); 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); 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); 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))) (BufferDataManager.BInStoreInfo == null || IOValue(IO_Type.FeedingB_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW)))
{ {
LogInfo($"复位 {MoveInfo.SLog}:移栽升降轴在B上暂存区低点和高点之间,到高点P8,B面移栽X轴去暂存区P2,B面压紧轴到压紧前点P2"); 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); 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); 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 else
{ {
...@@ -552,15 +552,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -552,15 +552,15 @@ namespace OnlineStore.DeviceLibrary
break; break;
case StepEnum.BOX_H0105_ToBInputHighPos: case StepEnum.BOX_H0105_ToBInputHighPos:
MoveInfo.NextMoveStep(StepEnum.BOX_H0106_ToBInputLowPos); 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"); 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"); 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 else
{ {
...@@ -642,8 +642,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -642,8 +642,9 @@ namespace OnlineStore.DeviceLibrary
case StepEnum.BOX_R03_XAxis_AB_ToP1: case StepEnum.BOX_R03_XAxis_AB_ToP1:
MoveInfo.NextMoveStep(StepEnum.BOX_R04_OtherAxisToP1); 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); 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); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P1, Config.Updown_P1_Speed);
MiddleAxis_A.AbsMove(MoveInfo, Config.MiddleAxis_A_P1, Config.MiddleAxis_A_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); MiddleAxis_B.AbsMove(MoveInfo, Config.MiddleAxis_B_P1, Config.MiddleAxis_B_P1_Speed);
......
...@@ -367,16 +367,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -367,16 +367,16 @@ namespace OnlineStore.DeviceLibrary
if (CheckASide()) if (CheckASide())
{ {
if (isdebugSpeed) if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P4, Config.UpdownAxis_FindPosSpeed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P4, Config.UpdownAxis_FindPosSpeed);
else else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P4, Config.Updown_P4_Speed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P4, Config.Updown_P4_Speed);
} }
else else
{ {
if (isdebugSpeed) if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P10, Config.UpdownAxis_FindPosSpeed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P10, Config.UpdownAxis_FindPosSpeed);
else else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P10, Config.Updown_P10_Speed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P10, Config.Updown_P10_Speed);
} }
} }
/// <summary> /// <summary>
...@@ -387,16 +387,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -387,16 +387,16 @@ namespace OnlineStore.DeviceLibrary
if (CheckASide()) if (CheckASide())
{ {
if (isdebugSpeed) if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P2, Config.UpdownAxis_FindPosSpeed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P2, Config.UpdownAxis_FindPosSpeed);
else else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P2, Config.Updown_P2_Speed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P2, Config.Updown_P2_Speed);
} }
else else
{ {
if (isdebugSpeed) if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P8, Config.UpdownAxis_FindPosSpeed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P8, Config.UpdownAxis_FindPosSpeed);
else else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P8, Config.Updown_P8_Speed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P8, Config.Updown_P8_Speed);
} }
} }
/// <summary> /// <summary>
...@@ -407,16 +407,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -407,16 +407,16 @@ namespace OnlineStore.DeviceLibrary
if (CheckASide()) if (CheckASide())
{ {
if (isdebugSpeed) if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P3, Config.UpdownAxis_FindPosSpeed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P3, Config.UpdownAxis_FindPosSpeed);
else else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P3, Config.Updown_P3_Speed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P3, Config.Updown_P3_Speed);
} }
else else
{ {
if (isdebugSpeed) if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P9, Config.UpdownAxis_FindPosSpeed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P9, Config.UpdownAxis_FindPosSpeed);
else else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P9, Config.Updown_P9_Speed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P9, Config.Updown_P9_Speed);
} }
} }
/// <summary> /// <summary>
...@@ -427,16 +427,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -427,16 +427,16 @@ namespace OnlineStore.DeviceLibrary
if (CheckASide()) if (CheckASide())
{ {
if (isdebugSpeed) if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P5, Config.UpdownAxis_FindPosSpeed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P5, Config.UpdownAxis_FindPosSpeed);
else else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P5, Config.Updown_P5_Speed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P5, Config.Updown_P5_Speed);
} }
else else
{ {
if (isdebugSpeed) if (isdebugSpeed)
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P11, Config.UpdownAxis_FindPosSpeed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P11, Config.UpdownAxis_FindPosSpeed);
else else
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P11, Config.Updown_P11_Speed); UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Updown_P11, Config.Updown_P11_Speed);
} }
} }
#endregion #endregion
...@@ -862,6 +862,34 @@ namespace OnlineStore.DeviceLibrary ...@@ -862,6 +862,34 @@ namespace OnlineStore.DeviceLibrary
case "A_Col6_Sig_Shield": case "A_Col6_Sig_Shield":
res = Config.A_Col6_Sig_Shield; res = Config.A_Col6_Sig_Shield;
break; 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": case "B_Col1_Sig_Shield":
res = Config.B_Col1_Sig_Shield; res = Config.B_Col1_Sig_Shield;
break; break;
...@@ -880,6 +908,33 @@ namespace OnlineStore.DeviceLibrary ...@@ -880,6 +908,33 @@ namespace OnlineStore.DeviceLibrary
case "B_Col6_Sig_Shield": case "B_Col6_Sig_Shield":
res = Config.B_Col6_Sig_Shield; res = Config.B_Col6_Sig_Shield;
break; 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 ? "屏蔽" : "开启")); LogInfo(string.Format("列信号屏蔽状态:{0}={1}", name, res == 0 ? "屏蔽" : "开启"));
return res == 0 ? true : false; return res == 0 ? true : false;
...@@ -948,10 +1003,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -948,10 +1003,6 @@ namespace OnlineStore.DeviceLibrary
return true; return true;
return false; return false;
} }
private bool UpdownAxisCanMove()
{
return false;
}
#region 相机检查库位 #region 相机检查库位
#endregion #endregion
......
...@@ -41,17 +41,24 @@ namespace OnlineStore.DeviceLibrary ...@@ -41,17 +41,24 @@ namespace OnlineStore.DeviceLibrary
this.DeviceID = config.Id; this.DeviceID = config.Id;
baseConfig = config; baseConfig = config;
this.Config = 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); IsDebug = config.IsDebug.Equals(1);
Init(); Init();
ledProcessTimer.Elapsed += LedProcess; ledProcessTimer.Elapsed += LedProcess;
IoCheckTimer.Elapsed += IoCheckTimerProcess; IoCheckTimer.Elapsed += IoCheckTimerProcess;
MiddleAxis = new AxisBean(config.TakeAxis_Middle, Name, false); MiddleAxis = new AxisBean(config.TakeAxis_Middle, Name, true);
UpdownAxis = new AxisBean(config.TakeAxis_Updown, Name, false); UpdownAxis = new AxisBean(config.TakeAxis_Updown, Name, true);
InOutAxis = new AxisBean(config.TakeAxis_Inout, Name, false); InOutAxis = new AxisBean(config.TakeAxis_Inout, Name, true);
BatchAxis_A = new AxisBean(config.BatchAxis_A, Name, true); BatchAxis_A = new AxisBean(config.BatchAxis_A, Name, true);
BatchAxis_B = new AxisBean(config.BatchAxis_B, 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)) if (config.UseClampJaw.Equals(1))
{ {
ClampJaw = new ClampJawBean(StoreManager.Config.CLAW_Input); ClampJaw = new ClampJawBean(StoreManager.Config.CLAW_Input);
...@@ -192,14 +199,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -192,14 +199,14 @@ namespace OnlineStore.DeviceLibrary
if (MiddleAxis.IsInPosition(Config.Middle_P4_AUpper, middleWucha) || MiddleAxis.IsInPosition(Config.Middle_P7_AUnder, middleWucha)) 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); MoveInfo.NextMoveStep(StepEnum.IR02_UpdownUpMove);
LogInfo($"复位 {MoveInfo.SLog}:当前旋转轴在 A侧暂存区{middleP},升降轴当前位置{updownP},低于下方高点,升降轴先到P6:{Config.Updown_P6_AUnderH}"); LogInfo($"复位 {MoveInfo.SLog}:当前旋转轴在 A侧暂存区{middleP},升降轴当前位置{updownP},低于下方高点,升降轴先到P6:{Config.Updown_P6_AUnderH}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P6_AUnderH, Config.Updown_P6_Speed); 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); MoveInfo.NextMoveStep(StepEnum.IR02_UpdownUpMove);
LogInfo($"复位 {MoveInfo.SLog}:当前旋转轴在 A侧暂存区{middleP},升降轴当前位置{updownP},高于上方低点,升降轴到上方高点P4:{Config.Updown_P4_AUpperH}"); LogInfo($"复位 {MoveInfo.SLog}:当前旋转轴在 A侧暂存区{middleP},升降轴当前位置{updownP},高于上方低点,升降轴到上方高点P4:{Config.Updown_P4_AUpperH}");
...@@ -214,14 +221,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -214,14 +221,14 @@ namespace OnlineStore.DeviceLibrary
else if (MiddleAxis.IsInPosition(Config.Middle_P5_BUpper, middleWucha) || MiddleAxis.IsInPosition(Config.Middle_P8_BUnder, middleWucha)) 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); MoveInfo.NextMoveStep(StepEnum.IR02_UpdownUpMove);
LogInfo($"复位 {MoveInfo.SLog}:当前旋转轴在 B侧暂存区{middleP},升降轴当前位置{updownP},低于下方高点,升降轴先到12:{Config.Updown_P12_BUnderH}"); LogInfo($"复位 {MoveInfo.SLog}:当前旋转轴在 B侧暂存区{middleP},升降轴当前位置{updownP},低于下方高点,升降轴先到12:{Config.Updown_P12_BUnderH}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P12_BUnderH, 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); MoveInfo.NextMoveStep(StepEnum.IR02_UpdownUpMove);
LogInfo($"复位 {MoveInfo.SLog}:当前旋转轴在 B侧暂存区{middleP},升降轴当前位置{updownP},高于上方低点,升降轴到上方高点P10:{Config.Updown_P10_BUpperH}"); LogInfo($"复位 {MoveInfo.SLog}:当前旋转轴在 B侧暂存区{middleP},升降轴当前位置{updownP},高于上方低点,升降轴到上方高点P10:{Config.Updown_P10_BUpperH}");
...@@ -235,21 +242,38 @@ namespace OnlineStore.DeviceLibrary ...@@ -235,21 +242,38 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
if (MiddleAxis.IsNeedHome) if (InOutAxis.IsNeedHome)
{ {
MoveInfo.NextMoveStep(StepEnum.IR03_MiddleHome); MoveInfo.NextMoveStep(StepEnum.IR02_1_InoutHome);
LogInfo($"复位{MoveInfo.SLog}:旋转轴回原点"); LogInfo($"复位{MoveInfo.SLog}:进出轴回原点");
MiddleAxis.HomeMove(MoveInfo); InOutAxis.HomeMove(MoveInfo);
} }
else else
{ {
IR04_MiddleToP1(); IR02_1_InoutToP1();
} }
} }
} }
else if (MoveInfo.IsStep(StepEnum.IR02_UpdownUpMove)) 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) if (MiddleAxis.IsNeedHome)
{ {
MoveInfo.NextMoveStep(StepEnum.IR03_MiddleHome); MoveInfo.NextMoveStep(StepEnum.IR03_MiddleHome);
...@@ -269,7 +293,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -269,7 +293,7 @@ namespace OnlineStore.DeviceLibrary
{ {
//旋转轴到达P1结束,设置反向补偿间隙 //旋转轴到达P1结束,设置反向补偿间隙
HCBoardManager.SetAxBacklash(MiddleAxis.Config.GetAxisValue(), Config.MiddleAxis_Reverse_Offset, MiddleAxis.Config.HomeLowSpeed, -1); 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) if (UpdownAxis.IsNeedHome)
...@@ -385,6 +409,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -385,6 +409,12 @@ namespace OnlineStore.DeviceLibrary
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000)); 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() private void IR04_MiddleToP1()
{ {
...@@ -663,7 +693,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -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)) if (areaNums.Contains(1))
{ {
...@@ -689,7 +719,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -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)) if (areaNums.Contains(3))
{ {
...@@ -806,12 +836,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -806,12 +836,12 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.MoveType.Equals(MoveType.None)) if (MoveInfo.MoveType.Equals(MoveType.None))
{ {
SetWarnMsg("光栅被遮挡,暂停运动"); SetWarnMsg("光栅被遮挡,暂停运动");
LogUtil.info($"{Name }光栅被遮挡,暂停运动,MoveStop={MoveStop},{msg},稍后复位"); LogUtil.info($"{Name}光栅被遮挡,暂停运动,MoveStop={MoveStop},{msg},稍后复位");
} }
else else
{ {
SetWarnMsg("光栅被遮挡,暂停当前运动"); SetWarnMsg("光栅被遮挡,暂停当前运动");
LogUtil.info($"{Name }光栅被遮挡,停止当前运动{MoveInfo.MoveType},{MoveInfo.MoveStep},{msg},稍后复位"); LogUtil.info($"{Name}光栅被遮挡,停止当前运动{MoveInfo.MoveType},{MoveInfo.MoveStep},{msg},稍后复位");
} }
} }
...@@ -840,11 +870,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -840,11 +870,11 @@ namespace OnlineStore.DeviceLibrary
if (!MoveInfo.MoveType.Equals(MoveType.None)) if (!MoveInfo.MoveType.Equals(MoveType.None))
{ {
MoveInfo.LastSetpTime = DateTime.Now; MoveInfo.LastSetpTime = DateTime.Now;
LogUtil.info($"{Name }光栅已恢复,恢复当前运动{MoveInfo.MoveType},{MoveInfo.MoveStep} "); LogUtil.info($"{Name}光栅已恢复,恢复当前运动{MoveInfo.MoveType},{MoveInfo.MoveStep} ");
} }
else else
{ {
LogUtil.info($"{Name }光栅已恢复,取消暂停运动"); LogUtil.info($"{Name}光栅已恢复,取消暂停运动");
} }
} }
} }
......
using Asa; using Asa;
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using System; using System;
...@@ -9,12 +9,14 @@ using System.Text; ...@@ -9,12 +9,14 @@ using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms;
namespace OnlineStore.DeviceLibrary namespace OnlineStore.DeviceLibrary
{ {
partial class InputEquip partial class InputEquip
{ {
public bool ClampEmptyMove = false; public bool ClampEmptyMove = false;
public Dictionary<int, int> reelHeightOffset = new Dictionary<int, int>();
protected override bool CheckWaitResult(DeviceMoveInfo moveInfo, WaitResultInfo wait) protected override bool CheckWaitResult(DeviceMoveInfo moveInfo, WaitResultInfo wait)
{ {
TimeSpan span = DateTime.Now - moveInfo.LastSetpTime; TimeSpan span = DateTime.Now - moveInfo.LastSetpTime;
...@@ -50,11 +52,83 @@ namespace OnlineStore.DeviceLibrary ...@@ -50,11 +52,83 @@ namespace OnlineStore.DeviceLibrary
wait.IsEnd = true; wait.IsEnd = true;
} }
} }
} }
return wait.IsEnd; return wait.IsEnd;
} }
bool Is7CunReel()
{
return MoveInfo.MoveParam.PosInfo.PlateW == 7;
}
int getOffset()
{
if(reelHeightOffset.ContainsKey(MoveInfo.MoveParam.PosInfo.PlateH))
{
return reelHeightOffset[MoveInfo.MoveParam.PosInfo.PlateH];
}
return 0;
}
void II44_UpdownToP5()
{
MoveInfo.NextMoveStep(StepEnum.II44_UpdownToP5);
if (Is7CunReel())
{
MoveLog($" 入料->A侧 {MoveInfo.SLog}: 升降轴 到P5(A上暂存区7寸放料低点){Config.Updown_P5_AUpperL7+ getOffset()}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P5_AUpperL7 + getOffset(), Config.Updown_P5_Speed);
}
else
{
MoveLog($" 入料->A侧 {MoveInfo.SLog}: 升降轴 到P14(A上暂存区13寸放料低点){Config.Updown_P14_AUpperL13 + getOffset()}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P14_AUpperL13 + getOffset(), Config.Updown_P14_Speed);
}
}
void II64_UpdownToP11()
{
MoveInfo.NextMoveStep(StepEnum.II64_UpdownToP11);
if (Is7CunReel())
{
MoveLog($" 入料->B侧 {MoveInfo.SLog}: 升降轴 到P11 (B上暂存区7寸放料低点){Config.Updown_P11_BUpperL7 + getOffset()}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P11_BUpperL7 + getOffset(), Config.Updown_P11_Speed);
}
else
{
MoveLog($" 入料->B侧 {MoveInfo.SLog}: 升降轴 到P16 (B上暂存区13寸放料低点){Config.Updown_P16_BUpperL13 + getOffset()}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P16_BUpperL13 + getOffset(), Config.Updown_P17_Speed);
}
}
/// <summary>
/// 取料升降轴SVD12 运动到P7(A下暂存区取料低点)
/// </summary>
void IO04_UpdownToP7(int shelf)
{
MoveInfo.NextMoveStep(StepEnum.IO04_UpdownToP7);
if (Is7CunReel())
{
MoveLog($"出库A->{shelf}料串 {MoveInfo.SLog}: 升降轴到P7(A下暂存区7寸取料低点){Config.Updown_P7_AUnderL7 + getOffset()}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P7_AUnderL7 + getOffset(), Config.Updown_P7_Speed);
}
else
{
MoveLog($"出库A->{shelf}料串 {MoveInfo.SLog}: 升降轴到P15(A下暂存区13寸取料低点){Config.Updown_P15_AUnderL13 + getOffset()}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P15_AUnderL13 + getOffset(), Config.Updown_P15_Speed);
}
}
void IO14_UpdownToP13(int shelf)
{
MoveInfo.NextMoveStep(StepEnum.IO14_UpdownToP13);
if (Is7CunReel())
{
MoveLog($"出库B->{shelf}料串 {MoveInfo.SLog}: 升降轴到P13(B下暂存区7寸取料低点){Config.Updown_P13_BUnderL7 + getOffset()}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P13_BUnderL7 + getOffset(), Config.Updown_P13_Speed);
}
else
{
MoveLog($"出库B->{shelf}料串 {MoveInfo.SLog}: 升降轴到P17(B下暂存区13寸取料低点){Config.Updown_P17_BUnderL13 + getOffset()}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P17_BUnderL13 + getOffset(), Config.Updown_P17_Speed);
}
}
#region 入库 #region 入库
private DateTime startInTime = DateTime.Now; private DateTime startInTime = DateTime.Now;
public override bool StartInstore(InOutParam param) public override bool StartInstore(InOutParam param)
...@@ -82,14 +156,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -82,14 +156,14 @@ namespace OnlineStore.DeviceLibrary
//if (UpdownAxis.IsInPosition(Config.Updown_P1)) //if (UpdownAxis.IsInPosition(Config.Updown_P1))
if (UpdownAxis.IsInPosition(Config.Updown_P1) || (updownP <= upP1)) if (UpdownAxis.IsInPosition(Config.Updown_P1) || (updownP <= upP1))
{ {
ToShelfMove(); II01_InoutToP1();
} }
else else
{ {
MoveInfo.NextMoveStep(StepEnum.II01_UpdownToP1); MoveInfo.NextMoveStep(StepEnum.II01_UpdownToP1);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P1, Config.Updown_P1_Speed); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P1, Config.Updown_P1_Speed);
MoveLog($"开始入库{param.ShelfType}{MoveInfo.SLog}: 升降轴先返回P1{Config.Updown_P1}"); MoveLog($"开始入库{param.ShelfType}{MoveInfo.SLog}: 升降轴先返回P1{Config.Updown_P1}");
} }
return true; return true;
} }
return false; return false;
...@@ -123,20 +197,25 @@ namespace OnlineStore.DeviceLibrary ...@@ -123,20 +197,25 @@ namespace OnlineStore.DeviceLibrary
//} //}
if (MoveInfo.IsStep(StepEnum.II01_UpdownToP1)) if (MoveInfo.IsStep(StepEnum.II01_UpdownToP1))
{ {
II01_InoutToP1();
}
else if (MoveInfo.IsStep(StepEnum.II01_InoutToP1))
{
ToShelfMove(); ToShelfMove();
} }
else if (MoveInfo.IsStep(StepEnum.II02_MIddleToP2)) else if (MoveInfo.IsStep(StepEnum.II02_MIddleToP2))
{ {
MoveInfo.NextMoveStep(StepEnum.II03_UpdownToP2); II07_InoutToP4P5();
MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 升降轴到P2(A料口取料点) {Config.Updown_P2_ATake}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P2_ATake, Config.Updown_P2_Speed);
} }
else if (MoveInfo.IsStep(StepEnum.II05_MIddleToP3)) else if (MoveInfo.IsStep(StepEnum.II05_MIddleToP3))
{ {
MoveInfo.NextMoveStep(StepEnum.II06_UpdownToP3); II07_InoutToP4P5();
MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 升降轴到P3(B料口取料点) {Config.Updown_P3_BTake}"); }
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P3_BTake, Config.Updown_P3_Speed); else if (MoveInfo.IsStep(StepEnum.II07_InoutToP4P5))
{
II0306_UpdownToP2P3();
} }
else if (MoveInfo.IsStep(StepEnum.II03_UpdownToP2)) else if (MoveInfo.IsStep(StepEnum.II03_UpdownToP2))
{ {
...@@ -160,13 +239,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -160,13 +239,13 @@ namespace OnlineStore.DeviceLibrary
//}else if (MoveInfo.IsStep(StepEnum.II09_MiddleToP1)) //}else if (MoveInfo.IsStep(StepEnum.II09_MiddleToP1))
//{ //{
//如果是测试,直接开始取目标位置 //如果是测试,直接开始取目标位置
if (MoveInfo.MoveParam.PosInfo.barcode.EndsWith("TEST")) //if (MoveInfo.MoveParam.PosInfo.barcode.EndsWith("TEST"))
{ //{
MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 条码 {MoveInfo.MoveParam.PosInfo.barcode}为测试料,直接去目标位置"); // MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 条码 {MoveInfo.MoveParam.PosInfo.barcode}为测试料,直接去目标位置");
LastPosInfo = MoveInfo.MoveParam.PosInfo; // LastPosInfo = MoveInfo.MoveParam.PosInfo;
StrartToTargetP(); // StrartToTargetP();
} //}
else //else
{ {
II10_WaitAxisCheck(); II10_WaitAxisCheck();
} }
...@@ -219,7 +298,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -219,7 +298,7 @@ namespace OnlineStore.DeviceLibrary
//出库料 暂不处理出库,全部入库 //出库料 暂不处理出库,全部入库
} }
StrartToTargetP(); StrartToTargetP();
} }
else if (MoveInfo.IsTimeOut(15)) else if (MoveInfo.IsTimeOut(15))
{ {
...@@ -230,66 +309,42 @@ namespace OnlineStore.DeviceLibrary ...@@ -230,66 +309,42 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region 入料->A侧上暂存区 #region 入料->A侧上暂存区
else if (MoveInfo.IsStep(StepEnum.II40_UpdownToP4)) //else if (MoveInfo.IsStep(StepEnum.II40_UpdownToP4))
//{
// II41_MiddleToP4();
//}
else if (MoveInfo.IsStep(StepEnum.II41_MiddleToP4))
{ {
//如果无料且暂存区为空,直接过 //如果无料且暂存区为空,进出轴出
bool empty = (BufferDataManager.AInStoreInfo == null || BufferDataManager.AInStoreInfo.PosId.Equals("")); bool empty = (BufferDataManager.AInStoreInfo == null || BufferDataManager.AInStoreInfo.PosId.Equals(""));
if (IOValue(IO_Type.FeedingA_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW) && empty) if (IOValue(IO_Type.FeedingA_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW) && empty)
{ {
II43_MiddleToP4(); II43_InoutToP2();
} }
else else
{ {
int targetV = Config.Middle_P4_AUpper - Config.MiddleOffsetValue;
MoveInfo.NextMoveStep(StepEnum.II41_MiddleTWaitP4);
MoveLog($" 入料->A侧 {MoveInfo.SLog}: 暂存区有料, 旋转轴 到P4{Config.Middle_P4_AUpper}-{Config.MiddleOffsetValue}=目标{targetV}位置等待暂存区无料");
MiddleAxis.AbsMove(MoveInfo, targetV, Config.Middle_P4_Speed);
}
}
else if (MoveInfo.IsStep(StepEnum.II41_MiddleTWaitP4))
{
if (UpdownAxis.IsInPosition(Config.Updown_P4_AUpperH))
{
TrayHasLeave();
MoveInfo.NextMoveStep(StepEnum.II42_WaitNoReel); MoveInfo.NextMoveStep(StepEnum.II42_WaitNoReel);
MoveInfo.TimeOutSeconds = 60; MoveLog($" 入料->A侧 {MoveInfo.SLog}: 暂存区有料,等待暂存区无料");
MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 等待A上暂存区无料");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FeedingA_Instore_UpperArea_ReelCheck, IO_VALUE.LOW));
}
else
{
II41_MiddleTWaitP4();
} }
} }
else if (MoveInfo.IsStep(StepEnum.II42_WaitNoReel)) else if (MoveInfo.IsStep(StepEnum.II42_WaitNoReel))
{ {
if (BufferDataManager.AInStoreInfo == null || BufferDataManager.AInStoreInfo.PosId.Equals("")) if (BufferDataManager.AInStoreInfo == null || BufferDataManager.AInStoreInfo.PosId.Equals(""))
{ {
ClearTimeoutAlarm("A上暂存区物料拿走"); ClearTimeoutAlarm("A上暂存区物料拿走");
MoveInfo.NextMoveStep(StepEnum.II43_MiddleToP4); MoveInfo.NextMoveStep(StepEnum.II43_InoutToP2);
MoveLog($" 入料->A侧 {MoveInfo.SLog}: 暂存区为空, 旋转轴 到P4(A上暂存区放料点){Config.Middle_P4_AUpper}");//,等待{IO_Type.MAxis_Check_AreaA}信号亮 MoveLog($" 入料->A侧 {MoveInfo.SLog}: 暂存区为空, 进出轴 到P2(A暂存区放料点){Config.Inout_P2}");
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P4_AUpper, Config.Middle_P4_Speed); InOutAxis.AbsMove(MoveInfo, Config.Inout_P2, Config.Inout_P2_Speed);
//MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.MAxis_Check_AreaA, IO_VALUE.HIGH));
} }
else if (MoveInfo.IsTimeOut(60)) else if (MoveInfo.IsTimeOut(60))
{ {
MoveTimeOut(MoveInfo, "A上暂存区物料拿走"); MoveTimeOut(MoveInfo, "A上暂存区物料拿走");
} }
} }
else if (MoveInfo.IsStep(StepEnum.II42_WaitNoReel)) else if (MoveInfo.IsStep(StepEnum.II43_InoutToP2))
{
MoveInfo.NextMoveStep(StepEnum.II43_MiddleToP4);
MoveLog($" 入料->A侧 {MoveInfo.SLog}: 旋转轴 到P4(A上暂存区放料点){Config.Middle_P4_AUpper}");//,等待{IO_Type.MAxis_Check_AreaA}信号亮
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P4_AUpper, Config.Middle_P4_Speed);
//MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.MAxis_Check_AreaA, IO_VALUE.HIGH));
}
else if (MoveInfo.IsStep(StepEnum.II43_MiddleToP4))
{ {
TrayHasLeave(); TrayHasLeave();
MoveInfo.NextMoveStep(StepEnum.II44_UpdownToP5); II44_UpdownToP5();
MoveLog($" 入料->A侧 {MoveInfo.SLog}: 升降轴 到P5(A上暂存区放料低点){Config.Updown_P5_AUpperL}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P5_AUpperL, Config.Updown_P5_Speed);
} }
else if (MoveInfo.IsStep(StepEnum.II44_UpdownToP5)) else if (MoveInfo.IsStep(StepEnum.II44_UpdownToP5))
{ {
...@@ -305,15 +360,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -305,15 +360,18 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(StepEnum.II46_UpdownToP4)) else if (MoveInfo.IsStep(StepEnum.II46_UpdownToP4))
{ {
MoveInfo.NextMoveStep(StepEnum.II47_1_InoutToP1);
MoveLog($" 入料->A侧 {MoveInfo.SLog}: 进出轴 到P1{Config.Inout_P1}");
InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
}
else if (MoveInfo.IsStep(StepEnum.II47_1_InoutToP1))
{
if (!BatchMove_A.IsInScanCode()) if (!BatchMove_A.IsInScanCode())
{ {
int targetV = Config.Middle_P4_AUpper - Config.MiddleOffsetValue; int targetV = Config.Middle_P4_AUpper - Config.MiddleOffsetValue;
MoveInfo.NextMoveStep(StepEnum.II47_MiddleToP1); MoveInfo.NextMoveStep(StepEnum.II47_MiddleToP1);
MoveLog($" 入料->A侧 {MoveInfo.SLog}: 旋转轴 到P4(偏移点){targetV}"); MoveLog($" 入料->A侧 {MoveInfo.SLog}: 旋转轴 到P4(偏移点){targetV}");
MiddleAxis.AbsMove(MoveInfo, targetV, Config.Middle_P1_Speed); MiddleAxis.AbsMove(MoveInfo, targetV, Config.Middle_P1_Speed);
//MoveLog($" 入料->A侧 {MoveInfo.SLog}: 旋转轴 到P1(待机点){Config.Middle_P1}");
//MiddleAxis.AbsMove(MoveInfo, Config.Middle_P1, Config.Middle_P1_Speed);
} }
else if (MoveInfo.IsTimeOut(20)) else if (MoveInfo.IsTimeOut(20))
{ {
...@@ -333,33 +391,32 @@ namespace OnlineStore.DeviceLibrary ...@@ -333,33 +391,32 @@ namespace OnlineStore.DeviceLibrary
#region 入料->B侧上暂存区 #region 入料->B侧上暂存区
else if (MoveInfo.IsStep(StepEnum.II60_UpdownToP10)) //else if (MoveInfo.IsStep(StepEnum.II60_UpdownToP10))
//{
// bool empty = BufferDataManager.BInStoreInfo == null || BufferDataManager.BInStoreInfo.PosId.Equals("");
// if (IOValue(IO_Type.FeedingB_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW) && empty)
// {
// II63_MiddleToP5();
// }
// else
// {
// int targetValue = Config.Middle_P5_BUpper + Config.MiddleOffsetValue;
// MoveInfo.NextMoveStep(StepEnum.II61_MiddleToP5);
// MoveLog($" 入料->B侧 {MoveInfo.SLog}: 暂存区有料, 旋转轴 到P5{Config.Middle_P5_BUpper}-{Config.MiddleOffsetValue}=目标{targetValue}位置等待暂存区无料");
// MiddleAxis.AbsMove(MoveInfo, targetValue, Config.Middle_P5_Speed);
// }
//}
else if (MoveInfo.IsStep(StepEnum.II61_MiddleToP5))
{ {
bool empty = BufferDataManager.BInStoreInfo == null || BufferDataManager.BInStoreInfo.PosId.Equals(""); bool empty = BufferDataManager.BInStoreInfo == null || BufferDataManager.BInStoreInfo.PosId.Equals("");
if (IOValue(IO_Type.FeedingB_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW) && empty) if (IOValue(IO_Type.FeedingB_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW) && empty)
{ {
II63_MiddleToP5(); II63_InoutToP3();
} }
else else
{ {
int targetValue = Config.Middle_P5_BUpper + Config.MiddleOffsetValue;
MoveInfo.NextMoveStep(StepEnum.II61_MiddleToWaitP5);
MoveLog($" 入料->B侧 {MoveInfo.SLog}: 暂存区有料, 旋转轴 到P5{Config.Middle_P5_BUpper}-{Config.MiddleOffsetValue}=目标{targetValue}位置等待暂存区无料");
MiddleAxis.AbsMove(MoveInfo, targetValue, Config.Middle_P5_Speed);
}
}
else if (MoveInfo.IsStep(StepEnum.II61_MiddleToWaitP5))
{
if (UpdownAxis.IsInPosition(Config.Updown_P10_BUpperH))
{
TrayHasLeave();
MoveInfo.NextMoveStep(StepEnum.II62_WaitNoReel); MoveInfo.NextMoveStep(StepEnum.II62_WaitNoReel);
MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 等待B上暂存区无料"); MoveLog($" 入料->B侧 {MoveInfo.SLog}: 暂存区有料,等待暂存区无料");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FeedingB_Instore_UpperArea_ReelCheck, IO_VALUE.LOW));
}
else
{
II61_MiddleToWaitP5();
} }
} }
else if (MoveInfo.IsStep(StepEnum.II62_WaitNoReel)) else if (MoveInfo.IsStep(StepEnum.II62_WaitNoReel))
...@@ -367,19 +424,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -367,19 +424,17 @@ namespace OnlineStore.DeviceLibrary
if (BufferDataManager.BInStoreInfo == null || BufferDataManager.BInStoreInfo.PosId.Equals("")) if (BufferDataManager.BInStoreInfo == null || BufferDataManager.BInStoreInfo.PosId.Equals(""))
{ {
ClearTimeoutAlarm("B上暂存区物料拿走"); ClearTimeoutAlarm("B上暂存区物料拿走");
II63_MiddleToP5(); II63_InoutToP3();
} }
else if (MoveInfo.IsTimeOut(60)) else if (MoveInfo.IsTimeOut(60))
{ {
MoveTimeOut(MoveInfo, "B上暂存区物料拿走"); MoveTimeOut(MoveInfo, "B上暂存区物料拿走");
} }
} }
else if (MoveInfo.IsStep(StepEnum.II63_MiddleToP5)) else if (MoveInfo.IsStep(StepEnum.II63_InoutToP3))
{ {
TrayHasLeave(); TrayHasLeave();
MoveInfo.NextMoveStep(StepEnum.II64_UpdownToP11); II64_UpdownToP11();
MoveLog($" 入料->B侧 {MoveInfo.SLog}: 升降轴 到P11 (B上暂存区放料低点){Config.Updown_P11_BUpperL}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P11_BUpperL, Config.Updown_P11_Speed);
} }
else if (MoveInfo.IsStep(StepEnum.II64_UpdownToP11)) else if (MoveInfo.IsStep(StepEnum.II64_UpdownToP11))
{ {
...@@ -395,12 +450,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -395,12 +450,18 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(StepEnum.II66_UpdownToP10)) else if (MoveInfo.IsStep(StepEnum.II66_UpdownToP10))
{ {
MoveInfo.NextMoveStep(StepEnum.II67_1_InoutToP1);
MoveLog($" 入料->B侧 {MoveInfo.SLog}: 进出轴 到待机点P1{Config.Inout_P1}");
InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
}
else if (MoveInfo.IsStep(StepEnum.II67_1_InoutToP1))
{
//需要等A侧料串不扫码时再过去 //需要等A侧料串不扫码时再过去
if (!BatchMove_B.IsInScanCode()) if (!BatchMove_B.IsInScanCode())
{ {
int targetValue = Config.Middle_P5_BUpper + Config.MiddleOffsetValue; int targetValue = Config.Middle_P5_BUpper + Config.MiddleOffsetValue;
MoveInfo.NextMoveStep(StepEnum.II67_MiddleToP1); MoveInfo.NextMoveStep(StepEnum.II67_MiddleToP1);
MoveLog($" 入料->B侧 {MoveInfo.SLog}: 旋转轴 到P5(偏移点){targetValue}"); MoveLog($" 入料->B侧 {MoveInfo.SLog}: 旋转轴 到P5(偏移点){targetValue}");
MiddleAxis.AbsMove(MoveInfo, targetValue, Config.Middle_P1_Speed); MiddleAxis.AbsMove(MoveInfo, targetValue, Config.Middle_P1_Speed);
//MoveLog($" 入料->B侧 {MoveInfo.SLog}: 旋转轴 到P1(待机点){Config.Middle_P1}"); //MoveLog($" 入料->B侧 {MoveInfo.SLog}: 旋转轴 到P1(待机点){Config.Middle_P1}");
...@@ -423,13 +484,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -423,13 +484,13 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region 入料->NG箱上暂存区 #region 入料->NG箱上暂存区
else if (MoveInfo.IsStep(StepEnum.II81_UpdownToP8)) else if (MoveInfo.IsStep(StepEnum.II81_MiddleToNg))
{ {
MoveInfo.NextMoveStep(StepEnum.II82_MiddleToNg); MoveInfo.NextMoveStep(StepEnum.II82_InoutToP6);
MoveLog($" 入料->NG箱 {MoveInfo.SLog}: 旋转轴到P6(NG料区放料点){Config.Middle_P6_NG}"); MoveLog($" 入料->NG箱 {MoveInfo.SLog}: 进出轴到P6(NG料区放料点){Config.Inout_P6}");
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P6_NG, Config.Middle_P6_Speed); InOutAxis.AbsMove(MoveInfo, Config.Inout_P6, Config.Inout_P6_Speed);
} }
else if (MoveInfo.IsStep(StepEnum.II82_MiddleToNg)) else if (MoveInfo.IsStep(StepEnum.II82_InoutToP6))
{ {
TrayHasLeave(); TrayHasLeave();
MoveInfo.NextMoveStep(StepEnum.II83_UpdownToP9); MoveInfo.NextMoveStep(StepEnum.II83_UpdownToP9);
...@@ -450,6 +511,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -450,6 +511,12 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(StepEnum.II85_UpdownToP8)) else if (MoveInfo.IsStep(StepEnum.II85_UpdownToP8))
{ {
MoveInfo.NextMoveStep(StepEnum.II86_1_InoutToP1);
MoveLog($" 入料->NG箱 {MoveInfo.SLog}: 进出轴到P1(待机点){Config.Inout_P1}");
InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
}
else if (MoveInfo.IsStep(StepEnum.II86_1_InoutToP1))
{
if (shelf.Equals(1)) if (shelf.Equals(1))
{ {
MoveLog($" 入料->NG箱放料结束"); MoveLog($" 入料->NG箱放料结束");
...@@ -475,22 +542,60 @@ namespace OnlineStore.DeviceLibrary ...@@ -475,22 +542,60 @@ namespace OnlineStore.DeviceLibrary
} }
private void II63_MiddleToP5() private void II63_InoutToP3()
{ {
MoveInfo.NextMoveStep(StepEnum.II63_MiddleToP5); MoveInfo.NextMoveStep(StepEnum.II63_InoutToP3);
MoveInfo.TimeOutSeconds = 10; MoveInfo.TimeOutSeconds = 10;
MoveLog($" 入料->B侧 {MoveInfo.SLog}: 暂存区无料,旋转轴 到P5 (B上暂存区放料点){Config.Middle_P5_BUpper},等待{MiddleAxis.AxisName}原点信号亮"); MoveLog($" 入料->B侧 {MoveInfo.SLog}: 暂存区无料,进出轴 到P3 (B暂存区放料点){Config.Inout_P3}");
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P5_BUpper, Config.Middle_P5_Speed); InOutAxis.AbsMove(MoveInfo, Config.Inout_P3, Config.Inout_P3_Speed);
MoveInfo.WaitList.Add(WaitResultInfo.WaitAxisOrg(MiddleAxis.Config, IO_VALUE.HIGH));
} }
private void II43_MiddleToP4() private void II43_InoutToP2()
{ {
MoveInfo.NextMoveStep(StepEnum.II43_MiddleToP4); MoveInfo.NextMoveStep(StepEnum.II43_InoutToP2);
MoveInfo.TimeOutSeconds = 10; MoveInfo.TimeOutSeconds = 10;
MoveLog($" 入料->A侧 {MoveInfo.SLog}: 暂存区为空, 旋转轴 到P4(A上暂存区放料点){Config.Middle_P4_AUpper}");//,等待{IO_Type.MAxis_Check_AreaA}信号亮 MoveLog($" 入料->A侧 {MoveInfo.SLog}: 暂存区为空, 进出轴 到P2(A暂存区放料点){Config.Inout_P2}");
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P4_AUpper, Config.Middle_P4_Speed); InOutAxis.AbsMove(MoveInfo, Config.Inout_P2, Config.Inout_P2_Speed);
//MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.MAxis_Check_AreaA, IO_VALUE.HIGH)); }
private void II01_InoutToP1()
{
MoveInfo.NextMoveStep(StepEnum.II01_InoutToP1);
MoveLog($"入库取料{MoveInfo.SLog}: 进出轴到P1 {Config.Inout_P1}");
InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
}
private void II0306_UpdownToP2P3()
{
int shelf = MoveInfo.MoveParam.ShelfType;
if (shelf.Equals(1))
{
MoveInfo.NextMoveStep(StepEnum.II03_UpdownToP2);
MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 升降轴到P2(A料口取料点) {Config.Updown_P2_ATake}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P2_ATake, Config.Updown_P2_Speed);
}
else if (shelf.Equals(2))
{
MoveInfo.NextMoveStep(StepEnum.II06_UpdownToP3);
MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 升降轴到P3(B料口取料点) {Config.Updown_P3_BTake}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P3_BTake, Config.Updown_P3_Speed);
}
}
private void II07_InoutToP4P5()
{
MoveInfo.NextMoveStep(StepEnum.II07_InoutToP4P5);
int shelf = MoveInfo.MoveParam.ShelfType;
if (shelf.Equals(1))
{
MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 进出轴到P4(A料口取料点){Config.Inout_P4}");
InOutAxis.AbsMove(MoveInfo, Config.Inout_P4, Config.Inout_P4_Speed);
}
else if (shelf.Equals(2))
{
MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 进出轴到P5(B料口取料点){Config.Inout_P5}");
InOutAxis.AbsMove(MoveInfo, Config.Inout_P5, Config.Inout_P5_Speed);
}
} }
private void ToShelfMove() private void ToShelfMove()
{ {
...@@ -504,7 +609,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -504,7 +609,7 @@ namespace OnlineStore.DeviceLibrary
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P1, Config.Updown_P1_Speed); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P1, Config.Updown_P1_Speed);
} }
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P2_ATake, Config.Middle_P2_Speed); MiddleAxis.AbsMove(MoveInfo, Config.Middle_P2_ATake, Config.Middle_P2_Speed);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.MAxis_Check_A, IO_VALUE.HIGH)); // MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.MAxis_Check_A, IO_VALUE.HIGH));
} }
else if (shelf.Equals(2)) else if (shelf.Equals(2))
{ {
...@@ -526,41 +631,41 @@ namespace OnlineStore.DeviceLibrary ...@@ -526,41 +631,41 @@ namespace OnlineStore.DeviceLibrary
} }
private void StrartToTargetP() private void StrartToTargetP()
{ {
InOutPosInfo lastPosInfo = MoveInfo.MoveParam.PosInfo ; InOutPosInfo lastPosInfo = MoveInfo.MoveParam.PosInfo;
int shelf = MoveInfo.MoveParam.ShelfType; int shelf = MoveInfo.MoveParam.ShelfType;
//判断是A还是B //判断是A还是B
if (lastPosInfo.IsNG) if (lastPosInfo.IsNG)
{ {
MoveInfo.NextMoveStep(StepEnum.II81_UpdownToP8); MoveInfo.NextMoveStep(StepEnum.II81_MiddleToNg);
MoveLog($"入库取料{shelf}{MoveInfo.SLog}: NG料{lastPosInfo.ToStr()} 升降轴到P8(NG料区放料高点){Config.Updown_P8_NGH}"); MoveLog($"入库取料{shelf}{MoveInfo.SLog}: NG料{lastPosInfo.ToStr()} 升降轴到P8(NG料区放料高点){Config.Updown_P8_NGH},旋转轴到P6(NG料区放料点){Config.Middle_P6_NG}");
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P6_NG, Config.Middle_P6_Speed);
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P8_NGH, Config.Updown_P8_Speed); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P8_NGH, Config.Updown_P8_Speed);
} }
else if (lastPosInfo.GetPosSide().Equals("A")) else if (lastPosInfo.GetPosSide().Equals("A"))
{ {
II41_MiddleTWaitP4(); II41_MiddleToP4();
} }
else else
{ {
II61_MiddleToWaitP5(); II61_MiddleToP5();
} }
TrayStartLeave(); TrayStartLeave();
} }
private void II61_MiddleToWaitP5() private void II61_MiddleToP5()
{ {
int targetValue = Config.Middle_P5_BUpper + Config.MiddleOffsetValue; int targetValue = Config.Middle_P5_BUpper + Config.MiddleOffsetValue;
MoveInfo.NextMoveStep(StepEnum.II61_MiddleToWaitP5); MoveInfo.NextMoveStep(StepEnum.II61_MiddleToP5);
MoveLog($" 入料->B侧 {MoveInfo.SLog}: 暂存区有料,升降轴 到P10(B上暂存区放料高点){Config.Updown_P10_BUpperH}, 旋转轴 到P5{Config.Middle_P5_BUpper}-{Config.MiddleOffsetValue}=目标{targetValue}位置等待暂存区无料"); MoveLog($" 入料->B侧 {MoveInfo.SLog}: 暂存区有料,升降轴 到P10(B上暂存区放料高点){Config.Updown_P10_BUpperH}, 旋转轴 到P5位置,等待暂存区无料");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P10_BUpperH, Config.Updown_P10_Speed); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P10_BUpperH, Config.Updown_P10_Speed);
MiddleAxis.AbsMove(MoveInfo, targetValue, Config.Middle_P5_Speed); MiddleAxis.AbsMove(MoveInfo, Config.Middle_P5_BUpper, Config.Middle_P5_Speed);
} }
private void II41_MiddleTWaitP4() private void II41_MiddleToP4()
{ {
int targetV = Config.Middle_P4_AUpper - Config.MiddleOffsetValue; int targetV = Config.Middle_P4_AUpper - Config.MiddleOffsetValue;
MoveInfo.NextMoveStep(StepEnum.II41_MiddleTWaitP4); MoveInfo.NextMoveStep(StepEnum.II41_MiddleToP4);
MoveLog($" 入料->A侧 {MoveInfo.SLog}: 暂存区有料,升降轴 到P4(A上暂存区放料高点){Config.Updown_P4_AUpperH}, 旋转轴 到P4{Config.Middle_P4_AUpper}-{Config.MiddleOffsetValue}=目标{targetV}位置等待暂存区无料"); MoveLog($" 入料->A侧 {MoveInfo.SLog}: 暂存区有料,升降轴 到P4(A上暂存区放料高点){Config.Updown_P4_AUpperH}, 旋转轴 到P4{Config.Middle_P4_AUpper}位置,等待暂存区无料");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P4_AUpperH, Config.Updown_P4_Speed); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P4_AUpperH, Config.Updown_P4_Speed);
MiddleAxis.AbsMove(MoveInfo, targetV, Config.Middle_P4_Speed); MiddleAxis.AbsMove(MoveInfo, targetV, Config.Middle_P4_Speed);
} }
...@@ -572,7 +677,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -572,7 +677,8 @@ namespace OnlineStore.DeviceLibrary
private void II13_GetPosId() private void II13_GetPosId()
{ {
MoveInfo.NextMoveStep(StepEnum.II13_GetPosId); MoveInfo.NextMoveStep(StepEnum.II13_GetPosId);
MoveLog($"入库{MoveInfo.SLog}: 清空LastPosResult,从服务器获取入库库位"); MoveLog($"入库{MoveInfo.SLog}: 清空LastPosResult,从服务器获取入库库位,进出轴回待机点P1 {Config.Inout_P1}");
InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
LastPosInfo = null; LastPosInfo = null;
InOutPosInfo pos = MoveInfo.MoveParam.PosInfo; InOutPosInfo pos = MoveInfo.MoveParam.PosInfo;
List<string> codeList = Regex.Split(pos.barcode, "##", RegexOptions.IgnoreCase).ToList(); List<string> codeList = Regex.Split(pos.barcode, "##", RegexOptions.IgnoreCase).ToList();
...@@ -704,6 +810,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -704,6 +810,7 @@ namespace OnlineStore.DeviceLibrary
} }
if (MoveInfo.MoveType.Equals(MoveType.None)) if (MoveInfo.MoveType.Equals(MoveType.None))
{ {
if (!InOutAxis.IsInPosition(Config.Inout_P1)) return false;
//获取位置是左侧还是右侧。 //获取位置是左侧还是右侧。
int startp = param.PosInfo.GetPosType(); int startp = param.PosInfo.GetPosType();
if (startp.Equals(1)) if (startp.Equals(1))
...@@ -719,7 +826,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -719,7 +826,7 @@ namespace OnlineStore.DeviceLibrary
MoveLog($"开始A下暂存区物料出库{MoveInfo.SLog}: 料串{param.ShelfType},等待料盘检测=1,旋转轴到P1{Config.Middle_P1}"); MoveLog($"开始A下暂存区物料出库{MoveInfo.SLog}: 料串{param.ShelfType},等待料盘检测=1,旋转轴到P1{Config.Middle_P1}");
} }
else else
{ {
MoveLog($"开始A下暂存区物料出库{MoveInfo.SLog}: 料串{param.ShelfType},等待料盘检测=1"); MoveLog($"开始A下暂存区物料出库{MoveInfo.SLog}: 料串{param.ShelfType},等待料盘检测=1");
} }
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck, IO_VALUE.HIGH));
...@@ -740,7 +847,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -740,7 +847,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveLog($"开始B下暂存区物料出库{MoveInfo.SLog}: 料串{param.ShelfType},等待料盘检测=1"); MoveLog($"开始B下暂存区物料出库{MoveInfo.SLog}: 料串{param.ShelfType},等待料盘检测=1");
} }
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FeedingB_Outstore_UnderArea_ReelCheck, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FeedingB_Outstore_UnderArea_ReelCheck, IO_VALUE.HIGH));
} }
else else
{ {
...@@ -784,23 +891,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -784,23 +891,20 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.IsStep(StepEnum.IO01_ReelCheck)) if (MoveInfo.IsStep(StepEnum.IO01_ReelCheck))
{ {
MoveInfo.NextMoveStep(StepEnum.IO02_UpdownToP6); MoveInfo.NextMoveStep(StepEnum.IO02_UpdownToP6);
MoveLog($"出库A->{shelf}料串 {MoveInfo.SLog}: 升降轴到P6(A下暂存区取料高点){Config.Updown_P6_AUnderH}"); MoveLog($"出库A->{shelf}料串 {MoveInfo.SLog}: 升降轴到P6(A下暂存区取料高点){Config.Updown_P6_AUnderH},旋转轴到P7(A下暂存区取料点){Config.Middle_P7_AUnder}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P6_AUnderH, Config.Updown_P6_Speed); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P6_AUnderH, Config.Updown_P6_Speed);
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P7_AUnder, Config.Middle_P7_Speed);
ShelfBatchAxisDown(); ShelfBatchAxisDown();
} }
else if (MoveInfo.IsStep(StepEnum.IO02_UpdownToP6)) else if (MoveInfo.IsStep(StepEnum.IO02_UpdownToP6))
{ {
MoveInfo.NextMoveStep(StepEnum.IO03_MiddleToP7); MoveInfo.NextMoveStep(StepEnum.IO03_InoutToP2);
MoveLog($"出库A->{shelf}料串 {MoveInfo.SLog}: 旋转轴到P7(A下暂存区取料点){Config.Middle_P7_AUnder}");//,等待{IO_Type.MAxis_Check_AreaA}信号亮 MoveLog($"出库A->{shelf}料串 {MoveInfo.SLog}: 进出轴到P2(A暂存区点){Config.Inout_P2}");
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P7_AUnder, Config.Middle_P7_Speed); InOutAxis.AbsMove(MoveInfo, Config.Inout_P2, Config.Inout_P2_Speed);
//MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.MAxis_Check_AreaA, IO_VALUE.HIGH));
} }
else if (MoveInfo.IsStep(StepEnum.IO03_MiddleToP7)) else if (MoveInfo.IsStep(StepEnum.IO03_InoutToP2))
{ {
MoveInfo.NextMoveStep(StepEnum.IO04_UpdownToP7); IO04_UpdownToP7(shelf);
MoveLog($"出库A->{shelf}料串 {MoveInfo.SLog}: 升降轴到P7(A下暂存区取料低点){Config.Updown_P7_AUnderL}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P7_AUnderL, Config.Updown_P7_Speed);
} }
else if (MoveInfo.IsStep(StepEnum.IO04_UpdownToP7)) else if (MoveInfo.IsStep(StepEnum.IO04_UpdownToP7))
{ {
...@@ -816,6 +920,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -816,6 +920,12 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(StepEnum.IO06_UpdownToP6)) else if (MoveInfo.IsStep(StepEnum.IO06_UpdownToP6))
{ {
MoveInfo.NextMoveStep(StepEnum.IO07_1_InoutToP1);
MoveLog($"出库A->{shelf}料串 {MoveInfo.SLog}: 进出轴到P1(待机点点){Config.Inout_P1}");
InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
}
else if (MoveInfo.IsStep(StepEnum.IO07_1_InoutToP1))
{
//判断料盘信号是否消失 //判断料盘信号是否消失
if (IOValue(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW))
{ {
...@@ -829,8 +939,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -829,8 +939,8 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StepEnum.IO07_WaitReelCheckLow); MoveInfo.NextMoveStep(StepEnum.IO07_WaitReelCheckLow);
MoveLog($"出库A->{shelf}料串 {MoveInfo.SLog}: 料盘已拿走,等待料盘检测信号=0"); MoveLog($"出库A->{shelf}料串 {MoveInfo.SLog}: 料盘已拿走,等待料盘检测信号=0");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck, IO_VALUE.LOW)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck, IO_VALUE.LOW));
} }
} }
else if (MoveInfo.IsStep(StepEnum.IO07_WaitReelCheckLow)) else if (MoveInfo.IsStep(StepEnum.IO07_WaitReelCheckLow))
{ {
...@@ -846,23 +956,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -846,23 +956,20 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StepEnum.IO11_ReelCheck)) else if (MoveInfo.IsStep(StepEnum.IO11_ReelCheck))
{ {
MoveInfo.NextMoveStep(StepEnum.IO12_UpdownToP12); MoveInfo.NextMoveStep(StepEnum.IO12_UpdownToP12);
MoveLog($"出库B->{shelf}料串 {MoveInfo.SLog}: 升降轴到P12(B下暂存区取料高点){Config.Updown_P12_BUnderH}"); MoveLog($"出库B->{shelf}料串 {MoveInfo.SLog}: 升降轴到P12(B下暂存区取料高点){Config.Updown_P12_BUnderH},旋转轴到P8(B下暂存区取料点){Config.Middle_P8_BUnder}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P12_BUnderH, Config.Updown_P12_Speed); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P12_BUnderH, Config.Updown_P12_Speed);
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P8_BUnder, Config.Middle_P8_Speed);
ShelfBatchAxisDown(); ShelfBatchAxisDown();
} }
else if (MoveInfo.IsStep(StepEnum.IO12_UpdownToP12)) else if (MoveInfo.IsStep(StepEnum.IO12_UpdownToP12))
{ {
MoveInfo.NextMoveStep(StepEnum.IO13_MiddleToP8); MoveInfo.NextMoveStep(StepEnum.IO13_InoutToP3);
MoveLog($"出库B->{shelf}料串 {MoveInfo.SLog}: 旋转轴到P8(B下暂存区取料点){Config.Middle_P8_BUnder},等待{MiddleAxis.AxisName}原点信号亮"); MoveLog($"出库B->{shelf}料串 {MoveInfo.SLog}: 进出轴到P3(B暂存区点)");
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P8_BUnder, Config.Middle_P8_Speed); InOutAxis.AbsMove(MoveInfo, Config.Inout_P3, Config.Inout_P3_Speed);
MoveInfo.WaitList.Add(WaitResultInfo.WaitAxisOrg(MiddleAxis.Config, IO_VALUE.HIGH));
} }
else if (MoveInfo.IsStep(StepEnum.IO13_MiddleToP8)) else if (MoveInfo.IsStep(StepEnum.IO13_InoutToP3))
{ {
MoveInfo.NextMoveStep(StepEnum.IO14_UpdownToP13); IO14_UpdownToP13(shelf);
MoveLog($"出库B->{shelf}料串 {MoveInfo.SLog}: 升降轴到P13(B下暂存区取料低点){Config.Updown_P13_BUnderL}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P13_BUnderL, Config.Updown_P13_Speed);
} }
else if (MoveInfo.IsStep(StepEnum.IO14_UpdownToP13)) else if (MoveInfo.IsStep(StepEnum.IO14_UpdownToP13))
{ {
...@@ -878,6 +985,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -878,6 +985,12 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(StepEnum.IO16_UpdownToP6)) else if (MoveInfo.IsStep(StepEnum.IO16_UpdownToP6))
{ {
MoveInfo.NextMoveStep(StepEnum.IO17_1_InoutToP1);
MoveLog($"出库B->{shelf}料串 {MoveInfo.SLog}: j进出轴到P11(待机点){Config.Inout_P1}");
InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
}
else if (MoveInfo.IsStep(StepEnum.IO17_1_InoutToP1))
{
//判断料盘信号是否消失 //判断料盘信号是否消失
if (IOValue(IO_Type.FeedingB_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.FeedingB_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW))
{ {
...@@ -914,36 +1027,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -914,36 +1027,26 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveTimeOut(MoveInfo, "等待料串可放料"); MoveTimeOut(MoveInfo, "等待料串可放料");
} }
}else if (MoveInfo.IsStep(StepEnum.IO23_MiddleToP2)) }
else if (MoveInfo.IsStep(StepEnum.IO23_MiddleToP2))
{ {
//清空暂存区 MoveInfo.NextMoveStep(StepEnum.IO24_InoutToP4);
int startp = MoveInfo.MoveParam.PosInfo.GetPosType(); MoveLog($"出库->A料串 {MoveInfo.SLog}: 料盘已离开,进出轴到P4(A料口取料点){Config.Inout_P4}");
//if (startp.Equals(1)) InOutAxis.AbsMove(MoveInfo, Config.Inout_P4, Config.Inout_P4_Speed);
//{
// BufferDataManager.AOutStoreInfo = null;
//}
//else
//{
// BufferDataManager.BOutStoreInfo = null;
//}
MoveInfo.NextMoveStep(StepEnum.IO24_UpdownToP2);
MoveLog($"出库->A料串 {MoveInfo.SLog}: 料盘已离开,升降轴到P2(A料口取料点){Config.Updown_P2_ATake}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P2_ATake, Config.Updown_P2_Speed);
} }
else if (MoveInfo.IsStep(StepEnum.IO27_MiddleToP3)) else if (MoveInfo.IsStep(StepEnum.IO27_MiddleToP3))
{ {
MoveInfo.NextMoveStep(StepEnum.IO28_UpdownToP3); MoveInfo.NextMoveStep(StepEnum.IO28_InoutToP5);
MoveLog($"出库->A料串 {MoveInfo.SLog}: 升降轴到P3(B料口取料点){Config.Updown_P3_BTake}"); MoveLog($"出库->B料串 {MoveInfo.SLog}: 料盘已离开,进出轴到P5(B料口取料点){Config.Inout_P5}");
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P3_BTake, Config.Updown_P3_Speed); InOutAxis.AbsMove(MoveInfo, Config.Inout_P5, Config.Inout_P5_Speed);
} }
else if (MoveInfo.IsStep(StepEnum.IO24_UpdownToP2)) else if (MoveInfo.IsStep(StepEnum.IO24_InoutToP4))
{ {
MoveInfo.NextMoveStep(StepEnum.IO31_ClampRelax); MoveInfo.NextMoveStep(StepEnum.IO31_ClampRelax);
MoveLog($"出库->料串 {MoveInfo.SLog}: 电卡爪放松 判断到位"); MoveLog($"出库->料串 {MoveInfo.SLog}: 电卡爪放松 判断到位");
ClampRelax(MoveInfo, MoveInfo.MoveParam.PosInfo.barcode); ClampRelax(MoveInfo, MoveInfo.MoveParam.PosInfo.barcode);
} }
else if (MoveInfo.IsStep(StepEnum.IO28_UpdownToP3)) else if (MoveInfo.IsStep(StepEnum.IO28_InoutToP5))
{ {
MoveInfo.NextMoveStep(StepEnum.IO31_ClampRelax); MoveInfo.NextMoveStep(StepEnum.IO31_ClampRelax);
MoveLog($"出库->料串 {MoveInfo.SLog}: 电卡爪放松 判断到位"); MoveLog($"出库->料串 {MoveInfo.SLog}: 电卡爪放松 判断到位");
...@@ -962,9 +1065,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -962,9 +1065,9 @@ namespace OnlineStore.DeviceLibrary
SServerManager.ShelfFinish(BatchMove_B.CurrShelf.ShelfRfid, MoveInfo.MoveParam.PosInfo.barcode); SServerManager.ShelfFinish(BatchMove_B.CurrShelf.ShelfRfid, MoveInfo.MoveParam.PosInfo.barcode);
} }
MoveInfo.NextMoveStep(StepEnum.IO32_UpdownToP1); MoveInfo.NextMoveStep(StepEnum.IO32_UpdownToP1);
MoveLog($"出库->料串 {MoveInfo.SLog}: 升降轴到P1(待机点){Config.Updown_P1}"); MoveLog($"出库->料串 {MoveInfo.SLog}: 进出轴到P1(待机点){Config.Inout_P1}");//升降轴到P1(待机点){Config.Updown_P1},
UpdownAxis.AbsMove(MoveInfo, Config.Updown_P1, Config.Updown_P1_Speed); //UpdownAxis.AbsMove(MoveInfo, Config.Updown_P1, Config.Updown_P1_Speed);
InOutAxis.AbsMove(MoveInfo, Config.Inout_P1, Config.Inout_P1_Speed);
} }
else if (MoveInfo.IsStep(StepEnum.IO32_UpdownToP1)) else if (MoveInfo.IsStep(StepEnum.IO32_UpdownToP1))
{ {
...@@ -994,9 +1097,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -994,9 +1097,9 @@ namespace OnlineStore.DeviceLibrary
ClearTimeoutAlarm("等待料串可放料"); ClearTimeoutAlarm("等待料串可放料");
MoveInfo.NextMoveStep(StepEnum.IO23_MiddleToP2); MoveInfo.NextMoveStep(StepEnum.IO23_MiddleToP2);
MoveLog($"出库->A料串 {MoveInfo.SLog}: 清除暂存区。旋转轴到P2(A料口取料点){Config.Middle_P2_ATake}");//,等待{IO_Type.MAxis_Check_A}信号亮 MoveLog($"出库->A料串 {MoveInfo.SLog}: 清除暂存区。旋转轴到P2(A料口取料点){Config.Middle_P2_ATake},升降轴到P2(A料口取料点){Config.Updown_P2_ATake}");//,等待{IO_Type.MAxis_Check_A}信号亮
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P2_ATake, Config.Middle_P2_Speed); MiddleAxis.AbsMove(MoveInfo, Config.Middle_P2_ATake, Config.Middle_P2_Speed);
//MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.MAxis_Check_A, IO_VALUE.HIGH)); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P2_ATake, Config.Updown_P2_Speed);
//清空暂存区 //清空暂存区
int startp = MoveInfo.MoveParam.PosInfo.GetPosType(); int startp = MoveInfo.MoveParam.PosInfo.GetPosType();
if (startp.Equals(1)) if (startp.Equals(1))
...@@ -1018,10 +1121,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -1018,10 +1121,9 @@ namespace OnlineStore.DeviceLibrary
{ {
ClearTimeoutAlarm("等待料串可放料"); ClearTimeoutAlarm("等待料串可放料");
MoveInfo.NextMoveStep(StepEnum.IO27_MiddleToP3); MoveInfo.NextMoveStep(StepEnum.IO27_MiddleToP3);
MoveLog($"出库->B料串 {MoveInfo.SLog}:清除暂存区。 旋转轴到P3(B料口取料点){Config.Middle_P3_BTake}");//,等待{IO_Type.MAxis_Check_B}信号亮 MoveLog($"出库->B料串 {MoveInfo.SLog}:清除暂存区。 旋转轴到P3(B料口取料点){Config.Middle_P3_BTake},升降轴到P3(B料口取料点){Config.Updown_P3_BTake}");//,等待{IO_Type.MAxis_Check_B}信号亮
MiddleAxis.AbsMove(MoveInfo, Config.Middle_P3_BTake, Config.Middle_P3_Speed); MiddleAxis.AbsMove(MoveInfo, Config.Middle_P3_BTake, Config.Middle_P3_Speed);
//MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.MAxis_Check_B, IO_VALUE.HIGH)); UpdownAxis.AbsMove(MoveInfo, Config.Updown_P3_BTake, Config.Updown_P3_Speed);
//清空暂存区 //清空暂存区
int startp = MoveInfo.MoveParam.PosInfo.GetPosType(); int startp = MoveInfo.MoveParam.PosInfo.GetPosType();
if (startp.Equals(1)) if (startp.Equals(1))
...@@ -1057,7 +1159,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1057,7 +1159,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error($"{Name}{MoveInfo.SLog}出库错误:未找到准备好的料串 "); LogUtil.error($"{Name}{MoveInfo.SLog}出库错误:未找到准备好的料串 ");
} }
} }
#endregion #endregion
} }
} }
...@@ -81,6 +81,53 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -81,6 +81,53 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[CSVAttribute("料斗拉取升降轴_料屉提取水平点P2")] [CSVAttribute("料斗拉取升降轴_料屉提取水平点P2")]
public int PullAxis_Updown_P2 { get; set; } 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) public static bool CheckPosition(BoxPosition position, BoxEquip_Config Config)
{ {
try try
......
...@@ -215,54 +215,6 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -215,54 +215,6 @@ namespace OnlineStore.LoadCSVLibrary
public int Updown_P1 { get; set; } public int Updown_P1 { get; set; }
/// <summary> /// <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,,,,,,,,,,,, /// PRO,0,料斗拉取升降轴_待机点P1,PullAxis_Updown_P1,100,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("PullAxis_Updown_P1")] [ConfigProAttribute("PullAxis_Updown_P1")]
......
...@@ -155,20 +155,20 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -155,20 +155,20 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Updown_P4_AUpperH")] [ConfigProAttribute("Updown_P4_AUpperH")]
public int Updown_P4_AUpperH { get; set; } public int Updown_P4_AUpperH { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料升降轴_A上暂存区放料低点,Updown_P5_AUpperL,104,,,,,,,,,,,, /// PRO,0,取料升降轴_A上暂存区7寸放料低点,Updown_P5_AUpperL7,65798,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Updown_P5_AUpperL")] [ConfigProAttribute("Updown_P5_AUpperL7")]
public int Updown_P5_AUpperL { get; set; } public int Updown_P5_AUpperL7 { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料升降轴_A下暂存区取料高点,Updown_P6_AUnderH,105,,,,,,,,,,,, /// PRO,0,取料升降轴_A下暂存区取料高点,Updown_P6_AUnderH,105,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Updown_P6_AUnderH")] [ConfigProAttribute("Updown_P6_AUnderH")]
public int Updown_P6_AUnderH { get; set; } public int Updown_P6_AUnderH { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料升降轴_A下暂存区取料低点,Updown_P7_AUnderL,106,,,,,,,,,,,, /// PRO,0,取料升降轴_A下暂存区7寸取料低点,Updown_P7_AUnderL7,368000,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Updown_P7_AUnderL")] [ConfigProAttribute("Updown_P7_AUnderL7")]
public int Updown_P7_AUnderL { get; set; } public int Updown_P7_AUnderL7 { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料升降轴_NG料区放料高点,Updown_P8_NGH,107,,,,,,,,,,,, /// PRO,0,取料升降轴_NG料区放料高点,Updown_P8_NGH,107,,,,,,,,,,,,
/// </summary> /// </summary>
...@@ -185,20 +185,41 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -185,20 +185,41 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Updown_P10_BUpperH")] [ConfigProAttribute("Updown_P10_BUpperH")]
public int Updown_P10_BUpperH { get; set; } public int Updown_P10_BUpperH { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料升降轴_B上暂存区放料低点,Updown_P11_BUpperL,110,,,,,,,,,,,, /// PRO,0,取料升降轴_B上暂存区7寸放料低点,Updown_P11_BUpperL7,65798,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Updown_P11_BUpperL")] [ConfigProAttribute("Updown_P11_BUpperL7")]
public int Updown_P11_BUpperL { get; set; } public int Updown_P11_BUpperL7 { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料升降轴_B下暂存区取料高点,Updown_P12_BUnderH,111,,,,,,,,,,,, /// PRO,0,取料升降轴_B下暂存区取料高点,Updown_P12_BUnderH,111,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Updown_P12_BUnderH")] [ConfigProAttribute("Updown_P12_BUnderH")]
public int Updown_P12_BUnderH { get; set; } public int Updown_P12_BUnderH { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料升降轴_B下暂存区取料低点,Updown_P13_BUnderL,112,,,,,,,,,,,, /// PRO,0,取料升降轴_B下暂存区7寸取料低点,Updown_P13_BUnderL7,370000,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Updown_P13_BUnderL")] [ConfigProAttribute("Updown_P13_BUnderL7")]
public int Updown_P13_BUnderL { get; set; } 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> /// <summary>
/// PRO,0,取料升降轴_P1速度,Updown_P1_Speed,108,,,,,,,,,,,, /// PRO,0,取料升降轴_P1速度,Updown_P1_Speed,108,,,,,,,,,,,,
/// </summary> /// </summary>
...@@ -265,6 +286,26 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -265,6 +286,26 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Updown_P13_Speed")] [ConfigProAttribute("Updown_P13_Speed")]
public int Updown_P13_Speed { get; set; } public int Updown_P13_Speed { get; set; }
/// <summary> /// <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,,,,,,,,,,,, /// PRO,0,取料升降轴_待机点,Middle_P1,100,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Middle_P1")] [ConfigProAttribute("Middle_P1")]
...@@ -373,16 +414,31 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -373,16 +414,31 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("Inout_P1", false)] [ConfigProAttribute("Inout_P1", false)]
public int Inout_P1 { get; set; } public int Inout_P1 { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料进出轴_取料点,Inout_P2,126912,,,,,,,,,,,, /// PRO,0,取料进出轴_A缓存区点,Inout_P2,126912,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Inout_P2", false)] [ConfigProAttribute("Inout_P2", false)]
public int Inout_P2 { get; set; } public int Inout_P2 { get; set; }
/// <summary> /// <summary>
/// PRO,0,取料进出轴_拍照点,Inout_P3,126912,,,,,,,,,,,, /// PRO,0,取料进出轴_B缓存区点,Inout_P3,126912,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Inout_P3", false)] [ConfigProAttribute("Inout_P3", false)]
public int Inout_P3 { get; set; } public int Inout_P3 { get; set; }
/// <summary> /// <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,,,,,,,,,,,, /// PRO,0,取料进出轴_P1速度,Inout_P1_Speed,100000,,,,,,,,,,,,
/// </summary> /// </summary>
[ConfigProAttribute("Inout_P1_Speed", false)] [ConfigProAttribute("Inout_P1_Speed", false)]
...@@ -397,6 +453,21 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -397,6 +453,21 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("Inout_P3_Speed", false)] [ConfigProAttribute("Inout_P3_Speed", false)]
public int Inout_P3_Speed { get; set; } 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; private List<string> CameraList = null;
......
...@@ -71,6 +71,8 @@ ...@@ -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="AShelfInfo" value="{&quot;ShelfRfid&quot;:&quot;000&quot;,&quot;ShelfState&quot;:2,&quot;XuniRfid&quot;:&quot;&quot;}"/>
<add key="UseSecurityAccess" value="1"/> <add key="UseSecurityAccess" value="1"/>
<add key="UseBuzzer" value="0"/> <add key="UseBuzzer" value="0"/>
<!--料盘厚度对应的偏移量-->
<add key="ReelHeightOffset" value="12=0#16=100#24=200#32=300"/>
</appSettings> </appSettings>
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
...@@ -32,6 +32,12 @@ ...@@ -32,6 +32,12 @@
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.tabControl2 = new System.Windows.Forms.TabControl(); this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage4 = new System.Windows.Forms.TabPage(); this.tabPage4 = new System.Windows.Forms.TabPage();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.txtPullAxis_Inout_P1 = new System.Windows.Forms.TextBox();
this.btnPullAxis_Inout_P1 = new System.Windows.Forms.Button();
this.groupBox28 = new System.Windows.Forms.GroupBox();
this.btnUpdown_P1 = new System.Windows.Forms.Button();
this.txtUpdown_P1 = new System.Windows.Forms.TextBox();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.txtMoveAxis_P2 = new System.Windows.Forms.TextBox(); this.txtMoveAxis_P2 = new System.Windows.Forms.TextBox();
this.txtMoveAxis_P1 = new System.Windows.Forms.TextBox(); this.txtMoveAxis_P1 = new System.Windows.Forms.TextBox();
...@@ -40,28 +46,6 @@ ...@@ -40,28 +46,6 @@
this.groupBox5 = new System.Windows.Forms.GroupBox(); this.groupBox5 = new System.Windows.Forms.GroupBox();
this.btnPullAxis_Updown_P1 = new System.Windows.Forms.Button(); this.btnPullAxis_Updown_P1 = new System.Windows.Forms.Button();
this.txtPullAxis_Updown_P1 = new System.Windows.Forms.TextBox(); this.txtPullAxis_Updown_P1 = new System.Windows.Forms.TextBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.txtPullAxis_Inout_P1 = new System.Windows.Forms.TextBox();
this.btnPullAxis_Inout_P1 = new System.Windows.Forms.Button();
this.txtUpdown_P11 = new System.Windows.Forms.TextBox();
this.txtUpdown_P10 = new System.Windows.Forms.TextBox();
this.txtUpdown_P9 = new System.Windows.Forms.TextBox();
this.txtUpdown_P8 = new System.Windows.Forms.TextBox();
this.txtUpdown_P5 = new System.Windows.Forms.TextBox();
this.txtUpdown_P4 = new System.Windows.Forms.TextBox();
this.txtUpdown_P3 = new System.Windows.Forms.TextBox();
this.txtUpdown_P2 = new System.Windows.Forms.TextBox();
this.txtUpdown_P1 = new System.Windows.Forms.TextBox();
this.btnUpdown_P9 = new System.Windows.Forms.Button();
this.btnUpdown_P4 = new System.Windows.Forms.Button();
this.btnUpdown_P3 = new System.Windows.Forms.Button();
this.btnUpdown_P1 = new System.Windows.Forms.Button();
this.btnUpdown_P11 = new System.Windows.Forms.Button();
this.btnUpdown_P10 = new System.Windows.Forms.Button();
this.btnUpdown_P8 = new System.Windows.Forms.Button();
this.btnUpdown_P5 = new System.Windows.Forms.Button();
this.btnUpdown_P2 = new System.Windows.Forms.Button();
this.tabPage5 = new System.Windows.Forms.TabPage(); this.tabPage5 = new System.Windows.Forms.TabPage();
this.groupBox26 = new System.Windows.Forms.GroupBox(); this.groupBox26 = new System.Windows.Forms.GroupBox();
this.txtPullAxis_Inout_CamA = new System.Windows.Forms.TextBox(); this.txtPullAxis_Inout_CamA = new System.Windows.Forms.TextBox();
...@@ -104,11 +88,9 @@ ...@@ -104,11 +88,9 @@
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.btnSavePoints = new System.Windows.Forms.Button(); this.btnSavePoints = new System.Windows.Forms.Button();
this.groupBox13 = new System.Windows.Forms.GroupBox(); this.groupBox13 = new System.Windows.Forms.GroupBox();
this.groupBox24 = new System.Windows.Forms.GroupBox(); this.groupBox15 = new System.Windows.Forms.GroupBox();
this.txtComAxis_AB_P3 = new System.Windows.Forms.TextBox(); this.txtMoveAxis_P3 = new System.Windows.Forms.TextBox();
this.btnComAxis_AB_P3 = new System.Windows.Forms.Button(); this.btnMoveAxis_P3 = new System.Windows.Forms.Button();
this.txtComAxis_AB_P2 = new System.Windows.Forms.TextBox();
this.btnComAxis_AB_P2 = new System.Windows.Forms.Button();
this.groupBox17 = new System.Windows.Forms.GroupBox(); this.groupBox17 = new System.Windows.Forms.GroupBox();
this.btnPullAxis_Updown_P2 = new System.Windows.Forms.Button(); this.btnPullAxis_Updown_P2 = new System.Windows.Forms.Button();
this.txtPullAxis_Updown_P2 = new System.Windows.Forms.TextBox(); this.txtPullAxis_Updown_P2 = new System.Windows.Forms.TextBox();
...@@ -116,25 +98,48 @@ ...@@ -116,25 +98,48 @@
this.btnPullAxis_Updown_P3 = new System.Windows.Forms.Button(); this.btnPullAxis_Updown_P3 = new System.Windows.Forms.Button();
this.txtPullAxis_Updown_P4 = new System.Windows.Forms.TextBox(); this.txtPullAxis_Updown_P4 = new System.Windows.Forms.TextBox();
this.txtPullAxis_Updown_P3 = new System.Windows.Forms.TextBox(); this.txtPullAxis_Updown_P3 = new System.Windows.Forms.TextBox();
this.groupBox16 = new System.Windows.Forms.GroupBox();
this.txtPullAxis_Inout_P3_P5 = new System.Windows.Forms.TextBox();
this.btnPullAxis_Inout_P3_P5 = new System.Windows.Forms.Button();
this.txtPullAxis_Inout_P2_P4 = new System.Windows.Forms.TextBox();
this.btnPullAxis_Inout_P2_P4 = new System.Windows.Forms.Button();
this.groupBox19 = new System.Windows.Forms.GroupBox();
this.txtXAxis_AB_P3 = new System.Windows.Forms.TextBox();
this.btnXAxis_AB_P3 = new System.Windows.Forms.Button();
this.groupBox14 = new System.Windows.Forms.GroupBox(); this.groupBox14 = new System.Windows.Forms.GroupBox();
this.txtUpdown_P7_P13 = new System.Windows.Forms.TextBox(); this.txtUpdown_P7_P13 = new System.Windows.Forms.TextBox();
this.txtUpdown_P6_P12 = new System.Windows.Forms.TextBox(); this.txtUpdown_P6_P12 = new System.Windows.Forms.TextBox();
this.btnUpdown_P6_P12 = new System.Windows.Forms.Button(); this.btnUpdown_P6_P12 = new System.Windows.Forms.Button();
this.btnUpdown_P7_P13 = new System.Windows.Forms.Button(); this.btnUpdown_P7_P13 = new System.Windows.Forms.Button();
this.groupBox15 = new System.Windows.Forms.GroupBox();
this.txtMoveAxis_P3 = new System.Windows.Forms.TextBox();
this.btnMoveAxis_P3 = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.tabControl3 = new System.Windows.Forms.TabControl();
this.tabPage8 = new System.Windows.Forms.TabPage();
this.tabPage9 = new System.Windows.Forms.TabPage();
this.groupBox24 = new System.Windows.Forms.GroupBox();
this.txtComAxis_AB_P3 = new System.Windows.Forms.TextBox();
this.btnComAxis_AB_P3 = new System.Windows.Forms.Button();
this.txtComAxis_AB_P2 = new System.Windows.Forms.TextBox();
this.btnComAxis_AB_P2 = new System.Windows.Forms.Button();
this.groupBox19 = new System.Windows.Forms.GroupBox();
this.txtXAxis_AB_P3 = new System.Windows.Forms.TextBox();
this.btnXAxis_AB_P3 = new System.Windows.Forms.Button();
this.groupBox16 = new System.Windows.Forms.GroupBox();
this.txtPullAxis_Inout_P3_P5 = new System.Windows.Forms.TextBox();
this.btnPullAxis_Inout_P3_P5 = new System.Windows.Forms.Button();
this.txtPullAxis_Inout_P2_P4 = new System.Windows.Forms.TextBox();
this.btnPullAxis_Inout_P2_P4 = new System.Windows.Forms.Button();
this.tabPage10 = new System.Windows.Forms.TabPage();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.txtUpdown_P11 = new System.Windows.Forms.TextBox();
this.txtUpdown_P10 = new System.Windows.Forms.TextBox();
this.txtUpdown_P9 = new System.Windows.Forms.TextBox();
this.txtUpdown_P8 = new System.Windows.Forms.TextBox();
this.txtUpdown_P5 = new System.Windows.Forms.TextBox();
this.txtUpdown_P4 = new System.Windows.Forms.TextBox();
this.txtUpdown_P3 = new System.Windows.Forms.TextBox();
this.txtUpdown_P2 = new System.Windows.Forms.TextBox();
this.btnUpdown_P9 = new System.Windows.Forms.Button();
this.btnUpdown_P4 = new System.Windows.Forms.Button();
this.btnUpdown_P3 = new System.Windows.Forms.Button();
this.btnUpdown_P11 = new System.Windows.Forms.Button();
this.btnUpdown_P10 = new System.Windows.Forms.Button();
this.btnUpdown_P8 = new System.Windows.Forms.Button();
this.btnUpdown_P5 = new System.Windows.Forms.Button();
this.btnUpdown_P2 = new System.Windows.Forms.Button();
this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox22 = new System.Windows.Forms.GroupBox(); this.groupBox22 = new System.Windows.Forms.GroupBox();
...@@ -200,10 +205,10 @@ ...@@ -200,10 +205,10 @@
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.tabControl2.SuspendLayout(); this.tabControl2.SuspendLayout();
this.tabPage4.SuspendLayout(); this.tabPage4.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupBox28.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.groupBox5.SuspendLayout(); this.groupBox5.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
this.tabPage5.SuspendLayout(); this.tabPage5.SuspendLayout();
this.groupBox26.SuspendLayout(); this.groupBox26.SuspendLayout();
this.groupBox7.SuspendLayout(); this.groupBox7.SuspendLayout();
...@@ -216,15 +221,20 @@ ...@@ -216,15 +221,20 @@
this.groupBox9.SuspendLayout(); this.groupBox9.SuspendLayout();
this.groupBox12.SuspendLayout(); this.groupBox12.SuspendLayout();
this.groupBox13.SuspendLayout(); this.groupBox13.SuspendLayout();
this.groupBox24.SuspendLayout(); this.groupBox15.SuspendLayout();
this.groupBox17.SuspendLayout(); this.groupBox17.SuspendLayout();
this.groupBox16.SuspendLayout();
this.groupBox19.SuspendLayout();
this.groupBox14.SuspendLayout(); this.groupBox14.SuspendLayout();
this.groupBox15.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.tabControl3.SuspendLayout();
this.tabPage8.SuspendLayout();
this.tabPage9.SuspendLayout();
this.groupBox24.SuspendLayout();
this.groupBox19.SuspendLayout();
this.groupBox16.SuspendLayout();
this.tabPage10.SuspendLayout();
this.groupBox4.SuspendLayout();
this.tabPage3.SuspendLayout(); this.tabPage3.SuspendLayout();
this.tableLayoutPanel3.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout();
this.groupBox22.SuspendLayout(); this.groupBox22.SuspendLayout();
...@@ -263,9 +273,10 @@ ...@@ -263,9 +273,10 @@
// //
// tabPage4 // tabPage4
// //
this.tabPage4.Controls.Add(this.groupBox3);
this.tabPage4.Controls.Add(this.groupBox28);
this.tabPage4.Controls.Add(this.groupBox2); this.tabPage4.Controls.Add(this.groupBox2);
this.tabPage4.Controls.Add(this.groupBox5); this.tabPage4.Controls.Add(this.groupBox5);
this.tabPage4.Controls.Add(this.groupBox4);
this.tabPage4.Location = new System.Drawing.Point(4, 26); this.tabPage4.Location = new System.Drawing.Point(4, 26);
this.tabPage4.Name = "tabPage4"; this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3); this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
...@@ -274,6 +285,64 @@ ...@@ -274,6 +285,64 @@
this.tabPage4.Text = "移栽"; this.tabPage4.Text = "移栽";
this.tabPage4.UseVisualStyleBackColor = true; this.tabPage4.UseVisualStyleBackColor = true;
// //
// groupBox3
//
this.groupBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.groupBox3.Controls.Add(this.txtPullAxis_Inout_P1);
this.groupBox3.Controls.Add(this.btnPullAxis_Inout_P1);
this.groupBox3.Location = new System.Drawing.Point(6, 101);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(310, 56);
this.groupBox3.TabIndex = 1;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "料斗拉取进出轴";
//
// txtPullAxis_Inout_P1
//
this.txtPullAxis_Inout_P1.Location = new System.Drawing.Point(142, 21);
this.txtPullAxis_Inout_P1.Name = "txtPullAxis_Inout_P1";
this.txtPullAxis_Inout_P1.Size = new System.Drawing.Size(134, 23);
this.txtPullAxis_Inout_P1.TabIndex = 6;
//
// btnPullAxis_Inout_P1
//
this.btnPullAxis_Inout_P1.Location = new System.Drawing.Point(4, 17);
this.btnPullAxis_Inout_P1.Name = "btnPullAxis_Inout_P1";
this.btnPullAxis_Inout_P1.Size = new System.Drawing.Size(132, 32);
this.btnPullAxis_Inout_P1.TabIndex = 1;
this.btnPullAxis_Inout_P1.Text = "待机点P1";
this.btnPullAxis_Inout_P1.UseVisualStyleBackColor = true;
this.btnPullAxis_Inout_P1.Click += new System.EventHandler(this.btnPullAxis_Inout_P1_Click);
//
// groupBox28
//
this.groupBox28.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.groupBox28.Controls.Add(this.btnUpdown_P1);
this.groupBox28.Controls.Add(this.txtUpdown_P1);
this.groupBox28.Location = new System.Drawing.Point(6, 16);
this.groupBox28.Name = "groupBox28";
this.groupBox28.Size = new System.Drawing.Size(310, 67);
this.groupBox28.TabIndex = 17;
this.groupBox28.TabStop = false;
this.groupBox28.Text = "移栽升降轴";
//
// btnUpdown_P1
//
this.btnUpdown_P1.Location = new System.Drawing.Point(6, 21);
this.btnUpdown_P1.Name = "btnUpdown_P1";
this.btnUpdown_P1.Size = new System.Drawing.Size(146, 32);
this.btnUpdown_P1.TabIndex = 15;
this.btnUpdown_P1.Text = "待机点P1";
this.btnUpdown_P1.UseVisualStyleBackColor = true;
this.btnUpdown_P1.Click += new System.EventHandler(this.btnUpdown_P1_Click);
//
// txtUpdown_P1
//
this.txtUpdown_P1.Location = new System.Drawing.Point(158, 26);
this.txtUpdown_P1.Name = "txtUpdown_P1";
this.txtUpdown_P1.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P1.TabIndex = 16;
//
// groupBox2 // groupBox2
// //
this.groupBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); this.groupBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
...@@ -281,7 +350,7 @@ ...@@ -281,7 +350,7 @@
this.groupBox2.Controls.Add(this.txtMoveAxis_P1); this.groupBox2.Controls.Add(this.txtMoveAxis_P1);
this.groupBox2.Controls.Add(this.btnMoveAxis_P2); this.groupBox2.Controls.Add(this.btnMoveAxis_P2);
this.groupBox2.Controls.Add(this.btnMoveAxis_P1); this.groupBox2.Controls.Add(this.btnMoveAxis_P1);
this.groupBox2.Location = new System.Drawing.Point(619, 6); this.groupBox2.Location = new System.Drawing.Point(331, 16);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(298, 100); this.groupBox2.Size = new System.Drawing.Size(298, 100);
this.groupBox2.TabIndex = 0; this.groupBox2.TabIndex = 0;
...@@ -327,7 +396,7 @@ ...@@ -327,7 +396,7 @@
this.groupBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.groupBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.groupBox5.Controls.Add(this.btnPullAxis_Updown_P1); this.groupBox5.Controls.Add(this.btnPullAxis_Updown_P1);
this.groupBox5.Controls.Add(this.txtPullAxis_Updown_P1); this.groupBox5.Controls.Add(this.txtPullAxis_Updown_P1);
this.groupBox5.Location = new System.Drawing.Point(623, 112); this.groupBox5.Location = new System.Drawing.Point(646, 18);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(294, 87); this.groupBox5.Size = new System.Drawing.Size(294, 87);
this.groupBox5.TabIndex = 3; this.groupBox5.TabIndex = 3;
...@@ -351,298 +420,87 @@ ...@@ -351,298 +420,87 @@
this.txtPullAxis_Updown_P1.Size = new System.Drawing.Size(134, 23); this.txtPullAxis_Updown_P1.Size = new System.Drawing.Size(134, 23);
this.txtPullAxis_Updown_P1.TabIndex = 9; this.txtPullAxis_Updown_P1.TabIndex = 9;
// //
// groupBox4 // tabPage5
//
this.groupBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.groupBox4.Controls.Add(this.groupBox3);
this.groupBox4.Controls.Add(this.txtUpdown_P11);
this.groupBox4.Controls.Add(this.txtUpdown_P10);
this.groupBox4.Controls.Add(this.txtUpdown_P9);
this.groupBox4.Controls.Add(this.txtUpdown_P8);
this.groupBox4.Controls.Add(this.txtUpdown_P5);
this.groupBox4.Controls.Add(this.txtUpdown_P4);
this.groupBox4.Controls.Add(this.txtUpdown_P3);
this.groupBox4.Controls.Add(this.txtUpdown_P2);
this.groupBox4.Controls.Add(this.txtUpdown_P1);
this.groupBox4.Controls.Add(this.btnUpdown_P9);
this.groupBox4.Controls.Add(this.btnUpdown_P4);
this.groupBox4.Controls.Add(this.btnUpdown_P3);
this.groupBox4.Controls.Add(this.btnUpdown_P1);
this.groupBox4.Controls.Add(this.btnUpdown_P11);
this.groupBox4.Controls.Add(this.btnUpdown_P10);
this.groupBox4.Controls.Add(this.btnUpdown_P8);
this.groupBox4.Controls.Add(this.btnUpdown_P5);
this.groupBox4.Controls.Add(this.btnUpdown_P2);
this.groupBox4.Location = new System.Drawing.Point(3, 4);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(610, 209);
this.groupBox4.TabIndex = 2;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "移栽升降轴";
// //
// groupBox3 this.tabPage5.Controls.Add(this.groupBox26);
this.tabPage5.Controls.Add(this.groupBox7);
this.tabPage5.Controls.Add(this.groupBox8);
this.tabPage5.Controls.Add(this.groupBox6);
this.tabPage5.Location = new System.Drawing.Point(4, 26);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(1637, 350);
this.tabPage5.TabIndex = 1;
this.tabPage5.Text = "A面移栽";
this.tabPage5.UseVisualStyleBackColor = true;
// //
this.groupBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); // groupBox26
this.groupBox3.Controls.Add(this.txtPullAxis_Inout_P1);
this.groupBox3.Controls.Add(this.btnPullAxis_Inout_P1);
this.groupBox3.Location = new System.Drawing.Point(316, 2);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(294, 56);
this.groupBox3.TabIndex = 1;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "料斗拉取进出轴";
// //
// txtPullAxis_Inout_P1 this.groupBox26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.groupBox26.Controls.Add(this.txtPullAxis_Inout_CamA);
this.groupBox26.Controls.Add(this.btnInOutAxis_A_Cam);
this.groupBox26.Location = new System.Drawing.Point(688, 15);
this.groupBox26.Name = "groupBox26";
this.groupBox26.Size = new System.Drawing.Size(294, 56);
this.groupBox26.TabIndex = 7;
this.groupBox26.TabStop = false;
this.groupBox26.Text = "料斗拉取进出轴";
// //
this.txtPullAxis_Inout_P1.Location = new System.Drawing.Point(142, 21); // txtPullAxis_Inout_CamA
this.txtPullAxis_Inout_P1.Name = "txtPullAxis_Inout_P1";
this.txtPullAxis_Inout_P1.Size = new System.Drawing.Size(134, 23);
this.txtPullAxis_Inout_P1.TabIndex = 6;
// //
// btnPullAxis_Inout_P1 this.txtPullAxis_Inout_CamA.Location = new System.Drawing.Point(142, 21);
this.txtPullAxis_Inout_CamA.Name = "txtPullAxis_Inout_CamA";
this.txtPullAxis_Inout_CamA.Size = new System.Drawing.Size(134, 23);
this.txtPullAxis_Inout_CamA.TabIndex = 6;
// //
this.btnPullAxis_Inout_P1.Location = new System.Drawing.Point(4, 17); // btnInOutAxis_A_Cam
this.btnPullAxis_Inout_P1.Name = "btnPullAxis_Inout_P1";
this.btnPullAxis_Inout_P1.Size = new System.Drawing.Size(132, 32);
this.btnPullAxis_Inout_P1.TabIndex = 1;
this.btnPullAxis_Inout_P1.Text = "待机点P1";
this.btnPullAxis_Inout_P1.UseVisualStyleBackColor = true;
this.btnPullAxis_Inout_P1.Click += new System.EventHandler(this.btnPullAxis_Inout_P1_Click);
// //
// txtUpdown_P11 this.btnInOutAxis_A_Cam.Location = new System.Drawing.Point(4, 17);
this.btnInOutAxis_A_Cam.Name = "btnInOutAxis_A_Cam";
this.btnInOutAxis_A_Cam.Size = new System.Drawing.Size(132, 32);
this.btnInOutAxis_A_Cam.TabIndex = 1;
this.btnInOutAxis_A_Cam.Text = "A面拉钩安全点";
this.btnInOutAxis_A_Cam.UseVisualStyleBackColor = true;
this.btnInOutAxis_A_Cam.Click += new System.EventHandler(this.btnInOutAxis_A_Cam_Click);
// //
this.txtUpdown_P11.Location = new System.Drawing.Point(462, 172); // groupBox7
this.txtUpdown_P11.Name = "txtUpdown_P11";
this.txtUpdown_P11.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P11.TabIndex = 22;
// //
// txtUpdown_P10 this.groupBox7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
this.groupBox7.Controls.Add(this.txtMiddleAxis_A_P3);
this.groupBox7.Controls.Add(this.txtMiddleAxis_A_P2);
this.groupBox7.Controls.Add(this.txtMiddleAxis_A_P1);
this.groupBox7.Controls.Add(this.btnMiddleAxis_A_P1);
this.groupBox7.Controls.Add(this.btnMiddleAxis_A_P3);
this.groupBox7.Controls.Add(this.btnMiddleAxis_A_P2);
this.groupBox7.Location = new System.Drawing.Point(347, 15);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(335, 132);
this.groupBox7.TabIndex = 5;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "A面移栽旋转轴";
// //
this.txtUpdown_P10.Location = new System.Drawing.Point(462, 136); // txtMiddleAxis_A_P3
this.txtUpdown_P10.Name = "txtUpdown_P10";
this.txtUpdown_P10.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P10.TabIndex = 21;
// //
// txtUpdown_P9 this.txtMiddleAxis_A_P3.Location = new System.Drawing.Point(195, 93);
this.txtMiddleAxis_A_P3.Name = "txtMiddleAxis_A_P3";
this.txtMiddleAxis_A_P3.Size = new System.Drawing.Size(134, 23);
this.txtMiddleAxis_A_P3.TabIndex = 28;
// //
this.txtUpdown_P9.Location = new System.Drawing.Point(462, 100); // txtMiddleAxis_A_P2
this.txtUpdown_P9.Name = "txtUpdown_P9";
this.txtUpdown_P9.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P9.TabIndex = 20;
// //
// txtUpdown_P8 this.txtMiddleAxis_A_P2.Location = new System.Drawing.Point(195, 57);
this.txtMiddleAxis_A_P2.Name = "txtMiddleAxis_A_P2";
this.txtMiddleAxis_A_P2.Size = new System.Drawing.Size(134, 23);
this.txtMiddleAxis_A_P2.TabIndex = 27;
// //
this.txtUpdown_P8.Location = new System.Drawing.Point(462, 64); // txtMiddleAxis_A_P1
this.txtUpdown_P8.Name = "txtUpdown_P8";
this.txtUpdown_P8.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P8.TabIndex = 19;
// //
// txtUpdown_P5 this.txtMiddleAxis_A_P1.Location = new System.Drawing.Point(195, 21);
this.txtMiddleAxis_A_P1.Name = "txtMiddleAxis_A_P1";
this.txtMiddleAxis_A_P1.Size = new System.Drawing.Size(134, 23);
this.txtMiddleAxis_A_P1.TabIndex = 26;
// //
this.txtUpdown_P5.Location = new System.Drawing.Point(154, 172); // btnMiddleAxis_A_P1
this.txtUpdown_P5.Name = "txtUpdown_P5";
this.txtUpdown_P5.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P5.TabIndex = 18;
//
// txtUpdown_P4
//
this.txtUpdown_P4.Location = new System.Drawing.Point(154, 136);
this.txtUpdown_P4.Name = "txtUpdown_P4";
this.txtUpdown_P4.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P4.TabIndex = 17;
//
// txtUpdown_P3
//
this.txtUpdown_P3.Location = new System.Drawing.Point(154, 100);
this.txtUpdown_P3.Name = "txtUpdown_P3";
this.txtUpdown_P3.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P3.TabIndex = 16;
//
// txtUpdown_P2
//
this.txtUpdown_P2.Location = new System.Drawing.Point(154, 64);
this.txtUpdown_P2.Name = "txtUpdown_P2";
this.txtUpdown_P2.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P2.TabIndex = 15;
//
// txtUpdown_P1
//
this.txtUpdown_P1.Location = new System.Drawing.Point(154, 28);
this.txtUpdown_P1.Name = "txtUpdown_P1";
this.txtUpdown_P1.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P1.TabIndex = 14;
//
// btnUpdown_P9
//
this.btnUpdown_P9.Location = new System.Drawing.Point(310, 95);
this.btnUpdown_P9.Name = "btnUpdown_P9";
this.btnUpdown_P9.Size = new System.Drawing.Size(146, 32);
this.btnUpdown_P9.TabIndex = 13;
this.btnUpdown_P9.Text = "B上暂存区取料低点P9";
this.btnUpdown_P9.UseVisualStyleBackColor = true;
this.btnUpdown_P9.Click += new System.EventHandler(this.btnUpdown_P9_Click);
//
// btnUpdown_P4
//
this.btnUpdown_P4.Location = new System.Drawing.Point(2, 131);
this.btnUpdown_P4.Name = "btnUpdown_P4";
this.btnUpdown_P4.Size = new System.Drawing.Size(146, 32);
this.btnUpdown_P4.TabIndex = 12;
this.btnUpdown_P4.Text = "A下暂存区放料高点P4";
this.btnUpdown_P4.UseVisualStyleBackColor = true;
this.btnUpdown_P4.Click += new System.EventHandler(this.btnUpdown_P4_Click);
//
// btnUpdown_P3
//
this.btnUpdown_P3.Location = new System.Drawing.Point(2, 95);
this.btnUpdown_P3.Name = "btnUpdown_P3";
this.btnUpdown_P3.Size = new System.Drawing.Size(146, 32);
this.btnUpdown_P3.TabIndex = 11;
this.btnUpdown_P3.Text = "A上暂存区取料低点P3";
this.btnUpdown_P3.UseVisualStyleBackColor = true;
this.btnUpdown_P3.Click += new System.EventHandler(this.btnUpdown_P3_Click);
//
// btnUpdown_P1
//
this.btnUpdown_P1.Location = new System.Drawing.Point(2, 23);
this.btnUpdown_P1.Name = "btnUpdown_P1";
this.btnUpdown_P1.Size = new System.Drawing.Size(146, 32);
this.btnUpdown_P1.TabIndex = 10;
this.btnUpdown_P1.Text = "待机点P1";
this.btnUpdown_P1.UseVisualStyleBackColor = true;
this.btnUpdown_P1.Click += new System.EventHandler(this.btnUpdown_P1_Click);
//
// btnUpdown_P11
//
this.btnUpdown_P11.Location = new System.Drawing.Point(310, 167);
this.btnUpdown_P11.Name = "btnUpdown_P11";
this.btnUpdown_P11.Size = new System.Drawing.Size(146, 32);
this.btnUpdown_P11.TabIndex = 6;
this.btnUpdown_P11.Text = "B下暂存区取料低点P11";
this.btnUpdown_P11.UseVisualStyleBackColor = true;
this.btnUpdown_P11.Click += new System.EventHandler(this.btnUpdown_P11_Click);
//
// btnUpdown_P10
//
this.btnUpdown_P10.Location = new System.Drawing.Point(310, 131);
this.btnUpdown_P10.Name = "btnUpdown_P10";
this.btnUpdown_P10.Size = new System.Drawing.Size(146, 32);
this.btnUpdown_P10.TabIndex = 5;
this.btnUpdown_P10.Text = "B下暂存区取料高点P10";
this.btnUpdown_P10.UseVisualStyleBackColor = true;
this.btnUpdown_P10.Click += new System.EventHandler(this.btnUpdown_P10_Click);
//
// btnUpdown_P8
//
this.btnUpdown_P8.Location = new System.Drawing.Point(310, 59);
this.btnUpdown_P8.Name = "btnUpdown_P8";
this.btnUpdown_P8.Size = new System.Drawing.Size(146, 32);
this.btnUpdown_P8.TabIndex = 4;
this.btnUpdown_P8.Text = "B上暂存区取料高点P8";
this.btnUpdown_P8.UseVisualStyleBackColor = true;
this.btnUpdown_P8.Click += new System.EventHandler(this.btnUpdown_P8_Click);
//
// btnUpdown_P5
//
this.btnUpdown_P5.Location = new System.Drawing.Point(2, 167);
this.btnUpdown_P5.Name = "btnUpdown_P5";
this.btnUpdown_P5.Size = new System.Drawing.Size(146, 32);
this.btnUpdown_P5.TabIndex = 3;
this.btnUpdown_P5.Text = "A下暂存区放料低点P5";
this.btnUpdown_P5.UseVisualStyleBackColor = true;
this.btnUpdown_P5.Click += new System.EventHandler(this.btnUpdown_P5_Click);
//
// btnUpdown_P2
//
this.btnUpdown_P2.Location = new System.Drawing.Point(2, 59);
this.btnUpdown_P2.Name = "btnUpdown_P2";
this.btnUpdown_P2.Size = new System.Drawing.Size(146, 32);
this.btnUpdown_P2.TabIndex = 2;
this.btnUpdown_P2.Text = "A上暂存区取料高点P2";
this.btnUpdown_P2.UseVisualStyleBackColor = true;
this.btnUpdown_P2.Click += new System.EventHandler(this.btnUpdown_P2_Click);
//
// tabPage5
//
this.tabPage5.Controls.Add(this.groupBox26);
this.tabPage5.Controls.Add(this.groupBox7);
this.tabPage5.Controls.Add(this.groupBox8);
this.tabPage5.Controls.Add(this.groupBox6);
this.tabPage5.Location = new System.Drawing.Point(4, 26);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(1637, 352);
this.tabPage5.TabIndex = 1;
this.tabPage5.Text = "A面移栽";
this.tabPage5.UseVisualStyleBackColor = true;
//
// groupBox26
//
this.groupBox26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.groupBox26.Controls.Add(this.txtPullAxis_Inout_CamA);
this.groupBox26.Controls.Add(this.btnInOutAxis_A_Cam);
this.groupBox26.Location = new System.Drawing.Point(688, 15);
this.groupBox26.Name = "groupBox26";
this.groupBox26.Size = new System.Drawing.Size(294, 56);
this.groupBox26.TabIndex = 7;
this.groupBox26.TabStop = false;
this.groupBox26.Text = "料斗拉取进出轴";
//
// txtPullAxis_Inout_CamA
//
this.txtPullAxis_Inout_CamA.Location = new System.Drawing.Point(142, 21);
this.txtPullAxis_Inout_CamA.Name = "txtPullAxis_Inout_CamA";
this.txtPullAxis_Inout_CamA.Size = new System.Drawing.Size(134, 23);
this.txtPullAxis_Inout_CamA.TabIndex = 6;
//
// btnInOutAxis_A_Cam
//
this.btnInOutAxis_A_Cam.Location = new System.Drawing.Point(4, 17);
this.btnInOutAxis_A_Cam.Name = "btnInOutAxis_A_Cam";
this.btnInOutAxis_A_Cam.Size = new System.Drawing.Size(132, 32);
this.btnInOutAxis_A_Cam.TabIndex = 1;
this.btnInOutAxis_A_Cam.Text = "A面相机拍照点";
this.btnInOutAxis_A_Cam.UseVisualStyleBackColor = true;
this.btnInOutAxis_A_Cam.Click += new System.EventHandler(this.btnInOutAxis_A_Cam_Click);
//
// groupBox7
//
this.groupBox7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
this.groupBox7.Controls.Add(this.txtMiddleAxis_A_P3);
this.groupBox7.Controls.Add(this.txtMiddleAxis_A_P2);
this.groupBox7.Controls.Add(this.txtMiddleAxis_A_P1);
this.groupBox7.Controls.Add(this.btnMiddleAxis_A_P1);
this.groupBox7.Controls.Add(this.btnMiddleAxis_A_P3);
this.groupBox7.Controls.Add(this.btnMiddleAxis_A_P2);
this.groupBox7.Location = new System.Drawing.Point(347, 15);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(335, 132);
this.groupBox7.TabIndex = 5;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "A面移栽旋转轴";
//
// txtMiddleAxis_A_P3
//
this.txtMiddleAxis_A_P3.Location = new System.Drawing.Point(195, 93);
this.txtMiddleAxis_A_P3.Name = "txtMiddleAxis_A_P3";
this.txtMiddleAxis_A_P3.Size = new System.Drawing.Size(134, 23);
this.txtMiddleAxis_A_P3.TabIndex = 28;
//
// txtMiddleAxis_A_P2
//
this.txtMiddleAxis_A_P2.Location = new System.Drawing.Point(195, 57);
this.txtMiddleAxis_A_P2.Name = "txtMiddleAxis_A_P2";
this.txtMiddleAxis_A_P2.Size = new System.Drawing.Size(134, 23);
this.txtMiddleAxis_A_P2.TabIndex = 27;
//
// txtMiddleAxis_A_P1
//
this.txtMiddleAxis_A_P1.Location = new System.Drawing.Point(195, 21);
this.txtMiddleAxis_A_P1.Name = "txtMiddleAxis_A_P1";
this.txtMiddleAxis_A_P1.Size = new System.Drawing.Size(134, 23);
this.txtMiddleAxis_A_P1.TabIndex = 26;
//
// btnMiddleAxis_A_P1
// //
this.btnMiddleAxis_A_P1.Location = new System.Drawing.Point(6, 16); this.btnMiddleAxis_A_P1.Location = new System.Drawing.Point(6, 16);
this.btnMiddleAxis_A_P1.Name = "btnMiddleAxis_A_P1"; this.btnMiddleAxis_A_P1.Name = "btnMiddleAxis_A_P1";
...@@ -758,7 +616,7 @@ ...@@ -758,7 +616,7 @@
this.tabPage6.Location = new System.Drawing.Point(4, 26); this.tabPage6.Location = new System.Drawing.Point(4, 26);
this.tabPage6.Name = "tabPage6"; this.tabPage6.Name = "tabPage6";
this.tabPage6.Padding = new System.Windows.Forms.Padding(3); this.tabPage6.Padding = new System.Windows.Forms.Padding(3);
this.tabPage6.Size = new System.Drawing.Size(1637, 352); this.tabPage6.Size = new System.Drawing.Size(1637, 350);
this.tabPage6.TabIndex = 2; this.tabPage6.TabIndex = 2;
this.tabPage6.Text = "B面移栽"; this.tabPage6.Text = "B面移栽";
this.tabPage6.UseVisualStyleBackColor = true; this.tabPage6.UseVisualStyleBackColor = true;
...@@ -788,7 +646,7 @@ ...@@ -788,7 +646,7 @@
this.btnInOutAxis_B_Cam.Name = "btnInOutAxis_B_Cam"; this.btnInOutAxis_B_Cam.Name = "btnInOutAxis_B_Cam";
this.btnInOutAxis_B_Cam.Size = new System.Drawing.Size(132, 32); this.btnInOutAxis_B_Cam.Size = new System.Drawing.Size(132, 32);
this.btnInOutAxis_B_Cam.TabIndex = 1; this.btnInOutAxis_B_Cam.TabIndex = 1;
this.btnInOutAxis_B_Cam.Text = "B面相机拍照点"; this.btnInOutAxis_B_Cam.Text = "B面拉钩安全点";
this.btnInOutAxis_B_Cam.UseVisualStyleBackColor = true; this.btnInOutAxis_B_Cam.UseVisualStyleBackColor = true;
this.btnInOutAxis_B_Cam.Click += new System.EventHandler(this.btnInOutAxis_B_Cam_Click); this.btnInOutAxis_B_Cam.Click += new System.EventHandler(this.btnInOutAxis_B_Cam_Click);
// //
...@@ -969,67 +827,45 @@ ...@@ -969,67 +827,45 @@
// //
// groupBox13 // groupBox13
// //
this.groupBox13.Controls.Add(this.groupBox24); this.groupBox13.Controls.Add(this.groupBox15);
this.groupBox13.Controls.Add(this.groupBox17); this.groupBox13.Controls.Add(this.groupBox17);
this.groupBox13.Controls.Add(this.groupBox16);
this.groupBox13.Controls.Add(this.groupBox19);
this.groupBox13.Controls.Add(this.groupBox14); this.groupBox13.Controls.Add(this.groupBox14);
this.groupBox13.Controls.Add(this.groupBox15);
this.groupBox13.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox13.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox13.Location = new System.Drawing.Point(3, 3); this.groupBox13.Location = new System.Drawing.Point(3, 3);
this.groupBox13.Name = "groupBox13"; this.groupBox13.Name = "groupBox13";
this.groupBox13.Size = new System.Drawing.Size(984, 263); this.groupBox13.Size = new System.Drawing.Size(970, 227);
this.groupBox13.TabIndex = 2; this.groupBox13.TabIndex = 2;
this.groupBox13.TabStop = false; this.groupBox13.TabStop = false;
this.groupBox13.Text = "库位位置信息"; this.groupBox13.Text = "库位位置信息";
// //
// groupBox24 // groupBox15
//
this.groupBox24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128)))));
this.groupBox24.Controls.Add(this.txtComAxis_AB_P3);
this.groupBox24.Controls.Add(this.btnComAxis_AB_P3);
this.groupBox24.Controls.Add(this.txtComAxis_AB_P2);
this.groupBox24.Controls.Add(this.btnComAxis_AB_P2);
this.groupBox24.Location = new System.Drawing.Point(688, 22);
this.groupBox24.Name = "groupBox24";
this.groupBox24.Size = new System.Drawing.Size(292, 107);
this.groupBox24.TabIndex = 9;
this.groupBox24.TabStop = false;
this.groupBox24.Text = "A面移栽压紧轴";
//
// txtComAxis_AB_P3
//
this.txtComAxis_AB_P3.Location = new System.Drawing.Point(105, 74);
this.txtComAxis_AB_P3.Name = "txtComAxis_AB_P3";
this.txtComAxis_AB_P3.Size = new System.Drawing.Size(134, 23);
this.txtComAxis_AB_P3.TabIndex = 34;
//
// btnComAxis_AB_P3
// //
this.btnComAxis_AB_P3.Location = new System.Drawing.Point(6, 69); this.groupBox15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
this.btnComAxis_AB_P3.Name = "btnComAxis_AB_P3"; this.groupBox15.Controls.Add(this.txtMoveAxis_P3);
this.btnComAxis_AB_P3.Size = new System.Drawing.Size(93, 32); this.groupBox15.Controls.Add(this.btnMoveAxis_P3);
this.btnComAxis_AB_P3.TabIndex = 33; this.groupBox15.Location = new System.Drawing.Point(6, 144);
this.btnComAxis_AB_P3.Text = "压紧点P3"; this.groupBox15.Name = "groupBox15";
this.btnComAxis_AB_P3.UseVisualStyleBackColor = true; this.groupBox15.Size = new System.Drawing.Size(332, 66);
this.btnComAxis_AB_P3.Click += new System.EventHandler(this.btnComAxis_AB_P3_Click); this.groupBox15.TabIndex = 10;
this.groupBox15.TabStop = false;
this.groupBox15.Text = "行走机构";
// //
// txtComAxis_AB_P2 // txtMoveAxis_P3
// //
this.txtComAxis_AB_P2.Location = new System.Drawing.Point(105, 27); this.txtMoveAxis_P3.Location = new System.Drawing.Point(187, 27);
this.txtComAxis_AB_P2.Name = "txtComAxis_AB_P2"; this.txtMoveAxis_P3.Name = "txtMoveAxis_P3";
this.txtComAxis_AB_P2.Size = new System.Drawing.Size(134, 23); this.txtMoveAxis_P3.Size = new System.Drawing.Size(134, 23);
this.txtComAxis_AB_P2.TabIndex = 32; this.txtMoveAxis_P3.TabIndex = 3;
// //
// btnComAxis_AB_P2 // btnMoveAxis_P3
// //
this.btnComAxis_AB_P2.Location = new System.Drawing.Point(6, 22); this.btnMoveAxis_P3.Location = new System.Drawing.Point(6, 22);
this.btnComAxis_AB_P2.Name = "btnComAxis_AB_P2"; this.btnMoveAxis_P3.Name = "btnMoveAxis_P3";
this.btnComAxis_AB_P2.Size = new System.Drawing.Size(93, 32); this.btnMoveAxis_P3.Size = new System.Drawing.Size(152, 32);
this.btnComAxis_AB_P2.TabIndex = 31; this.btnMoveAxis_P3.TabIndex = 0;
this.btnComAxis_AB_P2.Text = "压紧前点P2"; this.btnMoveAxis_P3.Text = "料屉提取点";
this.btnComAxis_AB_P2.UseVisualStyleBackColor = true; this.btnMoveAxis_P3.UseVisualStyleBackColor = true;
this.btnComAxis_AB_P2.Click += new System.EventHandler(this.btnComAxis_AB_P2_Click); this.btnMoveAxis_P3.Click += new System.EventHandler(this.btnMoveAxis_P3_Click);
// //
// groupBox17 // groupBox17
// //
...@@ -1040,7 +876,7 @@ ...@@ -1040,7 +876,7 @@
this.groupBox17.Controls.Add(this.btnPullAxis_Updown_P3); this.groupBox17.Controls.Add(this.btnPullAxis_Updown_P3);
this.groupBox17.Controls.Add(this.txtPullAxis_Updown_P4); this.groupBox17.Controls.Add(this.txtPullAxis_Updown_P4);
this.groupBox17.Controls.Add(this.txtPullAxis_Updown_P3); this.groupBox17.Controls.Add(this.txtPullAxis_Updown_P3);
this.groupBox17.Location = new System.Drawing.Point(350, 135); this.groupBox17.Location = new System.Drawing.Point(362, 22);
this.groupBox17.Name = "groupBox17"; this.groupBox17.Name = "groupBox17";
this.groupBox17.Size = new System.Drawing.Size(520, 123); this.groupBox17.Size = new System.Drawing.Size(520, 123);
this.groupBox17.TabIndex = 3; this.groupBox17.TabIndex = 3;
...@@ -1098,6 +934,202 @@ ...@@ -1098,6 +934,202 @@
this.txtPullAxis_Updown_P3.Size = new System.Drawing.Size(134, 23); this.txtPullAxis_Updown_P3.Size = new System.Drawing.Size(134, 23);
this.txtPullAxis_Updown_P3.TabIndex = 9; this.txtPullAxis_Updown_P3.TabIndex = 9;
// //
// groupBox14
//
this.groupBox14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.groupBox14.Controls.Add(this.txtUpdown_P7_P13);
this.groupBox14.Controls.Add(this.txtUpdown_P6_P12);
this.groupBox14.Controls.Add(this.btnUpdown_P6_P12);
this.groupBox14.Controls.Add(this.btnUpdown_P7_P13);
this.groupBox14.Location = new System.Drawing.Point(6, 22);
this.groupBox14.Name = "groupBox14";
this.groupBox14.Size = new System.Drawing.Size(338, 107);
this.groupBox14.TabIndex = 2;
this.groupBox14.TabStop = false;
this.groupBox14.Text = "移栽升降轴";
//
// txtUpdown_P7_P13
//
this.txtUpdown_P7_P13.Location = new System.Drawing.Point(187, 66);
this.txtUpdown_P7_P13.Name = "txtUpdown_P7_P13";
this.txtUpdown_P7_P13.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P7_P13.TabIndex = 15;
//
// txtUpdown_P6_P12
//
this.txtUpdown_P6_P12.Location = new System.Drawing.Point(187, 28);
this.txtUpdown_P6_P12.Name = "txtUpdown_P6_P12";
this.txtUpdown_P6_P12.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P6_P12.TabIndex = 14;
//
// btnUpdown_P6_P12
//
this.btnUpdown_P6_P12.Location = new System.Drawing.Point(2, 23);
this.btnUpdown_P6_P12.Name = "btnUpdown_P6_P12";
this.btnUpdown_P6_P12.Size = new System.Drawing.Size(156, 32);
this.btnUpdown_P6_P12.TabIndex = 10;
this.btnUpdown_P6_P12.Text = "料屉上方过渡点";
this.btnUpdown_P6_P12.UseVisualStyleBackColor = true;
this.btnUpdown_P6_P12.Click += new System.EventHandler(this.btnUpdown_P6_P12_Click);
//
// btnUpdown_P7_P13
//
this.btnUpdown_P7_P13.Location = new System.Drawing.Point(2, 61);
this.btnUpdown_P7_P13.Name = "btnUpdown_P7_P13";
this.btnUpdown_P7_P13.Size = new System.Drawing.Size(156, 32);
this.btnUpdown_P7_P13.TabIndex = 2;
this.btnUpdown_P7_P13.Text = "料屉取放点";
this.btnUpdown_P7_P13.UseVisualStyleBackColor = true;
this.btnUpdown_P7_P13.Click += new System.EventHandler(this.btnUpdown_P7_P13_Click);
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage7);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(3, 419);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(998, 299);
this.tabControl1.TabIndex = 3;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(990, 269);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "公共位置信息";
this.tabPage1.UseVisualStyleBackColor = true;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.tabControl3);
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(990, 269);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "库位相关位置信息";
this.tabPage2.UseVisualStyleBackColor = true;
//
// tabControl3
//
this.tabControl3.Controls.Add(this.tabPage8);
this.tabControl3.Controls.Add(this.tabPage9);
this.tabControl3.Controls.Add(this.tabPage10);
this.tabControl3.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl3.Location = new System.Drawing.Point(3, 3);
this.tabControl3.Name = "tabControl3";
this.tabControl3.SelectedIndex = 0;
this.tabControl3.Size = new System.Drawing.Size(984, 263);
this.tabControl3.TabIndex = 3;
//
// tabPage8
//
this.tabPage8.Controls.Add(this.groupBox13);
this.tabPage8.Location = new System.Drawing.Point(4, 26);
this.tabPage8.Name = "tabPage8";
this.tabPage8.Padding = new System.Windows.Forms.Padding(3);
this.tabPage8.Size = new System.Drawing.Size(976, 233);
this.tabPage8.TabIndex = 0;
this.tabPage8.Text = "升降轴和行走机构";
this.tabPage8.UseVisualStyleBackColor = true;
//
// tabPage9
//
this.tabPage9.Controls.Add(this.groupBox24);
this.tabPage9.Controls.Add(this.groupBox19);
this.tabPage9.Controls.Add(this.groupBox16);
this.tabPage9.Location = new System.Drawing.Point(4, 26);
this.tabPage9.Name = "tabPage9";
this.tabPage9.Padding = new System.Windows.Forms.Padding(3);
this.tabPage9.Size = new System.Drawing.Size(976, 233);
this.tabPage9.TabIndex = 1;
this.tabPage9.Text = "进出、压紧、旋转轴";
this.tabPage9.UseVisualStyleBackColor = true;
//
// groupBox24
//
this.groupBox24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128)))));
this.groupBox24.Controls.Add(this.txtComAxis_AB_P3);
this.groupBox24.Controls.Add(this.btnComAxis_AB_P3);
this.groupBox24.Controls.Add(this.txtComAxis_AB_P2);
this.groupBox24.Controls.Add(this.btnComAxis_AB_P2);
this.groupBox24.Location = new System.Drawing.Point(355, 6);
this.groupBox24.Name = "groupBox24";
this.groupBox24.Size = new System.Drawing.Size(373, 107);
this.groupBox24.TabIndex = 10;
this.groupBox24.TabStop = false;
this.groupBox24.Text = "A面移栽压紧轴";
//
// txtComAxis_AB_P3
//
this.txtComAxis_AB_P3.Location = new System.Drawing.Point(174, 74);
this.txtComAxis_AB_P3.Name = "txtComAxis_AB_P3";
this.txtComAxis_AB_P3.Size = new System.Drawing.Size(134, 23);
this.txtComAxis_AB_P3.TabIndex = 34;
//
// btnComAxis_AB_P3
//
this.btnComAxis_AB_P3.Location = new System.Drawing.Point(6, 69);
this.btnComAxis_AB_P3.Name = "btnComAxis_AB_P3";
this.btnComAxis_AB_P3.Size = new System.Drawing.Size(152, 32);
this.btnComAxis_AB_P3.TabIndex = 33;
this.btnComAxis_AB_P3.Text = "压紧点P3";
this.btnComAxis_AB_P3.UseVisualStyleBackColor = true;
this.btnComAxis_AB_P3.Click += new System.EventHandler(this.btnComAxis_AB_P3_Click);
//
// txtComAxis_AB_P2
//
this.txtComAxis_AB_P2.Location = new System.Drawing.Point(174, 31);
this.txtComAxis_AB_P2.Name = "txtComAxis_AB_P2";
this.txtComAxis_AB_P2.Size = new System.Drawing.Size(134, 23);
this.txtComAxis_AB_P2.TabIndex = 32;
//
// btnComAxis_AB_P2
//
this.btnComAxis_AB_P2.Location = new System.Drawing.Point(6, 22);
this.btnComAxis_AB_P2.Name = "btnComAxis_AB_P2";
this.btnComAxis_AB_P2.Size = new System.Drawing.Size(152, 32);
this.btnComAxis_AB_P2.TabIndex = 31;
this.btnComAxis_AB_P2.Text = "压紧前点P2";
this.btnComAxis_AB_P2.UseVisualStyleBackColor = true;
this.btnComAxis_AB_P2.Click += new System.EventHandler(this.btnComAxis_AB_P2_Click);
//
// groupBox19
//
this.groupBox19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.groupBox19.Controls.Add(this.txtXAxis_AB_P3);
this.groupBox19.Controls.Add(this.btnXAxis_AB_P3);
this.groupBox19.Location = new System.Drawing.Point(6, 119);
this.groupBox19.Name = "groupBox19";
this.groupBox19.Size = new System.Drawing.Size(332, 67);
this.groupBox19.TabIndex = 5;
this.groupBox19.TabStop = false;
this.groupBox19.Text = "A面移栽X轴";
//
// txtXAxis_AB_P3
//
this.txtXAxis_AB_P3.Location = new System.Drawing.Point(176, 28);
this.txtXAxis_AB_P3.Name = "txtXAxis_AB_P3";
this.txtXAxis_AB_P3.Size = new System.Drawing.Size(134, 23);
this.txtXAxis_AB_P3.TabIndex = 10;
//
// btnXAxis_AB_P3
//
this.btnXAxis_AB_P3.Location = new System.Drawing.Point(6, 23);
this.btnXAxis_AB_P3.Name = "btnXAxis_AB_P3";
this.btnXAxis_AB_P3.Size = new System.Drawing.Size(164, 32);
this.btnXAxis_AB_P3.TabIndex = 5;
this.btnXAxis_AB_P3.Text = "料屉库位取放料点P3";
this.btnXAxis_AB_P3.UseVisualStyleBackColor = true;
this.btnXAxis_AB_P3.Click += new System.EventHandler(this.btnXAxis_AB_P3_Click);
//
// groupBox16 // groupBox16
// //
this.groupBox16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.groupBox16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
...@@ -1105,10 +1137,10 @@ ...@@ -1105,10 +1137,10 @@
this.groupBox16.Controls.Add(this.btnPullAxis_Inout_P3_P5); this.groupBox16.Controls.Add(this.btnPullAxis_Inout_P3_P5);
this.groupBox16.Controls.Add(this.txtPullAxis_Inout_P2_P4); this.groupBox16.Controls.Add(this.txtPullAxis_Inout_P2_P4);
this.groupBox16.Controls.Add(this.btnPullAxis_Inout_P2_P4); this.groupBox16.Controls.Add(this.btnPullAxis_Inout_P2_P4);
this.groupBox16.Location = new System.Drawing.Point(350, 22); this.groupBox16.Location = new System.Drawing.Point(6, 6);
this.groupBox16.Name = "groupBox16"; this.groupBox16.Name = "groupBox16";
this.groupBox16.Size = new System.Drawing.Size(332, 107); this.groupBox16.Size = new System.Drawing.Size(332, 107);
this.groupBox16.TabIndex = 1; this.groupBox16.TabIndex = 2;
this.groupBox16.TabStop = false; this.groupBox16.TabStop = false;
this.groupBox16.Text = "料斗拉取进出轴"; this.groupBox16.Text = "料斗拉取进出轴";
// //
...@@ -1146,146 +1178,177 @@ ...@@ -1146,146 +1178,177 @@
this.btnPullAxis_Inout_P2_P4.UseVisualStyleBackColor = true; this.btnPullAxis_Inout_P2_P4.UseVisualStyleBackColor = true;
this.btnPullAxis_Inout_P2_P4.Click += new System.EventHandler(this.btnPullAxis_Inout_P2_P4_Click); this.btnPullAxis_Inout_P2_P4.Click += new System.EventHandler(this.btnPullAxis_Inout_P2_P4_Click);
// //
// groupBox19 // tabPage10
// //
this.groupBox19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.tabPage10.Controls.Add(this.groupBox4);
this.groupBox19.Controls.Add(this.txtXAxis_AB_P3); this.tabPage10.Location = new System.Drawing.Point(4, 26);
this.groupBox19.Controls.Add(this.btnXAxis_AB_P3); this.tabPage10.Name = "tabPage10";
this.groupBox19.Location = new System.Drawing.Point(12, 204); this.tabPage10.Size = new System.Drawing.Size(976, 233);
this.groupBox19.Name = "groupBox19"; this.tabPage10.TabIndex = 2;
this.groupBox19.Size = new System.Drawing.Size(327, 67); this.tabPage10.Text = "暂存区位置";
this.groupBox19.TabIndex = 4; this.tabPage10.UseVisualStyleBackColor = true;
this.groupBox19.TabStop = false;
this.groupBox19.Text = "A面移栽X轴";
// //
// txtXAxis_AB_P3 // groupBox4
// //
this.txtXAxis_AB_P3.Location = new System.Drawing.Point(176, 28); this.groupBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.txtXAxis_AB_P3.Name = "txtXAxis_AB_P3"; this.groupBox4.Controls.Add(this.txtUpdown_P11);
this.txtXAxis_AB_P3.Size = new System.Drawing.Size(134, 23); this.groupBox4.Controls.Add(this.txtUpdown_P10);
this.txtXAxis_AB_P3.TabIndex = 10; this.groupBox4.Controls.Add(this.txtUpdown_P9);
this.groupBox4.Controls.Add(this.txtUpdown_P8);
this.groupBox4.Controls.Add(this.txtUpdown_P5);
this.groupBox4.Controls.Add(this.txtUpdown_P4);
this.groupBox4.Controls.Add(this.txtUpdown_P3);
this.groupBox4.Controls.Add(this.txtUpdown_P2);
this.groupBox4.Controls.Add(this.btnUpdown_P9);
this.groupBox4.Controls.Add(this.btnUpdown_P4);
this.groupBox4.Controls.Add(this.btnUpdown_P3);
this.groupBox4.Controls.Add(this.btnUpdown_P11);
this.groupBox4.Controls.Add(this.btnUpdown_P10);
this.groupBox4.Controls.Add(this.btnUpdown_P8);
this.groupBox4.Controls.Add(this.btnUpdown_P5);
this.groupBox4.Controls.Add(this.btnUpdown_P2);
this.groupBox4.Location = new System.Drawing.Point(3, 3);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(610, 179);
this.groupBox4.TabIndex = 3;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "移栽升降轴";
// //
// btnXAxis_AB_P3 // txtUpdown_P11
// //
this.btnXAxis_AB_P3.Location = new System.Drawing.Point(6, 23); this.txtUpdown_P11.Location = new System.Drawing.Point(466, 135);
this.btnXAxis_AB_P3.Name = "btnXAxis_AB_P3"; this.txtUpdown_P11.Name = "txtUpdown_P11";
this.btnXAxis_AB_P3.Size = new System.Drawing.Size(164, 32); this.txtUpdown_P11.Size = new System.Drawing.Size(134, 23);
this.btnXAxis_AB_P3.TabIndex = 5; this.txtUpdown_P11.TabIndex = 22;
this.btnXAxis_AB_P3.Text = "料屉库位取放料点P3"; //
this.btnXAxis_AB_P3.UseVisualStyleBackColor = true; // txtUpdown_P10
this.btnXAxis_AB_P3.Click += new System.EventHandler(this.btnXAxis_AB_P3_Click); //
this.txtUpdown_P10.Location = new System.Drawing.Point(466, 99);
this.txtUpdown_P10.Name = "txtUpdown_P10";
this.txtUpdown_P10.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P10.TabIndex = 21;
//
// txtUpdown_P9
//
this.txtUpdown_P9.Location = new System.Drawing.Point(466, 63);
this.txtUpdown_P9.Name = "txtUpdown_P9";
this.txtUpdown_P9.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P9.TabIndex = 20;
//
// txtUpdown_P8
//
this.txtUpdown_P8.Location = new System.Drawing.Point(466, 27);
this.txtUpdown_P8.Name = "txtUpdown_P8";
this.txtUpdown_P8.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P8.TabIndex = 19;
// //
// groupBox14 // txtUpdown_P5
// //
this.groupBox14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.txtUpdown_P5.Location = new System.Drawing.Point(158, 135);
this.groupBox14.Controls.Add(this.txtUpdown_P7_P13); this.txtUpdown_P5.Name = "txtUpdown_P5";
this.groupBox14.Controls.Add(this.txtUpdown_P6_P12); this.txtUpdown_P5.Size = new System.Drawing.Size(134, 23);
this.groupBox14.Controls.Add(this.btnUpdown_P6_P12); this.txtUpdown_P5.TabIndex = 18;
this.groupBox14.Controls.Add(this.btnUpdown_P7_P13);
this.groupBox14.Location = new System.Drawing.Point(6, 22);
this.groupBox14.Name = "groupBox14";
this.groupBox14.Size = new System.Drawing.Size(338, 107);
this.groupBox14.TabIndex = 2;
this.groupBox14.TabStop = false;
this.groupBox14.Text = "移栽升降轴";
// //
// txtUpdown_P7_P13 // txtUpdown_P4
// //
this.txtUpdown_P7_P13.Location = new System.Drawing.Point(187, 66); this.txtUpdown_P4.Location = new System.Drawing.Point(158, 99);
this.txtUpdown_P7_P13.Name = "txtUpdown_P7_P13"; this.txtUpdown_P4.Name = "txtUpdown_P4";
this.txtUpdown_P7_P13.Size = new System.Drawing.Size(134, 23); this.txtUpdown_P4.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P7_P13.TabIndex = 15; this.txtUpdown_P4.TabIndex = 17;
// //
// txtUpdown_P6_P12 // txtUpdown_P3
// //
this.txtUpdown_P6_P12.Location = new System.Drawing.Point(187, 28); this.txtUpdown_P3.Location = new System.Drawing.Point(158, 63);
this.txtUpdown_P6_P12.Name = "txtUpdown_P6_P12"; this.txtUpdown_P3.Name = "txtUpdown_P3";
this.txtUpdown_P6_P12.Size = new System.Drawing.Size(134, 23); this.txtUpdown_P3.Size = new System.Drawing.Size(134, 23);
this.txtUpdown_P6_P12.TabIndex = 14; this.txtUpdown_P3.TabIndex = 16;
// //
// btnUpdown_P6_P12 // txtUpdown_P2
// //
this.btnUpdown_P6_P12.Location = new System.Drawing.Point(2, 23); this.txtUpdown_P2.Location = new System.Drawing.Point(158, 27);
this.btnUpdown_P6_P12.Name = "btnUpdown_P6_P12"; this.txtUpdown_P2.Name = "txtUpdown_P2";
this.btnUpdown_P6_P12.Size = new System.Drawing.Size(156, 32); this.txtUpdown_P2.Size = new System.Drawing.Size(134, 23);
this.btnUpdown_P6_P12.TabIndex = 10; this.txtUpdown_P2.TabIndex = 15;
this.btnUpdown_P6_P12.Text = "料屉上方过渡点";
this.btnUpdown_P6_P12.UseVisualStyleBackColor = true;
this.btnUpdown_P6_P12.Click += new System.EventHandler(this.btnUpdown_P6_P12_Click);
// //
// btnUpdown_P7_P13 // btnUpdown_P9
// //
this.btnUpdown_P7_P13.Location = new System.Drawing.Point(2, 61); this.btnUpdown_P9.Location = new System.Drawing.Point(314, 58);
this.btnUpdown_P7_P13.Name = "btnUpdown_P7_P13"; this.btnUpdown_P9.Name = "btnUpdown_P9";
this.btnUpdown_P7_P13.Size = new System.Drawing.Size(156, 32); this.btnUpdown_P9.Size = new System.Drawing.Size(146, 32);
this.btnUpdown_P7_P13.TabIndex = 2; this.btnUpdown_P9.TabIndex = 13;
this.btnUpdown_P7_P13.Text = "料屉取放点"; this.btnUpdown_P9.Text = "B上暂存区取料低点P9";
this.btnUpdown_P7_P13.UseVisualStyleBackColor = true; this.btnUpdown_P9.UseVisualStyleBackColor = true;
this.btnUpdown_P7_P13.Click += new System.EventHandler(this.btnUpdown_P7_P13_Click); this.btnUpdown_P9.Click += new System.EventHandler(this.btnUpdown_P9_Click);
// //
// groupBox15 // btnUpdown_P4
// //
this.groupBox15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); this.btnUpdown_P4.Location = new System.Drawing.Point(6, 94);
this.groupBox15.Controls.Add(this.txtMoveAxis_P3); this.btnUpdown_P4.Name = "btnUpdown_P4";
this.groupBox15.Controls.Add(this.btnMoveAxis_P3); this.btnUpdown_P4.Size = new System.Drawing.Size(146, 32);
this.groupBox15.Location = new System.Drawing.Point(6, 135); this.btnUpdown_P4.TabIndex = 12;
this.groupBox15.Name = "groupBox15"; this.btnUpdown_P4.Text = "A下暂存区放料高点P4";
this.groupBox15.Size = new System.Drawing.Size(332, 66); this.btnUpdown_P4.UseVisualStyleBackColor = true;
this.groupBox15.TabIndex = 0; this.btnUpdown_P4.Click += new System.EventHandler(this.btnUpdown_P4_Click);
this.groupBox15.TabStop = false;
this.groupBox15.Text = "行走机构";
// //
// txtMoveAxis_P3 // btnUpdown_P3
// //
this.txtMoveAxis_P3.Location = new System.Drawing.Point(187, 27); this.btnUpdown_P3.Location = new System.Drawing.Point(6, 58);
this.txtMoveAxis_P3.Name = "txtMoveAxis_P3"; this.btnUpdown_P3.Name = "btnUpdown_P3";
this.txtMoveAxis_P3.Size = new System.Drawing.Size(134, 23); this.btnUpdown_P3.Size = new System.Drawing.Size(146, 32);
this.txtMoveAxis_P3.TabIndex = 3; this.btnUpdown_P3.TabIndex = 11;
this.btnUpdown_P3.Text = "A上暂存区取料低点P3";
this.btnUpdown_P3.UseVisualStyleBackColor = true;
this.btnUpdown_P3.Click += new System.EventHandler(this.btnUpdown_P3_Click);
// //
// btnMoveAxis_P3 // btnUpdown_P11
// //
this.btnMoveAxis_P3.Location = new System.Drawing.Point(6, 22); this.btnUpdown_P11.Location = new System.Drawing.Point(314, 130);
this.btnMoveAxis_P3.Name = "btnMoveAxis_P3"; this.btnUpdown_P11.Name = "btnUpdown_P11";
this.btnMoveAxis_P3.Size = new System.Drawing.Size(152, 32); this.btnUpdown_P11.Size = new System.Drawing.Size(146, 32);
this.btnMoveAxis_P3.TabIndex = 0; this.btnUpdown_P11.TabIndex = 6;
this.btnMoveAxis_P3.Text = "料屉提取点"; this.btnUpdown_P11.Text = "B下暂存区取料低点P11";
this.btnMoveAxis_P3.UseVisualStyleBackColor = true; this.btnUpdown_P11.UseVisualStyleBackColor = true;
this.btnMoveAxis_P3.Click += new System.EventHandler(this.btnMoveAxis_P3_Click); this.btnUpdown_P11.Click += new System.EventHandler(this.btnUpdown_P11_Click);
// //
// tabControl1 // btnUpdown_P10
// //
this.tabControl1.Controls.Add(this.tabPage1); this.btnUpdown_P10.Location = new System.Drawing.Point(314, 94);
this.tabControl1.Controls.Add(this.tabPage2); this.btnUpdown_P10.Name = "btnUpdown_P10";
this.tabControl1.Controls.Add(this.tabPage3); this.btnUpdown_P10.Size = new System.Drawing.Size(146, 32);
this.tabControl1.Controls.Add(this.tabPage7); this.btnUpdown_P10.TabIndex = 5;
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.btnUpdown_P10.Text = "B下暂存区取料高点P10";
this.tabControl1.Location = new System.Drawing.Point(3, 419); this.btnUpdown_P10.UseVisualStyleBackColor = true;
this.tabControl1.Name = "tabControl1"; this.btnUpdown_P10.Click += new System.EventHandler(this.btnUpdown_P10_Click);
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(998, 299);
this.tabControl1.TabIndex = 3;
// //
// tabPage1 // btnUpdown_P8
// //
this.tabPage1.Controls.Add(this.groupBox1); this.btnUpdown_P8.Location = new System.Drawing.Point(314, 22);
this.tabPage1.Location = new System.Drawing.Point(4, 26); this.btnUpdown_P8.Name = "btnUpdown_P8";
this.tabPage1.Name = "tabPage1"; this.btnUpdown_P8.Size = new System.Drawing.Size(146, 32);
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.btnUpdown_P8.TabIndex = 4;
this.tabPage1.Size = new System.Drawing.Size(990, 269); this.btnUpdown_P8.Text = "B上暂存区取料高点P8";
this.tabPage1.TabIndex = 0; this.btnUpdown_P8.UseVisualStyleBackColor = true;
this.tabPage1.Text = "公共位置信息"; this.btnUpdown_P8.Click += new System.EventHandler(this.btnUpdown_P8_Click);
this.tabPage1.UseVisualStyleBackColor = true;
// //
// tabPage2 // btnUpdown_P5
// //
this.tabPage2.Controls.Add(this.groupBox13); this.btnUpdown_P5.Location = new System.Drawing.Point(6, 130);
this.tabPage2.Location = new System.Drawing.Point(4, 26); this.btnUpdown_P5.Name = "btnUpdown_P5";
this.tabPage2.Name = "tabPage2"; this.btnUpdown_P5.Size = new System.Drawing.Size(146, 32);
this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.btnUpdown_P5.TabIndex = 3;
this.tabPage2.Size = new System.Drawing.Size(990, 269); this.btnUpdown_P5.Text = "A下暂存区放料低点P5";
this.tabPage2.TabIndex = 1; this.btnUpdown_P5.UseVisualStyleBackColor = true;
this.tabPage2.Text = "库位相关位置信息"; this.btnUpdown_P5.Click += new System.EventHandler(this.btnUpdown_P5_Click);
this.tabPage2.UseVisualStyleBackColor = true; //
// btnUpdown_P2
//
this.btnUpdown_P2.Location = new System.Drawing.Point(6, 22);
this.btnUpdown_P2.Name = "btnUpdown_P2";
this.btnUpdown_P2.Size = new System.Drawing.Size(146, 32);
this.btnUpdown_P2.TabIndex = 2;
this.btnUpdown_P2.Text = "A上暂存区取料高点P2";
this.btnUpdown_P2.UseVisualStyleBackColor = true;
this.btnUpdown_P2.Click += new System.EventHandler(this.btnUpdown_P2_Click);
// //
// tabPage3 // tabPage3
// //
...@@ -1937,14 +2000,14 @@ ...@@ -1937,14 +2000,14 @@
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.tabControl2.ResumeLayout(false); this.tabControl2.ResumeLayout(false);
this.tabPage4.ResumeLayout(false); this.tabPage4.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.groupBox28.ResumeLayout(false);
this.groupBox28.PerformLayout();
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout(); this.groupBox2.PerformLayout();
this.groupBox5.ResumeLayout(false); this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout(); this.groupBox5.PerformLayout();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.tabPage5.ResumeLayout(false); this.tabPage5.ResumeLayout(false);
this.groupBox26.ResumeLayout(false); this.groupBox26.ResumeLayout(false);
this.groupBox26.PerformLayout(); this.groupBox26.PerformLayout();
...@@ -1966,21 +2029,27 @@ ...@@ -1966,21 +2029,27 @@
this.groupBox12.ResumeLayout(false); this.groupBox12.ResumeLayout(false);
this.groupBox12.PerformLayout(); this.groupBox12.PerformLayout();
this.groupBox13.ResumeLayout(false); this.groupBox13.ResumeLayout(false);
this.groupBox24.ResumeLayout(false); this.groupBox15.ResumeLayout(false);
this.groupBox24.PerformLayout(); this.groupBox15.PerformLayout();
this.groupBox17.ResumeLayout(false); this.groupBox17.ResumeLayout(false);
this.groupBox17.PerformLayout(); this.groupBox17.PerformLayout();
this.groupBox16.ResumeLayout(false);
this.groupBox16.PerformLayout();
this.groupBox19.ResumeLayout(false);
this.groupBox19.PerformLayout();
this.groupBox14.ResumeLayout(false); this.groupBox14.ResumeLayout(false);
this.groupBox14.PerformLayout(); this.groupBox14.PerformLayout();
this.groupBox15.ResumeLayout(false);
this.groupBox15.PerformLayout();
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false); this.tabPage2.ResumeLayout(false);
this.tabControl3.ResumeLayout(false);
this.tabPage8.ResumeLayout(false);
this.tabPage9.ResumeLayout(false);
this.groupBox24.ResumeLayout(false);
this.groupBox24.PerformLayout();
this.groupBox19.ResumeLayout(false);
this.groupBox19.PerformLayout();
this.groupBox16.ResumeLayout(false);
this.groupBox16.PerformLayout();
this.tabPage10.ResumeLayout(false);
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.tabPage3.ResumeLayout(false); this.tabPage3.ResumeLayout(false);
this.tableLayoutPanel3.ResumeLayout(false); this.tableLayoutPanel3.ResumeLayout(false);
this.groupBox22.ResumeLayout(false); this.groupBox22.ResumeLayout(false);
...@@ -2006,25 +2075,6 @@ ...@@ -2006,25 +2075,6 @@
#endregion #endregion
private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.TextBox txtUpdown_P11;
private System.Windows.Forms.TextBox txtUpdown_P10;
private System.Windows.Forms.TextBox txtUpdown_P9;
private System.Windows.Forms.TextBox txtUpdown_P8;
private System.Windows.Forms.TextBox txtUpdown_P5;
private System.Windows.Forms.TextBox txtUpdown_P4;
private System.Windows.Forms.TextBox txtUpdown_P3;
private System.Windows.Forms.TextBox txtUpdown_P2;
private System.Windows.Forms.TextBox txtUpdown_P1;
private System.Windows.Forms.Button btnUpdown_P9;
private System.Windows.Forms.Button btnUpdown_P4;
private System.Windows.Forms.Button btnUpdown_P3;
private System.Windows.Forms.Button btnUpdown_P1;
private System.Windows.Forms.Button btnUpdown_P11;
private System.Windows.Forms.Button btnUpdown_P10;
private System.Windows.Forms.Button btnUpdown_P8;
private System.Windows.Forms.Button btnUpdown_P5;
private System.Windows.Forms.Button btnUpdown_P2;
private System.Windows.Forms.GroupBox groupBox5; private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.Button btnPullAxis_Updown_P1; private System.Windows.Forms.Button btnPullAxis_Updown_P1;
private System.Windows.Forms.TextBox txtPullAxis_Updown_P1; private System.Windows.Forms.TextBox txtPullAxis_Updown_P1;
...@@ -2074,27 +2124,11 @@ ...@@ -2074,27 +2124,11 @@
private System.Windows.Forms.TextBox txtUpdown_P6_P12; private System.Windows.Forms.TextBox txtUpdown_P6_P12;
private System.Windows.Forms.Button btnUpdown_P6_P12; private System.Windows.Forms.Button btnUpdown_P6_P12;
private System.Windows.Forms.Button btnUpdown_P7_P13; private System.Windows.Forms.Button btnUpdown_P7_P13;
private System.Windows.Forms.GroupBox groupBox15;
private System.Windows.Forms.TextBox txtMoveAxis_P3;
private System.Windows.Forms.Button btnMoveAxis_P3;
private System.Windows.Forms.GroupBox groupBox19;
private System.Windows.Forms.TextBox txtXAxis_AB_P3;
private System.Windows.Forms.Button btnXAxis_AB_P3;
private System.Windows.Forms.GroupBox groupBox16;
private System.Windows.Forms.TextBox txtPullAxis_Inout_P3_P5;
private System.Windows.Forms.Button btnPullAxis_Inout_P3_P5;
private System.Windows.Forms.TextBox txtPullAxis_Inout_P2_P4;
private System.Windows.Forms.Button btnPullAxis_Inout_P2_P4;
private System.Windows.Forms.GroupBox groupBox17; private System.Windows.Forms.GroupBox groupBox17;
private System.Windows.Forms.Button btnPullAxis_Updown_P4; private System.Windows.Forms.Button btnPullAxis_Updown_P4;
private System.Windows.Forms.Button btnPullAxis_Updown_P3; private System.Windows.Forms.Button btnPullAxis_Updown_P3;
private System.Windows.Forms.TextBox txtPullAxis_Updown_P4; private System.Windows.Forms.TextBox txtPullAxis_Updown_P4;
private System.Windows.Forms.TextBox txtPullAxis_Updown_P3; private System.Windows.Forms.TextBox txtPullAxis_Updown_P3;
private System.Windows.Forms.GroupBox groupBox24;
private System.Windows.Forms.TextBox txtComAxis_AB_P3;
private System.Windows.Forms.Button btnComAxis_AB_P3;
private System.Windows.Forms.TextBox txtComAxis_AB_P2;
private System.Windows.Forms.Button btnComAxis_AB_P2;
private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.TabPage tabPage2;
...@@ -2173,5 +2207,45 @@ ...@@ -2173,5 +2207,45 @@
private System.Windows.Forms.GroupBox groupBox27; private System.Windows.Forms.GroupBox groupBox27;
private System.Windows.Forms.TextBox txtPullAxis_Inout_CamB; private System.Windows.Forms.TextBox txtPullAxis_Inout_CamB;
private System.Windows.Forms.Button btnInOutAxis_B_Cam; private System.Windows.Forms.Button btnInOutAxis_B_Cam;
private System.Windows.Forms.GroupBox groupBox15;
private System.Windows.Forms.TextBox txtMoveAxis_P3;
private System.Windows.Forms.Button btnMoveAxis_P3;
private System.Windows.Forms.TabControl tabControl3;
private System.Windows.Forms.TabPage tabPage8;
private System.Windows.Forms.TabPage tabPage9;
private System.Windows.Forms.GroupBox groupBox24;
private System.Windows.Forms.TextBox txtComAxis_AB_P3;
private System.Windows.Forms.Button btnComAxis_AB_P3;
private System.Windows.Forms.TextBox txtComAxis_AB_P2;
private System.Windows.Forms.Button btnComAxis_AB_P2;
private System.Windows.Forms.GroupBox groupBox19;
private System.Windows.Forms.TextBox txtXAxis_AB_P3;
private System.Windows.Forms.Button btnXAxis_AB_P3;
private System.Windows.Forms.GroupBox groupBox16;
private System.Windows.Forms.TextBox txtPullAxis_Inout_P3_P5;
private System.Windows.Forms.Button btnPullAxis_Inout_P3_P5;
private System.Windows.Forms.TextBox txtPullAxis_Inout_P2_P4;
private System.Windows.Forms.Button btnPullAxis_Inout_P2_P4;
private System.Windows.Forms.TabPage tabPage10;
private System.Windows.Forms.GroupBox groupBox28;
private System.Windows.Forms.Button btnUpdown_P1;
private System.Windows.Forms.TextBox txtUpdown_P1;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.TextBox txtUpdown_P11;
private System.Windows.Forms.TextBox txtUpdown_P10;
private System.Windows.Forms.TextBox txtUpdown_P9;
private System.Windows.Forms.TextBox txtUpdown_P8;
private System.Windows.Forms.TextBox txtUpdown_P5;
private System.Windows.Forms.TextBox txtUpdown_P4;
private System.Windows.Forms.TextBox txtUpdown_P3;
private System.Windows.Forms.TextBox txtUpdown_P2;
private System.Windows.Forms.Button btnUpdown_P9;
private System.Windows.Forms.Button btnUpdown_P4;
private System.Windows.Forms.Button btnUpdown_P3;
private System.Windows.Forms.Button btnUpdown_P11;
private System.Windows.Forms.Button btnUpdown_P10;
private System.Windows.Forms.Button btnUpdown_P8;
private System.Windows.Forms.Button btnUpdown_P5;
private System.Windows.Forms.Button btnUpdown_P2;
} }
} }
\ No newline at end of file \ No newline at end of file
...@@ -57,8 +57,8 @@ namespace OnlineStore.XLRStore ...@@ -57,8 +57,8 @@ namespace OnlineStore.XLRStore
LoadBoxPostion(ktkPosition); LoadBoxPostion(ktkPosition);
InOutPosInfo posInfo = new InOutPosInfo(); InOutPosInfo posInfo = new InOutPosInfo();
posInfo.PosId = posId; posInfo.PosId = posId;
posSide = posInfo.GetPosSide(); posSide = posInfo.GetPosSide();
groupBox13.Text = $"库位位置信息[{posId}]"; tabControl1.TabPages[1].Text = $"库位[{posId}][{ktkPosition.BagWidth}*{ktkPosition.BagHigh}]位置信息";
groupBox19.Text = posSide + "面移栽X轴"; groupBox19.Text = posSide + "面移栽X轴";
groupBox24.Text = posSide + "面移栽压紧轴"; groupBox24.Text = posSide + "面移栽压紧轴";
if (posSide.Equals("A")) if (posSide.Equals("A"))
...@@ -100,14 +100,6 @@ namespace OnlineStore.XLRStore ...@@ -100,14 +100,6 @@ namespace OnlineStore.XLRStore
txtPullAxis_Inout_P1.Text = boxEquip.Config.PullAxis_Inout_P1.ToString(); txtPullAxis_Inout_P1.Text = boxEquip.Config.PullAxis_Inout_P1.ToString();
txtPullAxis_Updown_P1.Text = boxEquip.Config.PullAxis_Updown_P1.ToString(); txtPullAxis_Updown_P1.Text = boxEquip.Config.PullAxis_Updown_P1.ToString();
txtUpdown_P1.Text = boxEquip.Config.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_P1.Text = boxEquip.Config.XAxis_A_P1.ToString();
txtXAxis_A_P2.Text = boxEquip.Config.XAxis_A_P2.ToString(); txtXAxis_A_P2.Text = boxEquip.Config.XAxis_A_P2.ToString();
txtXAxis_B_P1.Text = boxEquip.Config.XAxis_B_P1.ToString(); txtXAxis_B_P1.Text = boxEquip.Config.XAxis_B_P1.ToString();
...@@ -128,8 +120,16 @@ namespace OnlineStore.XLRStore ...@@ -128,8 +120,16 @@ namespace OnlineStore.XLRStore
txtUpdown_P6_P12.Text = boxPosition.Updown_P6_P12.ToString(); txtUpdown_P6_P12.Text = boxPosition.Updown_P6_P12.ToString();
txtUpdown_P7_P13.Text = boxPosition.Updown_P7_P13.ToString(); txtUpdown_P7_P13.Text = boxPosition.Updown_P7_P13.ToString();
txtXAxis_AB_P3.Text = boxPosition.XAxis_AB_P3.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; axisMoveControl1.Enabled = isDebug;
tabControl1.Enabled = isDebug; tabControl1.Enabled = isDebug;
...@@ -507,47 +507,7 @@ namespace OnlineStore.XLRStore ...@@ -507,47 +507,7 @@ namespace OnlineStore.XLRStore
{ {
boxEquip.Config.Updown_P1 = FormUtil.GetIntValue(txtUpdown_P1); boxEquip.Config.Updown_P1 = FormUtil.GetIntValue(txtUpdown_P1);
needUpdate = true; 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)) if (boxEquip.Config.XAxis_A_P1 != FormUtil.GetIntValue(txtXAxis_A_P1))
{ {
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 ...@@ -615,6 +575,14 @@ namespace OnlineStore.XLRStore
ktkPosition.Updown_P6_P12 = FormUtil.GetIntValue(txtUpdown_P6_P12); ktkPosition.Updown_P6_P12 = FormUtil.GetIntValue(txtUpdown_P6_P12);
ktkPosition.Updown_P7_P13 = FormUtil.GetIntValue(txtUpdown_P7_P13); ktkPosition.Updown_P7_P13 = FormUtil.GetIntValue(txtUpdown_P7_P13);
ktkPosition.XAxis_AB_P3 = FormUtil.GetIntValue(txtXAxis_AB_P3); 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; string appPath = Application.StartupPath;
......
...@@ -535,6 +535,7 @@ namespace OnlineStore.XLRStore ...@@ -535,6 +535,7 @@ namespace OnlineStore.XLRStore
} }
else else
{ {
frmAxisMove.DebugStatus(boxBean.IsDebug);
frmAxisMove.ShowDialog(); frmAxisMove.ShowDialog();
} }
} }
......
...@@ -25,14 +25,18 @@ namespace OnlineStore.XLRStore ...@@ -25,14 +25,18 @@ namespace OnlineStore.XLRStore
this.chbPointEditEnable = new System.Windows.Forms.CheckBox(); this.chbPointEditEnable = new System.Windows.Forms.CheckBox();
this.groupBox11 = new System.Windows.Forms.GroupBox(); this.groupBox11 = new System.Windows.Forms.GroupBox();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.inoutAxisP5 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.inoutAxisP4 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP3 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP3 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP2 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP2 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP2 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP2 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP3 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP3 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.groupBox10 = new System.Windows.Forms.GroupBox(); this.groupBox10 = new System.Windows.Forms.GroupBox();
this.inoutAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.groupBox9 = new System.Windows.Forms.GroupBox(); this.groupBox9 = new System.Windows.Forms.GroupBox();
this.inoutAxisP6 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP8 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP8 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP9 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP9 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP6 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP6 = new OnlineStore.XLRStore.useControl.AxisPointControl();
...@@ -42,6 +46,7 @@ namespace OnlineStore.XLRStore ...@@ -42,6 +46,7 @@ namespace OnlineStore.XLRStore
this.mideleAxisP8 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP8 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP12 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP12 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.groupBox7 = new System.Windows.Forms.GroupBox(); this.groupBox7 = new System.Windows.Forms.GroupBox();
this.inoutAxisP3 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP5 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP5 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP10 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP10 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP11 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP11 = new OnlineStore.XLRStore.useControl.AxisPointControl();
...@@ -50,6 +55,7 @@ namespace OnlineStore.XLRStore ...@@ -50,6 +55,7 @@ namespace OnlineStore.XLRStore
this.updownAxisP6 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP6 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP7 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP7 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.inoutAxisP2 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.mideleAxisP4 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.mideleAxisP4 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP4 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP4 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP5 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.updownAxisP5 = new OnlineStore.XLRStore.useControl.AxisPointControl();
...@@ -110,6 +116,14 @@ namespace OnlineStore.XLRStore ...@@ -110,6 +116,14 @@ namespace OnlineStore.XLRStore
this.lblMoveInfo = new System.Windows.Forms.Label(); this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblThisSta = new System.Windows.Forms.Label(); this.lblThisSta = new System.Windows.Forms.Label();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.tabPage6 = new System.Windows.Forms.TabPage();
this.updownAxisP14 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP15 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP16 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.updownAxisP17 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.groupBox11.SuspendLayout(); this.groupBox11.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
...@@ -129,6 +143,10 @@ namespace OnlineStore.XLRStore ...@@ -129,6 +143,10 @@ namespace OnlineStore.XLRStore
this.groupBox6.SuspendLayout(); this.groupBox6.SuspendLayout();
this.groupBox12.SuspendLayout(); this.groupBox12.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabControl2.SuspendLayout();
this.tabPage4.SuspendLayout();
this.tabPage5.SuspendLayout();
this.tabPage6.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -150,15 +168,10 @@ namespace OnlineStore.XLRStore ...@@ -150,15 +168,10 @@ namespace OnlineStore.XLRStore
// //
// tabPage2 // tabPage2
// //
this.tabPage2.Controls.Add(this.tabControl2);
this.tabPage2.Controls.Add(this.chbPointEditEnable); this.tabPage2.Controls.Add(this.chbPointEditEnable);
this.tabPage2.Controls.Add(this.groupBox11); this.tabPage2.Controls.Add(this.groupBox11);
this.tabPage2.Controls.Add(this.groupBox10);
this.tabPage2.Controls.Add(this.groupBox9);
this.tabPage2.Controls.Add(this.btnSave); this.tabPage2.Controls.Add(this.btnSave);
this.tabPage2.Controls.Add(this.groupBox8);
this.tabPage2.Controls.Add(this.groupBox7);
this.tabPage2.Controls.Add(this.groupBox5);
this.tabPage2.Controls.Add(this.groupBox2);
this.tabPage2.Controls.Add(this.axisMoveControl1); this.tabPage2.Controls.Add(this.axisMoveControl1);
this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
...@@ -172,7 +185,7 @@ namespace OnlineStore.XLRStore ...@@ -172,7 +185,7 @@ namespace OnlineStore.XLRStore
// //
this.chbPointEditEnable.AutoSize = true; this.chbPointEditEnable.AutoSize = true;
this.chbPointEditEnable.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbPointEditEnable.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbPointEditEnable.Location = new System.Drawing.Point(606, 265); this.chbPointEditEnable.Location = new System.Drawing.Point(716, 299);
this.chbPointEditEnable.Name = "chbPointEditEnable"; this.chbPointEditEnable.Name = "chbPointEditEnable";
this.chbPointEditEnable.Size = new System.Drawing.Size(125, 26); this.chbPointEditEnable.Size = new System.Drawing.Size(125, 26);
this.chbPointEditEnable.TabIndex = 229; this.chbPointEditEnable.TabIndex = 229;
...@@ -183,15 +196,17 @@ namespace OnlineStore.XLRStore ...@@ -183,15 +196,17 @@ namespace OnlineStore.XLRStore
// groupBox11 // groupBox11
// //
this.groupBox11.Controls.Add(this.panel1); this.groupBox11.Controls.Add(this.panel1);
this.groupBox11.Location = new System.Drawing.Point(718, 312); this.groupBox11.Location = new System.Drawing.Point(710, 331);
this.groupBox11.Name = "groupBox11"; this.groupBox11.Name = "groupBox11";
this.groupBox11.Size = new System.Drawing.Size(239, 213); this.groupBox11.Size = new System.Drawing.Size(268, 224);
this.groupBox11.TabIndex = 228; this.groupBox11.TabIndex = 228;
this.groupBox11.TabStop = false; this.groupBox11.TabStop = false;
this.groupBox11.Text = "料串取放料点位"; this.groupBox11.Text = "料串取放料点位";
// //
// panel1 // panel1
// //
this.panel1.Controls.Add(this.inoutAxisP5);
this.panel1.Controls.Add(this.inoutAxisP4);
this.panel1.Controls.Add(this.mideleAxisP3); this.panel1.Controls.Add(this.mideleAxisP3);
this.panel1.Controls.Add(this.mideleAxisP2); this.panel1.Controls.Add(this.mideleAxisP2);
this.panel1.Controls.Add(this.updownAxisP2); this.panel1.Controls.Add(this.updownAxisP2);
...@@ -199,69 +214,106 @@ namespace OnlineStore.XLRStore ...@@ -199,69 +214,106 @@ namespace OnlineStore.XLRStore
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(3, 19); this.panel1.Location = new System.Drawing.Point(3, 19);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(233, 191); this.panel1.Size = new System.Drawing.Size(262, 202);
this.panel1.TabIndex = 220; this.panel1.TabIndex = 220;
this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
// //
// inoutAxisP5
//
this.inoutAxisP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP5.Location = new System.Drawing.Point(3, 164);
this.inoutAxisP5.Name = "inoutAxisP5";
this.inoutAxisP5.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP5.PointForeColor = System.Drawing.Color.Black;
this.inoutAxisP5.PointText = "进出轴-B料口取料点P5:";
this.inoutAxisP5.PointValue = 0;
this.inoutAxisP5.Size = new System.Drawing.Size(223, 33);
this.inoutAxisP5.TabIndex = 4;
//
// inoutAxisP4
//
this.inoutAxisP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP4.Location = new System.Drawing.Point(3, 129);
this.inoutAxisP4.Name = "inoutAxisP4";
this.inoutAxisP4.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP4.PointForeColor = System.Drawing.Color.Black;
this.inoutAxisP4.PointText = "进出轴-A料口取料点P4:";
this.inoutAxisP4.PointValue = 0;
this.inoutAxisP4.Size = new System.Drawing.Size(223, 33);
this.inoutAxisP4.TabIndex = 3;
//
// mideleAxisP3 // mideleAxisP3
// //
this.mideleAxisP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.mideleAxisP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.mideleAxisP3.Location = new System.Drawing.Point(3, 50); this.mideleAxisP3.Location = new System.Drawing.Point(3, 33);
this.mideleAxisP3.Name = "mideleAxisP3"; this.mideleAxisP3.Name = "mideleAxisP3";
this.mideleAxisP3.PointBackColor = System.Drawing.Color.SkyBlue; this.mideleAxisP3.PointBackColor = System.Drawing.Color.SkyBlue;
this.mideleAxisP3.PointForeColor = System.Drawing.Color.Black; this.mideleAxisP3.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP3.PointText = "旋转轴-B料口取料点P3:"; this.mideleAxisP3.PointText = "旋转轴-B料口取料点P3:";
this.mideleAxisP3.PointValue = 0; this.mideleAxisP3.PointValue = 0;
this.mideleAxisP3.Size = new System.Drawing.Size(223, 41); this.mideleAxisP3.Size = new System.Drawing.Size(223, 33);
this.mideleAxisP3.TabIndex = 2; this.mideleAxisP3.TabIndex = 2;
// //
// mideleAxisP2 // mideleAxisP2
// //
this.mideleAxisP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.mideleAxisP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.mideleAxisP2.Location = new System.Drawing.Point(3, 9); this.mideleAxisP2.Location = new System.Drawing.Point(3, 3);
this.mideleAxisP2.Name = "mideleAxisP2"; this.mideleAxisP2.Name = "mideleAxisP2";
this.mideleAxisP2.PointBackColor = System.Drawing.Color.SkyBlue; this.mideleAxisP2.PointBackColor = System.Drawing.Color.SkyBlue;
this.mideleAxisP2.PointForeColor = System.Drawing.Color.Black; this.mideleAxisP2.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP2.PointText = "旋转轴-A料口取料点P2:"; this.mideleAxisP2.PointText = "旋转轴-A料口取料点P2:";
this.mideleAxisP2.PointValue = 0; this.mideleAxisP2.PointValue = 0;
this.mideleAxisP2.Size = new System.Drawing.Size(223, 41); this.mideleAxisP2.Size = new System.Drawing.Size(223, 33);
this.mideleAxisP2.TabIndex = 1; this.mideleAxisP2.TabIndex = 1;
// //
// updownAxisP2 // updownAxisP2
// //
this.updownAxisP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP2.Location = new System.Drawing.Point(3, 96); this.updownAxisP2.Location = new System.Drawing.Point(3, 65);
this.updownAxisP2.Name = "updownAxisP2"; this.updownAxisP2.Name = "updownAxisP2";
this.updownAxisP2.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP2.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP2.PointForeColor = System.Drawing.Color.Black; this.updownAxisP2.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP2.PointText = "升降轴-A料口取料点P2:"; this.updownAxisP2.PointText = "升降轴-A料口取料点P2:";
this.updownAxisP2.PointValue = 0; this.updownAxisP2.PointValue = 0;
this.updownAxisP2.Size = new System.Drawing.Size(223, 41); this.updownAxisP2.Size = new System.Drawing.Size(223, 33);
this.updownAxisP2.TabIndex = 1; this.updownAxisP2.TabIndex = 1;
// //
// updownAxisP3 // updownAxisP3
// //
this.updownAxisP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP3.Location = new System.Drawing.Point(3, 137); this.updownAxisP3.Location = new System.Drawing.Point(3, 97);
this.updownAxisP3.Name = "updownAxisP3"; this.updownAxisP3.Name = "updownAxisP3";
this.updownAxisP3.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP3.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP3.PointForeColor = System.Drawing.Color.Black; this.updownAxisP3.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP3.PointText = "升降轴-B料口取料点P3:"; this.updownAxisP3.PointText = "升降轴-B料口取料点P3:";
this.updownAxisP3.PointValue = 0; this.updownAxisP3.PointValue = 0;
this.updownAxisP3.Size = new System.Drawing.Size(223, 41); this.updownAxisP3.Size = new System.Drawing.Size(223, 33);
this.updownAxisP3.TabIndex = 2; this.updownAxisP3.TabIndex = 2;
// //
// groupBox10 // groupBox10
// //
this.groupBox10.Controls.Add(this.inoutAxisP1);
this.groupBox10.Controls.Add(this.mideleAxisP1); this.groupBox10.Controls.Add(this.mideleAxisP1);
this.groupBox10.Controls.Add(this.updownAxisP1); this.groupBox10.Controls.Add(this.updownAxisP1);
this.groupBox10.Location = new System.Drawing.Point(600, 6); this.groupBox10.Location = new System.Drawing.Point(3, 15);
this.groupBox10.Name = "groupBox10"; this.groupBox10.Name = "groupBox10";
this.groupBox10.Size = new System.Drawing.Size(286, 104); this.groupBox10.Size = new System.Drawing.Size(286, 155);
this.groupBox10.TabIndex = 227; this.groupBox10.TabIndex = 227;
this.groupBox10.TabStop = false; this.groupBox10.TabStop = false;
this.groupBox10.Text = "待机点点位"; this.groupBox10.Text = "待机点点位";
// //
// inoutAxisP1
//
this.inoutAxisP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP1.Location = new System.Drawing.Point(6, 81);
this.inoutAxisP1.Name = "inoutAxisP1";
this.inoutAxisP1.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP1.PointForeColor = System.Drawing.Color.Black;
this.inoutAxisP1.PointText = "进出轴-待机点P1:";
this.inoutAxisP1.PointValue = 0;
this.inoutAxisP1.Size = new System.Drawing.Size(247, 32);
this.inoutAxisP1.TabIndex = 1;
//
// mideleAxisP1 // mideleAxisP1
// //
this.mideleAxisP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.mideleAxisP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -271,55 +323,68 @@ namespace OnlineStore.XLRStore ...@@ -271,55 +323,68 @@ namespace OnlineStore.XLRStore
this.mideleAxisP1.PointForeColor = System.Drawing.Color.Black; this.mideleAxisP1.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP1.PointText = "旋转轴待机点P1:"; this.mideleAxisP1.PointText = "旋转轴待机点P1:";
this.mideleAxisP1.PointValue = 0; this.mideleAxisP1.PointValue = 0;
this.mideleAxisP1.Size = new System.Drawing.Size(247, 41); this.mideleAxisP1.Size = new System.Drawing.Size(247, 33);
this.mideleAxisP1.TabIndex = 0; this.mideleAxisP1.TabIndex = 0;
// //
// updownAxisP1 // updownAxisP1
// //
this.updownAxisP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP1.Location = new System.Drawing.Point(6, 57); this.updownAxisP1.Location = new System.Drawing.Point(6, 49);
this.updownAxisP1.Name = "updownAxisP1"; this.updownAxisP1.Name = "updownAxisP1";
this.updownAxisP1.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP1.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP1.PointForeColor = System.Drawing.Color.Black; this.updownAxisP1.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP1.PointText = "升降轴-待机点P1:"; this.updownAxisP1.PointText = "升降轴-待机点P1:";
this.updownAxisP1.PointValue = 0; this.updownAxisP1.PointValue = 0;
this.updownAxisP1.Size = new System.Drawing.Size(247, 41); this.updownAxisP1.Size = new System.Drawing.Size(247, 32);
this.updownAxisP1.TabIndex = 0; this.updownAxisP1.TabIndex = 0;
// //
// groupBox9 // groupBox9
// //
this.groupBox9.Controls.Add(this.inoutAxisP6);
this.groupBox9.Controls.Add(this.updownAxisP8); this.groupBox9.Controls.Add(this.updownAxisP8);
this.groupBox9.Controls.Add(this.updownAxisP9); this.groupBox9.Controls.Add(this.updownAxisP9);
this.groupBox9.Controls.Add(this.mideleAxisP6); this.groupBox9.Controls.Add(this.mideleAxisP6);
this.groupBox9.Location = new System.Drawing.Point(600, 112); this.groupBox9.Location = new System.Drawing.Point(316, 15);
this.groupBox9.Name = "groupBox9"; this.groupBox9.Name = "groupBox9";
this.groupBox9.Size = new System.Drawing.Size(286, 144); this.groupBox9.Size = new System.Drawing.Size(286, 161);
this.groupBox9.TabIndex = 225; this.groupBox9.TabIndex = 225;
this.groupBox9.TabStop = false; this.groupBox9.TabStop = false;
this.groupBox9.Text = "NG料区点位"; this.groupBox9.Text = "NG料区点位";
// //
// inoutAxisP6
//
this.inoutAxisP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP6.Location = new System.Drawing.Point(6, 122);
this.inoutAxisP6.Name = "inoutAxisP6";
this.inoutAxisP6.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP6.PointForeColor = System.Drawing.Color.Black;
this.inoutAxisP6.PointText = "进出轴-NG料区点P9:";
this.inoutAxisP6.PointValue = 0;
this.inoutAxisP6.Size = new System.Drawing.Size(247, 33);
this.inoutAxisP6.TabIndex = 9;
//
// updownAxisP8 // updownAxisP8
// //
this.updownAxisP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP8.Location = new System.Drawing.Point(6, 54); this.updownAxisP8.Location = new System.Drawing.Point(6, 48);
this.updownAxisP8.Name = "updownAxisP8"; this.updownAxisP8.Name = "updownAxisP8";
this.updownAxisP8.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP8.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP8.PointForeColor = System.Drawing.Color.Black; this.updownAxisP8.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP8.PointText = "升降轴-NG料区放料高点P8:"; this.updownAxisP8.PointText = "升降轴-NG料区放料高点P8:";
this.updownAxisP8.PointValue = 0; this.updownAxisP8.PointValue = 0;
this.updownAxisP8.Size = new System.Drawing.Size(247, 41); this.updownAxisP8.Size = new System.Drawing.Size(247, 32);
this.updownAxisP8.TabIndex = 7; this.updownAxisP8.TabIndex = 7;
// //
// updownAxisP9 // updownAxisP9
// //
this.updownAxisP9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP9.Location = new System.Drawing.Point(6, 92); this.updownAxisP9.Location = new System.Drawing.Point(6, 84);
this.updownAxisP9.Name = "updownAxisP9"; this.updownAxisP9.Name = "updownAxisP9";
this.updownAxisP9.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP9.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP9.PointForeColor = System.Drawing.Color.Black; this.updownAxisP9.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP9.PointText = "升降轴-NG料区放料低点P9:"; this.updownAxisP9.PointText = "升降轴-NG料区放料低点P9:";
this.updownAxisP9.PointValue = 0; this.updownAxisP9.PointValue = 0;
this.updownAxisP9.Size = new System.Drawing.Size(247, 41); this.updownAxisP9.Size = new System.Drawing.Size(247, 33);
this.updownAxisP9.TabIndex = 8; this.updownAxisP9.TabIndex = 8;
// //
// mideleAxisP6 // mideleAxisP6
...@@ -331,7 +396,7 @@ namespace OnlineStore.XLRStore ...@@ -331,7 +396,7 @@ namespace OnlineStore.XLRStore
this.mideleAxisP6.PointForeColor = System.Drawing.Color.Black; this.mideleAxisP6.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP6.PointText = "旋转轴-NG料区放料点P6:"; this.mideleAxisP6.PointText = "旋转轴-NG料区放料点P6:";
this.mideleAxisP6.PointValue = 0; this.mideleAxisP6.PointValue = 0;
this.mideleAxisP6.Size = new System.Drawing.Size(247, 41); this.mideleAxisP6.Size = new System.Drawing.Size(247, 32);
this.mideleAxisP6.TabIndex = 5; this.mideleAxisP6.TabIndex = 5;
// //
// btnSave // btnSave
...@@ -339,9 +404,9 @@ namespace OnlineStore.XLRStore ...@@ -339,9 +404,9 @@ namespace OnlineStore.XLRStore
this.btnSave.BackColor = System.Drawing.Color.White; this.btnSave.BackColor = System.Drawing.Color.White;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(761, 263); this.btnSave.Location = new System.Drawing.Point(850, 297);
this.btnSave.Name = "btnSave"; this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(163, 40); this.btnSave.Size = new System.Drawing.Size(108, 34);
this.btnSave.TabIndex = 226; this.btnSave.TabIndex = 226;
this.btnSave.Text = "保存点位信息"; this.btnSave.Text = "保存点位信息";
this.btnSave.UseVisualStyleBackColor = false; this.btnSave.UseVisualStyleBackColor = false;
...@@ -349,12 +414,13 @@ namespace OnlineStore.XLRStore ...@@ -349,12 +414,13 @@ namespace OnlineStore.XLRStore
// //
// groupBox8 // groupBox8
// //
this.groupBox8.Controls.Add(this.updownAxisP17);
this.groupBox8.Controls.Add(this.updownAxisP13); this.groupBox8.Controls.Add(this.updownAxisP13);
this.groupBox8.Controls.Add(this.mideleAxisP8); this.groupBox8.Controls.Add(this.mideleAxisP8);
this.groupBox8.Controls.Add(this.updownAxisP12); this.groupBox8.Controls.Add(this.updownAxisP12);
this.groupBox8.Location = new System.Drawing.Point(302, 147); this.groupBox8.Location = new System.Drawing.Point(497, 13);
this.groupBox8.Name = "groupBox8"; this.groupBox8.Name = "groupBox8";
this.groupBox8.Size = new System.Drawing.Size(286, 144); this.groupBox8.Size = new System.Drawing.Size(415, 227);
this.groupBox8.TabIndex = 224; this.groupBox8.TabIndex = 224;
this.groupBox8.TabStop = false; this.groupBox8.TabStop = false;
this.groupBox8.Text = "B下暂存区点位"; this.groupBox8.Text = "B下暂存区点位";
...@@ -366,21 +432,21 @@ namespace OnlineStore.XLRStore ...@@ -366,21 +432,21 @@ namespace OnlineStore.XLRStore
this.updownAxisP13.Name = "updownAxisP13"; this.updownAxisP13.Name = "updownAxisP13";
this.updownAxisP13.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP13.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP13.PointForeColor = System.Drawing.Color.Black; this.updownAxisP13.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP13.PointText = "升降轴-B下暂存区取料低点P13:"; this.updownAxisP13.PointText = "升降轴-B下暂存区7寸取料低点P13:";
this.updownAxisP13.PointValue = 0; this.updownAxisP13.PointValue = 0;
this.updownAxisP13.Size = new System.Drawing.Size(266, 41); this.updownAxisP13.Size = new System.Drawing.Size(331, 32);
this.updownAxisP13.TabIndex = 12; this.updownAxisP13.TabIndex = 12;
// //
// mideleAxisP8 // mideleAxisP8
// //
this.mideleAxisP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.mideleAxisP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.mideleAxisP8.Location = new System.Drawing.Point(6, 19); this.mideleAxisP8.Location = new System.Drawing.Point(6, 22);
this.mideleAxisP8.Name = "mideleAxisP8"; this.mideleAxisP8.Name = "mideleAxisP8";
this.mideleAxisP8.PointBackColor = System.Drawing.Color.SkyBlue; this.mideleAxisP8.PointBackColor = System.Drawing.Color.SkyBlue;
this.mideleAxisP8.PointForeColor = System.Drawing.Color.Black; this.mideleAxisP8.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP8.PointText = "旋转轴-B下暂存区取料点P8:"; this.mideleAxisP8.PointText = "旋转轴-B下暂存区取料点P8:";
this.mideleAxisP8.PointValue = 0; this.mideleAxisP8.PointValue = 0;
this.mideleAxisP8.Size = new System.Drawing.Size(266, 41); this.mideleAxisP8.Size = new System.Drawing.Size(331, 32);
this.mideleAxisP8.TabIndex = 7; this.mideleAxisP8.TabIndex = 7;
// //
// updownAxisP12 // updownAxisP12
...@@ -392,21 +458,35 @@ namespace OnlineStore.XLRStore ...@@ -392,21 +458,35 @@ namespace OnlineStore.XLRStore
this.updownAxisP12.PointForeColor = System.Drawing.Color.Black; this.updownAxisP12.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP12.PointText = "升降轴-B下暂存区取料高点P12:"; this.updownAxisP12.PointText = "升降轴-B下暂存区取料高点P12:";
this.updownAxisP12.PointValue = 0; this.updownAxisP12.PointValue = 0;
this.updownAxisP12.Size = new System.Drawing.Size(266, 41); this.updownAxisP12.Size = new System.Drawing.Size(331, 32);
this.updownAxisP12.TabIndex = 11; this.updownAxisP12.TabIndex = 11;
// //
// groupBox7 // groupBox7
// //
this.groupBox7.Controls.Add(this.updownAxisP16);
this.groupBox7.Controls.Add(this.inoutAxisP3);
this.groupBox7.Controls.Add(this.mideleAxisP5); this.groupBox7.Controls.Add(this.mideleAxisP5);
this.groupBox7.Controls.Add(this.updownAxisP10); this.groupBox7.Controls.Add(this.updownAxisP10);
this.groupBox7.Controls.Add(this.updownAxisP11); this.groupBox7.Controls.Add(this.updownAxisP11);
this.groupBox7.Location = new System.Drawing.Point(302, 6); this.groupBox7.Location = new System.Drawing.Point(6, 13);
this.groupBox7.Name = "groupBox7"; this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(286, 140); this.groupBox7.Size = new System.Drawing.Size(390, 227);
this.groupBox7.TabIndex = 224; this.groupBox7.TabIndex = 224;
this.groupBox7.TabStop = false; this.groupBox7.TabStop = false;
this.groupBox7.Text = "B上暂存区点位"; this.groupBox7.Text = "B上暂存区点位";
// //
// inoutAxisP3
//
this.inoutAxisP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP3.Location = new System.Drawing.Point(6, 161);
this.inoutAxisP3.Name = "inoutAxisP3";
this.inoutAxisP3.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP3.PointForeColor = System.Drawing.Color.Black;
this.inoutAxisP3.PointText = "进出轴-B暂存区点P3:";
this.inoutAxisP3.PointValue = 0;
this.inoutAxisP3.Size = new System.Drawing.Size(316, 36);
this.inoutAxisP3.TabIndex = 11;
//
// mideleAxisP5 // mideleAxisP5
// //
this.mideleAxisP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.mideleAxisP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -416,41 +496,42 @@ namespace OnlineStore.XLRStore ...@@ -416,41 +496,42 @@ namespace OnlineStore.XLRStore
this.mideleAxisP5.PointForeColor = System.Drawing.Color.Black; this.mideleAxisP5.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP5.PointText = "旋转轴-B上暂存区放料点P5:"; this.mideleAxisP5.PointText = "旋转轴-B上暂存区放料点P5:";
this.mideleAxisP5.PointValue = 0; this.mideleAxisP5.PointValue = 0;
this.mideleAxisP5.Size = new System.Drawing.Size(266, 41); this.mideleAxisP5.Size = new System.Drawing.Size(316, 32);
this.mideleAxisP5.TabIndex = 4; this.mideleAxisP5.TabIndex = 4;
// //
// updownAxisP10 // updownAxisP10
// //
this.updownAxisP10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP10.Location = new System.Drawing.Point(6, 56); this.updownAxisP10.Location = new System.Drawing.Point(6, 49);
this.updownAxisP10.Name = "updownAxisP10"; this.updownAxisP10.Name = "updownAxisP10";
this.updownAxisP10.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP10.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP10.PointForeColor = System.Drawing.Color.Black; this.updownAxisP10.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP10.PointText = "升降轴-B上暂存区放料高点P10:"; this.updownAxisP10.PointText = "升降轴-B上暂存区放料高点P10:";
this.updownAxisP10.PointValue = 0; this.updownAxisP10.PointValue = 0;
this.updownAxisP10.Size = new System.Drawing.Size(266, 41); this.updownAxisP10.Size = new System.Drawing.Size(316, 32);
this.updownAxisP10.TabIndex = 9; this.updownAxisP10.TabIndex = 9;
// //
// updownAxisP11 // updownAxisP11
// //
this.updownAxisP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP11.Location = new System.Drawing.Point(6, 94); this.updownAxisP11.Location = new System.Drawing.Point(6, 81);
this.updownAxisP11.Name = "updownAxisP11"; this.updownAxisP11.Name = "updownAxisP11";
this.updownAxisP11.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP11.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP11.PointForeColor = System.Drawing.Color.Black; this.updownAxisP11.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP11.PointText = "升降轴-B上暂存区放料低点P11:"; this.updownAxisP11.PointText = "升降轴-B上暂存区7寸放料低点P11:";
this.updownAxisP11.PointValue = 0; this.updownAxisP11.PointValue = 0;
this.updownAxisP11.Size = new System.Drawing.Size(266, 41); this.updownAxisP11.Size = new System.Drawing.Size(316, 34);
this.updownAxisP11.TabIndex = 10; this.updownAxisP11.TabIndex = 10;
// //
// groupBox5 // groupBox5
// //
this.groupBox5.Controls.Add(this.updownAxisP15);
this.groupBox5.Controls.Add(this.mideleAxisP7); this.groupBox5.Controls.Add(this.mideleAxisP7);
this.groupBox5.Controls.Add(this.updownAxisP6); this.groupBox5.Controls.Add(this.updownAxisP6);
this.groupBox5.Controls.Add(this.updownAxisP7); this.groupBox5.Controls.Add(this.updownAxisP7);
this.groupBox5.Location = new System.Drawing.Point(7, 147); this.groupBox5.Location = new System.Drawing.Point(470, 13);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(286, 144); this.groupBox5.Size = new System.Drawing.Size(481, 239);
this.groupBox5.TabIndex = 223; this.groupBox5.TabIndex = 223;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "A下暂存区点位"; this.groupBox5.Text = "A下暂存区点位";
...@@ -458,51 +539,65 @@ namespace OnlineStore.XLRStore ...@@ -458,51 +539,65 @@ namespace OnlineStore.XLRStore
// mideleAxisP7 // mideleAxisP7
// //
this.mideleAxisP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.mideleAxisP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.mideleAxisP7.Location = new System.Drawing.Point(6, 16); this.mideleAxisP7.Location = new System.Drawing.Point(14, 24);
this.mideleAxisP7.Name = "mideleAxisP7"; this.mideleAxisP7.Name = "mideleAxisP7";
this.mideleAxisP7.PointBackColor = System.Drawing.Color.SkyBlue; this.mideleAxisP7.PointBackColor = System.Drawing.Color.SkyBlue;
this.mideleAxisP7.PointForeColor = System.Drawing.Color.Black; this.mideleAxisP7.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP7.PointText = "旋转轴-A下暂存区取料点P7:"; this.mideleAxisP7.PointText = "旋转轴-A下暂存区取料点P7:";
this.mideleAxisP7.PointValue = 0; this.mideleAxisP7.PointValue = 0;
this.mideleAxisP7.Size = new System.Drawing.Size(266, 41); this.mideleAxisP7.Size = new System.Drawing.Size(327, 32);
this.mideleAxisP7.TabIndex = 6; this.mideleAxisP7.TabIndex = 6;
// //
// updownAxisP6 // updownAxisP6
// //
this.updownAxisP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP6.Location = new System.Drawing.Point(6, 54); this.updownAxisP6.Location = new System.Drawing.Point(14, 56);
this.updownAxisP6.Name = "updownAxisP6"; this.updownAxisP6.Name = "updownAxisP6";
this.updownAxisP6.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP6.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP6.PointForeColor = System.Drawing.Color.Black; this.updownAxisP6.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP6.PointText = "升降轴-A下暂存区取料高点P6:"; this.updownAxisP6.PointText = "升降轴-A下暂存区取料高点P6:";
this.updownAxisP6.PointValue = 0; this.updownAxisP6.PointValue = 0;
this.updownAxisP6.Size = new System.Drawing.Size(266, 41); this.updownAxisP6.Size = new System.Drawing.Size(327, 33);
this.updownAxisP6.TabIndex = 5; this.updownAxisP6.TabIndex = 5;
// //
// updownAxisP7 // updownAxisP7
// //
this.updownAxisP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP7.Location = new System.Drawing.Point(6, 92); this.updownAxisP7.Location = new System.Drawing.Point(14, 88);
this.updownAxisP7.Name = "updownAxisP7"; this.updownAxisP7.Name = "updownAxisP7";
this.updownAxisP7.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP7.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP7.PointForeColor = System.Drawing.Color.Black; this.updownAxisP7.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP7.PointText = "升降轴-A下暂存区取料低点P7:"; this.updownAxisP7.PointText = "升降轴-A下暂存区7寸取料低点P7:";
this.updownAxisP7.PointValue = 0; this.updownAxisP7.PointValue = 0;
this.updownAxisP7.Size = new System.Drawing.Size(266, 41); this.updownAxisP7.Size = new System.Drawing.Size(327, 35);
this.updownAxisP7.TabIndex = 6; this.updownAxisP7.TabIndex = 6;
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.updownAxisP14);
this.groupBox2.Controls.Add(this.inoutAxisP2);
this.groupBox2.Controls.Add(this.mideleAxisP4); this.groupBox2.Controls.Add(this.mideleAxisP4);
this.groupBox2.Controls.Add(this.updownAxisP4); this.groupBox2.Controls.Add(this.updownAxisP4);
this.groupBox2.Controls.Add(this.updownAxisP5); this.groupBox2.Controls.Add(this.updownAxisP5);
this.groupBox2.Location = new System.Drawing.Point(7, 6); this.groupBox2.Location = new System.Drawing.Point(6, 13);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(286, 140); this.groupBox2.Size = new System.Drawing.Size(406, 239);
this.groupBox2.TabIndex = 222; this.groupBox2.TabIndex = 222;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "A上暂存区点位"; this.groupBox2.Text = "A上暂存区点位";
// //
// inoutAxisP2
//
this.inoutAxisP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.inoutAxisP2.Location = new System.Drawing.Point(6, 163);
this.inoutAxisP2.Name = "inoutAxisP2";
this.inoutAxisP2.PointBackColor = System.Drawing.Color.RoyalBlue;
this.inoutAxisP2.PointForeColor = System.Drawing.Color.Black;
this.inoutAxisP2.PointText = "进出轴-A暂存区点P2:";
this.inoutAxisP2.PointValue = 0;
this.inoutAxisP2.Size = new System.Drawing.Size(306, 36);
this.inoutAxisP2.TabIndex = 5;
//
// mideleAxisP4 // mideleAxisP4
// //
this.mideleAxisP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.mideleAxisP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -512,31 +607,31 @@ namespace OnlineStore.XLRStore ...@@ -512,31 +607,31 @@ namespace OnlineStore.XLRStore
this.mideleAxisP4.PointForeColor = System.Drawing.Color.Black; this.mideleAxisP4.PointForeColor = System.Drawing.Color.Black;
this.mideleAxisP4.PointText = "旋转轴-A上暂存区放料点P4:"; this.mideleAxisP4.PointText = "旋转轴-A上暂存区放料点P4:";
this.mideleAxisP4.PointValue = 0; this.mideleAxisP4.PointValue = 0;
this.mideleAxisP4.Size = new System.Drawing.Size(266, 41); this.mideleAxisP4.Size = new System.Drawing.Size(306, 32);
this.mideleAxisP4.TabIndex = 3; this.mideleAxisP4.TabIndex = 3;
// //
// updownAxisP4 // updownAxisP4
// //
this.updownAxisP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP4.Location = new System.Drawing.Point(6, 57); this.updownAxisP4.Location = new System.Drawing.Point(6, 49);
this.updownAxisP4.Name = "updownAxisP4"; this.updownAxisP4.Name = "updownAxisP4";
this.updownAxisP4.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP4.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP4.PointForeColor = System.Drawing.Color.Black; this.updownAxisP4.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP4.PointText = "升降轴-A上暂存区放料高点P4:"; this.updownAxisP4.PointText = "升降轴-A上暂存区放料高点P4:";
this.updownAxisP4.PointValue = 0; this.updownAxisP4.PointValue = 0;
this.updownAxisP4.Size = new System.Drawing.Size(266, 41); this.updownAxisP4.Size = new System.Drawing.Size(306, 32);
this.updownAxisP4.TabIndex = 3; this.updownAxisP4.TabIndex = 3;
// //
// updownAxisP5 // updownAxisP5
// //
this.updownAxisP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.updownAxisP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP5.Location = new System.Drawing.Point(6, 95); this.updownAxisP5.Location = new System.Drawing.Point(6, 79);
this.updownAxisP5.Name = "updownAxisP5"; this.updownAxisP5.Name = "updownAxisP5";
this.updownAxisP5.PointBackColor = System.Drawing.Color.LightGreen; this.updownAxisP5.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP5.PointForeColor = System.Drawing.Color.Black; this.updownAxisP5.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP5.PointText = "升降轴-A上暂存区放料低点P5:"; this.updownAxisP5.PointText = "升降轴-A上暂存区7寸放料低点P5:";
this.updownAxisP5.PointValue = 0; this.updownAxisP5.PointValue = 0;
this.updownAxisP5.Size = new System.Drawing.Size(266, 41); this.updownAxisP5.Size = new System.Drawing.Size(306, 36);
this.updownAxisP5.TabIndex = 4; this.updownAxisP5.TabIndex = 4;
// //
// axisMoveControl1 // axisMoveControl1
...@@ -1282,6 +1377,100 @@ namespace OnlineStore.XLRStore ...@@ -1282,6 +1377,100 @@ namespace OnlineStore.XLRStore
this.tabControl1.TabIndex = 257; this.tabControl1.TabIndex = 257;
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
// //
// tabControl2
//
this.tabControl2.Controls.Add(this.tabPage4);
this.tabControl2.Controls.Add(this.tabPage5);
this.tabControl2.Controls.Add(this.tabPage6);
this.tabControl2.Location = new System.Drawing.Point(3, 3);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
this.tabControl2.Size = new System.Drawing.Size(979, 288);
this.tabControl2.TabIndex = 230;
//
// tabPage4
//
this.tabPage4.Controls.Add(this.groupBox2);
this.tabPage4.Controls.Add(this.groupBox5);
this.tabPage4.Location = new System.Drawing.Point(4, 26);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
this.tabPage4.Size = new System.Drawing.Size(971, 258);
this.tabPage4.TabIndex = 0;
this.tabPage4.Text = "A暂存区";
this.tabPage4.UseVisualStyleBackColor = true;
//
// tabPage5
//
this.tabPage5.Controls.Add(this.groupBox7);
this.tabPage5.Controls.Add(this.groupBox8);
this.tabPage5.Location = new System.Drawing.Point(4, 26);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(971, 258);
this.tabPage5.TabIndex = 1;
this.tabPage5.Text = "B暂存区";
this.tabPage5.UseVisualStyleBackColor = true;
//
// tabPage6
//
this.tabPage6.Controls.Add(this.groupBox10);
this.tabPage6.Controls.Add(this.groupBox9);
this.tabPage6.Location = new System.Drawing.Point(4, 26);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Size = new System.Drawing.Size(971, 258);
this.tabPage6.TabIndex = 2;
this.tabPage6.Text = "NG/待机";
this.tabPage6.UseVisualStyleBackColor = true;
//
// updownAxisP14
//
this.updownAxisP14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP14.Location = new System.Drawing.Point(6, 121);
this.updownAxisP14.Name = "updownAxisP14";
this.updownAxisP14.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP14.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP14.PointText = "升降轴-A上暂存区13寸放料低点P14:";
this.updownAxisP14.PointValue = 0;
this.updownAxisP14.Size = new System.Drawing.Size(306, 36);
this.updownAxisP14.TabIndex = 6;
//
// updownAxisP15
//
this.updownAxisP15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP15.Location = new System.Drawing.Point(14, 129);
this.updownAxisP15.Name = "updownAxisP15";
this.updownAxisP15.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP15.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP15.PointText = "升降轴-A下暂存区13寸取料低点P15:";
this.updownAxisP15.PointValue = 0;
this.updownAxisP15.Size = new System.Drawing.Size(327, 35);
this.updownAxisP15.TabIndex = 7;
//
// updownAxisP16
//
this.updownAxisP16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP16.Location = new System.Drawing.Point(6, 121);
this.updownAxisP16.Name = "updownAxisP16";
this.updownAxisP16.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP16.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP16.PointText = "升降轴-B上暂存区13寸放料低点:";
this.updownAxisP16.PointValue = 0;
this.updownAxisP16.Size = new System.Drawing.Size(316, 34);
this.updownAxisP16.TabIndex = 12;
//
// updownAxisP17
//
this.updownAxisP17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.updownAxisP17.Location = new System.Drawing.Point(6, 133);
this.updownAxisP17.Name = "updownAxisP17";
this.updownAxisP17.PointBackColor = System.Drawing.Color.LightGreen;
this.updownAxisP17.PointForeColor = System.Drawing.Color.Black;
this.updownAxisP17.PointText = "升降轴-B下暂存区13寸取料低点P17:";
this.updownAxisP17.PointValue = 0;
this.updownAxisP17.Size = new System.Drawing.Size(331, 32);
this.updownAxisP17.TabIndex = 13;
//
// FrmInputEquip // FrmInputEquip
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
...@@ -1321,6 +1510,10 @@ namespace OnlineStore.XLRStore ...@@ -1321,6 +1510,10 @@ namespace OnlineStore.XLRStore
this.groupBox12.ResumeLayout(false); this.groupBox12.ResumeLayout(false);
this.groupBox12.PerformLayout(); this.groupBox12.PerformLayout();
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabControl2.ResumeLayout(false);
this.tabPage4.ResumeLayout(false);
this.tabPage5.ResumeLayout(false);
this.tabPage6.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
...@@ -1418,6 +1611,20 @@ namespace OnlineStore.XLRStore ...@@ -1418,6 +1611,20 @@ namespace OnlineStore.XLRStore
protected System.Windows.Forms.CheckBox checkBox1; protected System.Windows.Forms.CheckBox checkBox1;
private System.Windows.Forms.Button btnClampRelax; private System.Windows.Forms.Button btnClampRelax;
private System.Windows.Forms.Button btnClampWork; private System.Windows.Forms.Button btnClampWork;
private AxisPointControl inoutAxisP5;
private AxisPointControl inoutAxisP4;
private AxisPointControl inoutAxisP1;
private AxisPointControl inoutAxisP6;
private AxisPointControl inoutAxisP3;
private AxisPointControl inoutAxisP2;
private System.Windows.Forms.TabControl tabControl2;
private System.Windows.Forms.TabPage tabPage4;
private AxisPointControl updownAxisP14;
private AxisPointControl updownAxisP15;
private System.Windows.Forms.TabPage tabPage5;
private AxisPointControl updownAxisP16;
private AxisPointControl updownAxisP17;
private System.Windows.Forms.TabPage tabPage6;
} }
} }
...@@ -331,7 +331,7 @@ namespace OnlineStore.XLRStore ...@@ -331,7 +331,7 @@ namespace OnlineStore.XLRStore
clampJawControl1.ShowData(); 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); FrmBatchMove frmMove1 = new FrmBatchMove(inputEquip.BatchMove_A);
AddForm(tabControl1, " " + inputEquip.BatchMove_A.Name + " ", frmMove1); AddForm(tabControl1, " " + inputEquip.BatchMove_A.Name + " ", frmMove1);
...@@ -358,16 +358,27 @@ namespace OnlineStore.XLRStore ...@@ -358,16 +358,27 @@ namespace OnlineStore.XLRStore
updownAxisP2.SetMoveData(inputEquip.UpdownAxis, config.Updown_P2_Speed,config.Updown_P2_ATake); updownAxisP2.SetMoveData(inputEquip.UpdownAxis, config.Updown_P2_Speed,config.Updown_P2_ATake);
updownAxisP3.SetMoveData(inputEquip.UpdownAxis, config.Updown_P3_Speed,config.Updown_P3_BTake); updownAxisP3.SetMoveData(inputEquip.UpdownAxis, config.Updown_P3_Speed,config.Updown_P3_BTake);
updownAxisP4.SetMoveData(inputEquip.UpdownAxis, config.Updown_P4_Speed,config.Updown_P4_AUpperH); 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); 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); updownAxisP8.SetMoveData(inputEquip.UpdownAxis, config.Updown_P8_Speed,config.Updown_P8_NGH);
updownAxisP9.SetMoveData(inputEquip.UpdownAxis, config.Updown_P9_Speed,config.Updown_P9_NGL); updownAxisP9.SetMoveData(inputEquip.UpdownAxis, config.Updown_P9_Speed,config.Updown_P9_NGL);
updownAxisP10.SetMoveData(inputEquip.UpdownAxis, config.Updown_P10_Speed,config.Updown_P10_BUpperH); 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); 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) protected void AddForm(TabControl tabcon, string text, Form form)
{ {
...@@ -583,15 +594,19 @@ namespace OnlineStore.XLRStore ...@@ -583,15 +594,19 @@ namespace OnlineStore.XLRStore
inputEquip.Config.Updown_P2_ATake = updownAxisP2.PointValue; inputEquip.Config.Updown_P2_ATake = updownAxisP2.PointValue;
inputEquip.Config.Updown_P3_BTake = updownAxisP3.PointValue; inputEquip.Config.Updown_P3_BTake = updownAxisP3.PointValue;
inputEquip.Config.Updown_P4_AUpperH = updownAxisP4.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_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_P8_NGH = updownAxisP8.PointValue;
inputEquip.Config.Updown_P9_NGL = updownAxisP9.PointValue; inputEquip.Config.Updown_P9_NGL = updownAxisP9.PointValue;
inputEquip.Config.Updown_P10_BUpperH = updownAxisP10.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_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_P1 = mideleAxisP1.PointValue;
inputEquip.Config.Middle_P2_ATake = mideleAxisP2.PointValue; inputEquip.Config.Middle_P2_ATake = mideleAxisP2.PointValue;
...@@ -602,6 +617,12 @@ namespace OnlineStore.XLRStore ...@@ -602,6 +617,12 @@ namespace OnlineStore.XLRStore
inputEquip.Config.Middle_P7_AUnder = mideleAxisP7.PointValue; inputEquip.Config.Middle_P7_AUnder = mideleAxisP7.PointValue;
inputEquip.Config.Middle_P8_BUnder = mideleAxisP8.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); StoreManager.SaveInputEquipConfig(inputEquip.Config);
MessageBox.Show("保存成功"); MessageBox.Show("保存成功");
...@@ -765,6 +786,7 @@ namespace OnlineStore.XLRStore ...@@ -765,6 +786,7 @@ namespace OnlineStore.XLRStore
{ {
inputEquip.ClampRelax(null); inputEquip.ClampRelax(null);
} }
} }
} }
......
...@@ -149,9 +149,9 @@ namespace OnlineStore.XLRStore ...@@ -149,9 +149,9 @@ namespace OnlineStore.XLRStore
MessageBox.Show("无法对行走机构进行回原操作,因进料防护门未开", "警告", MessageBoxButtons.OK); MessageBox.Show("无法对行走机构进行回原操作,因进料防护门未开", "警告", MessageBoxButtons.OK);
return false; 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; return false;
} }
break; break;
......
...@@ -45,7 +45,7 @@ namespace OnlineStore.XLRStore.useControl ...@@ -45,7 +45,7 @@ namespace OnlineStore.XLRStore.useControl
this.btnMove.Location = new System.Drawing.Point(3, 3); this.btnMove.Location = new System.Drawing.Point(3, 3);
this.btnMove.Name = "btnMove"; this.btnMove.Name = "btnMove";
this.btnMove.RightToLeft = System.Windows.Forms.RightToLeft.No; 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.TabIndex = 315;
this.btnMove.Text = "上升待机点P1:"; this.btnMove.Text = "上升待机点P1:";
this.btnMove.UseVisualStyleBackColor = true; this.btnMove.UseVisualStyleBackColor = true;
...@@ -58,7 +58,7 @@ namespace OnlineStore.XLRStore.useControl ...@@ -58,7 +58,7 @@ namespace OnlineStore.XLRStore.useControl
this.txtPoint.Cursor = System.Windows.Forms.Cursors.IBeam; 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.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.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.MaxLength = 12;
this.txtPoint.Name = "txtPoint"; this.txtPoint.Name = "txtPoint";
this.txtPoint.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtPoint.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -73,7 +73,7 @@ namespace OnlineStore.XLRStore.useControl ...@@ -73,7 +73,7 @@ namespace OnlineStore.XLRStore.useControl
this.Controls.Add(this.txtPoint); this.Controls.Add(this.txtPoint);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "AxisPointControl"; this.Name = "AxisPointControl";
this.Size = new System.Drawing.Size(233, 41); this.Size = new System.Drawing.Size(233, 34);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!