Skip to content

李娜 / SO908-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit b92723d4 由 LN
选项

增加光栅处理。出入库增加耗时打印

1 个父辈 8a22b7d4
内嵌 并排
正在显示 10 个修改的文件 包含 538 行增加 和 405 行删除
source/Common/Setting_Init.cs
...@@ -113,5 +113,6 @@ namespace OnlineStore.Common ...@@ -113,5 +113,6 @@ namespace OnlineStore.Common
public static string AShelfInfo = "AShelfInfo"; public static string AShelfInfo = "AShelfInfo";
public static string BShelfInfo = "BShelfInfo"; public static string BShelfInfo = "BShelfInfo";
public static string UseSecurityAccess = "UseSecurityAccess";
} }
} }
source/DeviceLibrary/Config/Config_BoxEquip.csv
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位 类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,0,行走机构,MoveAxis,0,HC,,15000,300000,200000,5000,30000,60000,10,100,0,0 AXIS,0,行走机构,MoveAxis,0,HC,,15000,300000,200000,5000,30000,60000,10,100,0,0
AXIS,0,料斗拉取进出轴,PullAxis_Inout,1,HC,,50000,130000,130000,5000,50000,100000,10,100,0,0 AXIS,0,料斗拉取进出轴,PullAxis_Inout,1,HC,,50000,130000,130000,5000,50000,100000,10,100,0,0
AXIS,0,移栽升降轴,UpdownAxis,2,HC,,150000,1000000,800000,2000,20000,50000,10,100,0,0 AXIS,0,移栽升降轴,UpdownAxis,2,HC,,150000,1000000,800000,2000,20000,50000,10,100,0,0
...@@ -12,10 +12,10 @@ AXIS,0,B面移栽压紧轴,ComAxis_B,9,HC,,20000,50000,50000,2000,10000,20000,10 ...@@ -12,10 +12,10 @@ AXIS,0,B面移栽压紧轴,ComAxis_B,9,HC,,20000,50000,50000,2000,10000,20000,10
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,,,,,,,, PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,,,,,,,,
PRO,0,温湿度端口号,Humiture_Port,0,,,,,,,,,,,, PRO,0,温湿度端口号,Humiture_Port,0,,,,,,,,,,,,
PRO,0,抽屉Mark_X坐标,Drawer_X,962.07,,,,,,,,,,,, PRO,0,抽屉Mark_X坐标,Drawer_X,999.91,,,,,,,,,,,,
PRO,0,抽屉Mark_Y坐标,Drawer_Y,862.94,,,,,,,,,,,, PRO,0,抽屉Mark_Y坐标,Drawer_Y,876.22,,,,,,,,,,,,
PRO,0,抽屉Mark_X方向误差范围,Drawer_X_Error,3,,,,,,,,,,,, PRO,0,抽屉Mark_X方向误差范围,Drawer_X_Error,20000,,,,,,,,,,,,
PRO,0,抽屉Mark_Y方向误差范围,Drawer_Y_Error,3,,,,,,,,,,,, PRO,0,抽屉Mark_Y方向误差范围,Drawer_Y_Error,20000,,,,,,,,,,,,
PRO,0,抽屉行间距,Row_Spacing,850000,,,,,,,,,,,, PRO,0,抽屉行间距,Row_Spacing,850000,,,,,,,,,,,,
PRO,0,抽屉列间距,Column_Spacing,333300,,,,,,,,,,,, PRO,0,抽屉列间距,Column_Spacing,333300,,,,,,,,,,,,
PRO,0,抽屉层数,Drawer_Rows,15,,,,,,,,,,,, PRO,0,抽屉层数,Drawer_Rows,15,,,,,,,,,,,,
...@@ -35,7 +35,7 @@ PRO,0,移栽升降轴_A下暂存区放料低点P5,Updown_P5,670000,,,,,,,,,,,, ...@@ -35,7 +35,7 @@ PRO,0,移栽升降轴_A下暂存区放料低点P5,Updown_P5,670000,,,,,,,,,,,,
PRO,0,移栽升降轴_B上暂存区取料高点P8,Updown_P8,1506534,,,,,,,,,,,, PRO,0,移栽升降轴_B上暂存区取料高点P8,Updown_P8,1506534,,,,,,,,,,,,
PRO,0,移栽升降轴_B上暂存区取料低点P9,Updown_P9,1338069,,,,,,,,,,,, PRO,0,移栽升降轴_B上暂存区取料低点P9,Updown_P9,1338069,,,,,,,,,,,,
PRO,0,移栽升降轴_B下暂存区取料高点P10,Updown_P10,827531,,,,,,,,,,,, PRO,0,移栽升降轴_B下暂存区取料高点P10,Updown_P10,827531,,,,,,,,,,,,
PRO,0,移栽升降轴_B下暂存区取料低点P11,Updown_P11,660000,,,,,,,,,,,, PRO,0,移栽升降轴_B下暂存区取料低点P11,Updown_P11,651000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,料斗拉取升降轴_待机点P1,PullAxis_Updown_P1,0,,,,,,,,,,,, PRO,0,料斗拉取升降轴_待机点P1,PullAxis_Updown_P1,0,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
...@@ -46,7 +46,7 @@ PRO,0,A面移栽旋转轴_待机点P1,MiddleAxis_A_P1,-918,,,,,,,,,,,, ...@@ -46,7 +46,7 @@ PRO,0,A面移栽旋转轴_待机点P1,MiddleAxis_A_P1,-918,,,,,,,,,,,,
PRO,0,A面移栽旋转轴_A进出料暂存区取放料水平点P2,MiddleAxis_A_P2,95000,,,,,,,,,,,, PRO,0,A面移栽旋转轴_A进出料暂存区取放料水平点P2,MiddleAxis_A_P2,95000,,,,,,,,,,,,
PRO,0,A面移栽旋转轴_A面料屉库位垂直取放料点P3,MiddleAxis_A_P3,-918,,,,,,,,,,,, PRO,0,A面移栽旋转轴_A面料屉库位垂直取放料点P3,MiddleAxis_A_P3,-918,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,A面移栽压紧轴_待机点P1,ComAxis_A_P1,10000,,,,,,,,,,,, PRO,0,A面移栽压紧轴_待机点P1,ComAxis_A_P1,9000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,B面移栽X轴_待机点P1,XAxis_B_P1,661000,,,,,,,,,,,, PRO,0,B面移栽X轴_待机点P1,XAxis_B_P1,661000,,,,,,,,,,,,
...@@ -56,7 +56,7 @@ PRO,0,B面移栽旋转轴_待机点P1,MiddleAxis_B_P1,-2000,,,,,,,,,,,, ...@@ -56,7 +56,7 @@ PRO,0,B面移栽旋转轴_待机点P1,MiddleAxis_B_P1,-2000,,,,,,,,,,,,
PRO,0,B面移栽旋转轴_B进出料暂存区取放料水平点P2,MiddleAxis_B_P2,95000,,,,,,,,,,,, PRO,0,B面移栽旋转轴_B进出料暂存区取放料水平点P2,MiddleAxis_B_P2,95000,,,,,,,,,,,,
PRO,0,B面移栽旋转轴_B面料屉库位垂直取放料点P3,MiddleAxis_B_P3,-2000,,,,,,,,,,,, PRO,0,B面移栽旋转轴_B面料屉库位垂直取放料点P3,MiddleAxis_B_P3,-2000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,B面移栽压紧轴_待机点P1,ComAxis_B_P1,10000,,,,,,,,,,,, PRO,0,B面移栽压紧轴_待机点P1,ComAxis_B_P1,8000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,行走机构_P1速度,MoveAxis_P1_Speed,100000,,,,,,,,,,,, PRO,0,行走机构_P1速度,MoveAxis_P1_Speed,100000,,,,,,,,,,,,
PRO,0,行走机构_P2速度,MoveAxis_P2_Speed,100000,,,,,,,,,,,, PRO,0,行走机构_P2速度,MoveAxis_P2_Speed,100000,,,,,,,,,,,,
...@@ -64,9 +64,9 @@ PRO,0,行走机构_P3速度,MoveAxis_P3_Speed,100000,,,,,,,,,,,, ...@@ -64,9 +64,9 @@ PRO,0,行走机构_P3速度,MoveAxis_P3_Speed,100000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,料斗拉取进出轴_P1速度,PullAxis_Inout_P1_Speed,100000,,,,,,,,,,,, PRO,0,料斗拉取进出轴_P1速度,PullAxis_Inout_P1_Speed,100000,,,,,,,,,,,,
PRO,0,料斗拉取进出轴_P2速度,PullAxis_Inout_P2_Speed,100000,,,,,,,,,,,, PRO,0,料斗拉取进出轴_P2速度,PullAxis_Inout_P2_Speed,100000,,,,,,,,,,,,
PRO,0,料斗拉取进出轴_P3速度,PullAxis_Inout_P3_Speed,80000,,,,,,,,,,,, PRO,0,料斗拉取进出轴_P3速度,PullAxis_Inout_P3_Speed,120000,,,,,,,,,,,,
PRO,0,料斗拉取进出轴_P4速度,PullAxis_Inout_P4_Speed,100000,,,,,,,,,,,, PRO,0,料斗拉取进出轴_P4速度,PullAxis_Inout_P4_Speed,100000,,,,,,,,,,,,
PRO,0,料斗拉取进出轴_P5速度,PullAxis_Inout_P5_Speed,80000,,,,,,,,,,,, PRO,0,料斗拉取进出轴_P5速度,PullAxis_Inout_P5_Speed,100000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,移栽升降轴_P1速度,Updown_P1_Speed,200000,,,,,,,,,,,, PRO,0,移栽升降轴_P1速度,Updown_P1_Speed,200000,,,,,,,,,,,,
PRO,0,移栽升降轴_P2速度,Updown_P2_Speed,100000,,,,,,,,,,,, PRO,0,移栽升降轴_P2速度,Updown_P2_Speed,100000,,,,,,,,,,,,
...@@ -79,7 +79,7 @@ PRO,0,移栽升降轴_P8速度,Updown_P8_Speed,100000,,,,,,,,,,,, ...@@ -79,7 +79,7 @@ PRO,0,移栽升降轴_P8速度,Updown_P8_Speed,100000,,,,,,,,,,,,
PRO,0,移栽升降轴_P9速度,Updown_P9_Speed,150000,,,,,,,,,,,, PRO,0,移栽升降轴_P9速度,Updown_P9_Speed,150000,,,,,,,,,,,,
PRO,0,移栽升降轴_P10速度,Updown_P10_Speed,100000,,,,,,,,,,,, PRO,0,移栽升降轴_P10速度,Updown_P10_Speed,100000,,,,,,,,,,,,
PRO,0,移栽升降轴_P11速度,Updown_P11_Speed,150000,,,,,,,,,,,, PRO,0,移栽升降轴_P11速度,Updown_P11_Speed,150000,,,,,,,,,,,,
PRO,0,移栽升降轴_P12速度,Updown_P12_Speed,200000,,,,,,,,,,,, PRO,0,移栽升降轴_P12速度,Updown_P12_Speed,300000,,,,,,,,,,,,
PRO,0,移栽升降轴_P13速度,Updown_P13_Speed,150000,,,,,,,,,,,, PRO,0,移栽升降轴_P13速度,Updown_P13_Speed,150000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,料斗拉取升降轴_P1速度,PullAxis_Updown_P1_Speed,200000,,,,,,,,,,,, PRO,0,料斗拉取升降轴_P1速度,PullAxis_Updown_P1_Speed,200000,,,,,,,,,,,,
...@@ -87,9 +87,9 @@ PRO,0,料斗拉取升降轴_P2速度,PullAxis_Updown_P2_Speed,400000,,,,,,,,,,,, ...@@ -87,9 +87,9 @@ PRO,0,料斗拉取升降轴_P2速度,PullAxis_Updown_P2_Speed,400000,,,,,,,,,,,,
PRO,0,料斗拉取升降轴_P3速度,PullAxis_Updown_P3_Speed,400000,,,,,,,,,,,, PRO,0,料斗拉取升降轴_P3速度,PullAxis_Updown_P3_Speed,400000,,,,,,,,,,,,
PRO,0,料斗拉取升降轴_P4速度,PullAxis_Updown_P4_Speed,400000,,,,,,,,,,,, PRO,0,料斗拉取升降轴_P4速度,PullAxis_Updown_P4_Speed,400000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,A面移栽X轴_P1速度,XAxis_A_P1_Speed,100000,,,,,,,,,,,, PRO,0,A面移栽X轴_P1速度,XAxis_A_P1_Speed,400000,,,,,,,,,,,,
PRO,0,A面移栽X轴_P2速度,XAxis_A_P2_Speed,100000,,,,,,,,,,,, PRO,0,A面移栽X轴_P2速度,XAxis_A_P2_Speed,400000,,,,,,,,,,,,
PRO,0,A面移栽X轴_P3速度,XAxis_A_P3_Speed,100000,,,,,,,,,,,, PRO,0,A面移栽X轴_P3速度,XAxis_A_P3_Speed,400000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,A面移栽旋转轴_P1速度,MiddleAxis_A_P1_Speed,20000,,,,,,,,,,,, PRO,0,A面移栽旋转轴_P1速度,MiddleAxis_A_P1_Speed,20000,,,,,,,,,,,,
PRO,0,A面移栽旋转轴_P2速度,MiddleAxis_A_P2_Speed,60000,,,,,,,,,,,, PRO,0,A面移栽旋转轴_P2速度,MiddleAxis_A_P2_Speed,60000,,,,,,,,,,,,
...@@ -99,17 +99,17 @@ PRO,0,A面移栽压紧轴_P1速度,ComAxis_A_P1_Speed,20000,,,,,,,,,,,, ...@@ -99,17 +99,17 @@ PRO,0,A面移栽压紧轴_P1速度,ComAxis_A_P1_Speed,20000,,,,,,,,,,,,
PRO,0,A面移栽压紧轴_P2速度,ComAxis_A_P2_Speed,20000,,,,,,,,,,,, PRO,0,A面移栽压紧轴_P2速度,ComAxis_A_P2_Speed,20000,,,,,,,,,,,,
PRO,0,A面移栽压紧轴_P3速度,ComAxis_A_P3_Speed,20000,,,,,,,,,,,, PRO,0,A面移栽压紧轴_P3速度,ComAxis_A_P3_Speed,20000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,B面移栽X轴_P1速度,XAxis_B_P1_Speed,400000,,,,,,,,,,,, PRO,0,B面移栽X轴_P1速度,XAxis_B_P1_Speed,800000,,,,,,,,,,,,
PRO,0,B面移栽X轴_P2速度,XAxis_B_P2_Speed,400000,,,,,,,,,,,, PRO,0,B面移栽X轴_P2速度,XAxis_B_P2_Speed,800000,,,,,,,,,,,,
PRO,0,B面移栽X轴_P3速度,XAxis_B_P3_Speed,400000,,,,,,,,,,,, PRO,0,B面移栽X轴_P3速度,XAxis_B_P3_Speed,800000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,B面移栽旋转轴_P1速度,MiddleAxis_B_P1_Speed,80000,,,,,,,,,,,, PRO,0,B面移栽旋转轴_P1速度,MiddleAxis_B_P1_Speed,120000,,,,,,,,,,,,
PRO,0,B面移栽旋转轴_P2速度,MiddleAxis_B_P2_Speed,80000,,,,,,,,,,,, PRO,0,B面移栽旋转轴_P2速度,MiddleAxis_B_P2_Speed,120000,,,,,,,,,,,,
PRO,0,B面移栽旋转轴_P3速度,MiddleAxis_B_P3_Speed,80000,,,,,,,,,,,, PRO,0,B面移栽旋转轴_P3速度,MiddleAxis_B_P3_Speed,120000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,B面移栽压紧轴_P1速度,ComAxis_B_P1_Speed,40000,,,,,,,,,,,, PRO,0,B面移栽压紧轴_P1速度,ComAxis_B_P1_Speed,60000,,,,,,,,,,,,
PRO,0,B面移栽压紧轴_P2速度,ComAxis_B_P2_Speed,40000,,,,,,,,,,,, PRO,0,B面移栽压紧轴_P2速度,ComAxis_B_P2_Speed,60000,,,,,,,,,,,,
PRO,0,B面移栽压紧轴_P3速度,ComAxis_B_P3_Speed,40000,,,,,,,,,,,, PRO,0,B面移栽压紧轴_P3速度,ComAxis_B_P3_Speed,60000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,A面料屉拉取进出轴_拍照点,PullAxis_Inout_CamA,10000,,,,,,,,,,,, PRO,0,A面料屉拉取进出轴_拍照点,PullAxis_Inout_CamA,10000,,,,,,,,,,,,
PRO,0,B面料屉拉取进出轴_拍照点,PullAxis_Inout_CamB,10000,,,,,,,,,,,, PRO,0,B面料屉拉取进出轴_拍照点,PullAxis_Inout_CamB,10000,,,,,,,,,,,,
......
source/DeviceLibrary/Config/Config_InputEquip.csv
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
AXIS,0,A料口提升轴,BatchAxis_A,10,HC,,30000,80000,80000,2000,10000,30000,10,100,0,0 AXIS,0,A料口提升轴,BatchAxis_A,10,HC,,30000,80000,80000,2000,10000,30000,10,100,0,0
AXIS,0,B料口提升轴,BatchAxis_B,11,HC,,30000,80000,80000,2000,10000,30000,10,100,0,0 AXIS,0,B料口提升轴,BatchAxis_B,11,HC,,30000,80000,80000,2000,10000,30000,10,100,0,0
AXIS,0,取料升降轴,TakeAxis_Updown,12,HC,,30000,80000,80000,800,10000,30000,10,200,0,0 AXIS,0,取料升降轴,TakeAxis_Updown,12,HC,,30000,80000,80000,800,10000,30000,10,200,0,0
AXIS,0,取料旋转轴,TakeAxis_Middle,13,HC,,10000,30000,30000,2000,8000,20000,10,200,0,0 AXIS,0,取料旋转轴,TakeAxis_Middle,13,HC,,20000,80000,80000,2000,8000,20000,10,200,0,0
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,,,,,,,, PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,,,,,,,,
PRO,0,是否使用夹爪（1=使用夹爪，0=用吸盘）,UseClampJaw,1,,,,,,,,,,,, PRO,0,是否使用夹爪（1=使用夹爪，0=用吸盘）,UseClampJaw,1,,,,,,,,,,,,
...@@ -28,7 +28,7 @@ PRO,0,提升上料轴P3速度/料盘拿走后提升轴下降速度,BatchAxis_P3S ...@@ -28,7 +28,7 @@ PRO,0,提升上料轴P3速度/料盘拿走后提升轴下降速度,BatchAxis_P3S
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,1250,,,,,,,,,,,, PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,1250,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,取料升降轴_待机点,Updown_P1,310000,,,,,,,,,,,, PRO,0,取料升降轴_待机点,Updown_P1,310000,,,,,,,,,,,,
PRO,0,取料升降轴_A料口取料点,Updown_P2_ATake,395000,,,,,,,,,,,, PRO,0,取料升降轴_A料口取料点,Updown_P2_ATake,394000,,,,,,,,,,,,
PRO,0,取料升降轴_B料口取料点,Updown_P3_BTake,386317,,,,,,,,,,,, PRO,0,取料升降轴_B料口取料点,Updown_P3_BTake,386317,,,,,,,,,,,,
PRO,0,取料升降轴_A上暂存区放料高点,Updown_P4_AUpperH,18000,,,,,,,,,,,, PRO,0,取料升降轴_A上暂存区放料高点,Updown_P4_AUpperH,18000,,,,,,,,,,,,
PRO,0,取料升降轴_A上暂存区放料低点,Updown_P5_AUpperL,65798,,,,,,,,,,,, PRO,0,取料升降轴_A上暂存区放料低点,Updown_P5_AUpperL,65798,,,,,,,,,,,,
...@@ -38,8 +38,8 @@ PRO,0,取料升降轴_NG料区放料高点,Updown_P8_NGH,310000,,,,,,,,,,,, ...@@ -38,8 +38,8 @@ 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上暂存区放料低点,Updown_P11_BUpperL,65798,,,,,,,,,,,,
PRO,0,取料升降轴_B下暂存区取料高点,Updown_P12_BUnderH,368000,,,,,,,,,,,, PRO,0,取料升降轴_B下暂存区取料高点,Updown_P12_BUnderH,310000,,,,,,,,,,,,
PRO,0,取料升降轴_B下暂存区取料低点,Updown_P13_BUnderL,112,,,,,,,,,,,, PRO,0,取料升降轴_B下暂存区取料低点,Updown_P13_BUnderL,370000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,取料升降轴_P1速度,Updown_P1_Speed,30000,,,,,,,,,,,, PRO,0,取料升降轴_P1速度,Updown_P1_Speed,30000,,,,,,,,,,,,
PRO,1,取料升降轴_P2速度,Updown_P2_Speed,30000,,,,,,,,,,,, PRO,1,取料升降轴_P2速度,Updown_P2_Speed,30000,,,,,,,,,,,,
...@@ -56,18 +56,18 @@ PRO,11,取料升降轴_P12速度,Updown_P12_Speed,30000,,,,,,,,,,,, ...@@ -56,18 +56,18 @@ PRO,11,取料升降轴_P12速度,Updown_P12_Speed,30000,,,,,,,,,,,,
PRO,12,取料升降轴_P13速度,Updown_P13_Speed,30000,,,,,,,,,,,, PRO,12,取料升降轴_P13速度,Updown_P13_Speed,30000,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,取料旋转轴_待机点,Middle_P1,126912,,,,,,,,,,,, PRO,0,取料旋转轴_待机点,Middle_P1,126912,,,,,,,,,,,,
PRO,0,取料旋转轴_A料口取料点,Middle_P2_ATake,161570,,,,,,,,,,,, PRO,0,取料旋转轴_A料口取料点,Middle_P2_ATake,161988,,,,,,,,,,,,
PRO,0,取料旋转轴_B料口取料点,Middle_P3_BTake,93462,,,,,,,,,,,, PRO,0,取料旋转轴_B料口取料点,Middle_P3_BTake,93462,,,,,,,,,,,,
PRO,0,取料旋转轴_A上暂存区放料点,Middle_P4_AUpper,250000,,,,,,,,,,,, PRO,0,取料旋转轴_A上暂存区放料点,Middle_P4_AUpper,250000,,,,,,,,,,,,
PRO,0,取料旋转轴_B上暂存区放料点,Middle_P5_BUpper,104,,,,,,,,,,,, PRO,0,取料旋转轴_B上暂存区放料点,Middle_P5_BUpper,107,,,,,,,,,,,,
PRO,0,取料旋转轴_NG料区放料点,Middle_P6_NG,214355,,,,,,,,,,,, PRO,0,取料旋转轴_NG料区放料点,Middle_P6_NG,214355,,,,,,,,,,,,
PRO,0,取料旋转轴_A下暂存区取料点,Middle_P7_AUnder,250000,,,,,,,,,,,, PRO,0,取料旋转轴_A下暂存区取料点,Middle_P7_AUnder,250100,,,,,,,,,,,,
PRO,0,取料旋转轴_B下暂存区取料点,Middle_P8_BUnder,107,,,,,,,,,,,, PRO,0,取料旋转轴_B下暂存区取料点,Middle_P8_BUnder,107,,,,,,,,,,,,
PRO,0,取料旋转轴_P1速度,Middle_P1_Speed,20000,,,,,,,,,,,, PRO,0,取料旋转轴_P1速度,Middle_P1_Speed,80000,,,,,,,,,,,,
PRO,1,取料旋转轴_P2速度,Middle_P2_Speed,20000,,,,,,,,,,,, PRO,1,取料旋转轴_P2速度,Middle_P2_Speed,80000,,,,,,,,,,,,
PRO,2,取料旋转轴_P3速度,Middle_P3_Speed,20000,,,,,,,,,,,, PRO,2,取料旋转轴_P3速度,Middle_P3_Speed,80000,,,,,,,,,,,,
PRO,3,取料旋转轴_P4速度,Middle_P4_Speed,20000,,,,,,,,,,,, PRO,3,取料旋转轴_P4速度,Middle_P4_Speed,80000,,,,,,,,,,,,
PRO,4,取料旋转轴_P5速度,Middle_P5_Speed,20000,,,,,,,,,,,, PRO,4,取料旋转轴_P5速度,Middle_P5_Speed,80000,,,,,,,,,,,,
PRO,5,取料旋转轴_P6速度,Middle_P6_Speed,20000,,,,,,,,,,,, PRO,5,取料旋转轴_P6速度,Middle_P6_Speed,80000,,,,,,,,,,,,
PRO,6,取料旋转轴_P7速度,Middle_P7_Speed,20000,,,,,,,,,,,, PRO,6,取料旋转轴_P7速度,Middle_P7_Speed,80000,,,,,,,,,,,,
PRO,7,取料旋转轴_P8速度,Middle_P8_Speed,20000,,,,,,,,,,,, PRO,7,取料旋转轴_P8速度,Middle_P8_Speed,80000,,,,,,,,,,,,
source/DeviceLibrary/Config/linePositions - 副本.csv 0 → 100644
此文件的差异太大，无法显示。
source/DeviceLibrary/Config/linePositions.csv
位置,优先级,高度,宽度,料仓ID,料斗进出轴料屉提取点P2P4,料斗进出轴料屉库位点P3P5,料斗升降轴料屉提取高点P3,料斗升降轴料屉提取低点P4,存储库位取放点位P3,移栽升降轴料屉上方过渡点P6P12,移栽升降轴料屉取放点P7P13,AB移栽X轴料屉库位取放料点P3,AB移栽压紧轴压紧前点P2,AB移栽压紧轴压紧点P3,料斗拉取升降轴_料屉提取水平点P2 位置,优先级,高度,宽度,料仓ID,料斗进出轴料屉提取点P2P4,料斗进出轴料屉库位点P3P5,料斗升降轴料屉提取高点P3,料斗升降轴料屉提取低点P4,存储库位取放点位P3,移栽升降轴料屉上方过渡点P6P12,移栽升降轴料屉取放点P7P13,AB移栽X轴料屉库位取放料点P3,AB移栽压紧轴压紧前点P2,AB移栽压紧轴压紧点P3,料斗拉取升降轴_料屉提取水平点P2
05AA01010101,1,8,7,2,478807,219703,68116,0,97000,460000,5332,739399,9000,-2000,20000 05AA01010101,1,8,7,2,478807,219703,68116,0,97000,460000,5332,739399,9000,-2000,20000
05AA01010102,1,8,7,2,478807,219703,68116,0,97000,460000,459995,705003,9000,-2000,20000 05AA01010102,1,8,7,2,478807,219703,68116,0,97000,460000,459995,705003,9000,-2000,20000
05AA01010103,1,8,7,2,478807,219703,68116,0,97000,460000,459995,10,9000,-2000,20000 05AA01010103,1,8,7,2,478807,219703,68116,0,97000,460000,459995,10,9000,-2000,20000
...@@ -7199,246 +7199,246 @@ ...@@ -7199,246 +7199,246 @@
05AA15060418,1,8,7,2,78,79,80,81,82,83,84,85,9000,-2000,88 05AA15060418,1,8,7,2,78,79,80,81,82,83,84,85,9000,-2000,88
05AA15060419,1,8,7,2,79,80,81,82,83,84,85,86,9000,-2000,89 05AA15060419,1,8,7,2,79,80,81,82,83,84,85,86,9000,-2000,89
05AA15060420,1,8,7,2,80,81,82,83,84,85,86,87,9000,-2000,90 05AA15060420,1,8,7,2,80,81,82,83,84,85,86,87,9000,-2000,90
05BB01010101,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,9236,8000,-2000,20000 05BB01010101,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,9236,8000,-2000,20000
05BB01010102,1,8,7,2,-490000,-232800,68116,0,92033,459987,2987,45334,8000,-2000,20000 05BB01010102,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,45334,8000,-2000,20000
05BB01010103,1,8,7,2,-490000,-232800,68116,0,92033,459987,2987,81432,8000,-2000,20000 05BB01010103,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,81432,8000,-2000,20000
05BB01010104,1,8,7,2,-490000,-232800,68116,0,92033,459987,2987,117530,8000,-2000,20000 05BB01010104,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,117530,8000,-2000,20000
05BB01010105,1,8,7,2,-490000,-232800,68116,0,92033,459987,2987,153628,8000,-2000,20000 05BB01010105,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,153628,8000,-2000,20000
05BB01010106,1,8,7,2,-490000,-232800,68116,0,92033,459988,2988,189726,8000,-2000,20000 05BB01010106,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,189726,8000,-2000,20000
05BB01010107,1,8,7,2,-490000,-232800,68116,0,92033,459988,2988,225824,8000,-2000,20000 05BB01010107,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,225824,8000,-2000,20000
05BB01010108,1,8,7,2,-490000,-232800,68116,0,92033,459988,2988,261922,8000,-2000,20000 05BB01010108,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,261922,8000,-2000,20000
05BB01010109,1,8,7,2,-490000,-232800,68116,0,92033,459989,2989,298020,8000,-2000,20000 05BB01010109,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,298020,8000,-2000,20000
05BB01010110,1,8,7,2,-490000,-232800,68116,0,92033,459989,2989,334118,8000,-2000,20000 05BB01010110,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,334118,8000,-2000,20000
05BB01010111,1,8,7,2,-490000,-232800,68116,0,92033,459989,2989,370216,8000,-2000,20000 05BB01010111,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,370216,8000,-2000,20000
05BB01010112,1,8,7,2,-490000,-232800,68116,0,92033,459989,2989,406314,8000,-2000,20000 05BB01010112,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,406314,8000,-2000,20000
05BB01010113,1,8,7,2,-490000,-232800,68116,0,92033,459990,2990,442412,8000,-2000,20000 05BB01010113,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,442412,8000,-2000,20000
05BB01010114,1,8,7,2,-490000,-232800,68116,0,92033,459990,2990,478510,8000,-2000,20000 05BB01010114,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,478510,8000,-2000,20000
05BB01010115,1,8,7,2,-490000,-232800,68116,0,92033,459990,2990,514608,8000,-2000,20000 05BB01010115,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,514608,8000,-2000,20000
05BB01010116,1,8,7,2,-490000,-232800,68116,0,92033,459990,2990,550706,8000,-2000,20000 05BB01010116,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,550706,8000,-2000,20000
05BB01010117,1,8,7,2,-490000,-232800,68116,0,92033,459990,2990,586804,8000,-2000,20000 05BB01010117,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,586804,8000,-2000,20000
05BB01010118,1,8,7,2,-490000,-232800,68116,0,92033,459990,2990,622902,8000,-2000,20000 05BB01010118,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,622902,8000,-2000,20000
05BB01010119,1,8,7,2,-490000,-232800,68116,0,92033,459990,2990,659000,8000,-2000,20000 05BB01010119,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,659000,8000,-2000,20000
05BB01010120,1,8,7,2,-490000,-232800,68116,0,92033,459990,2990,695098,8000,-2000,20000 05BB01010120,1,8,7,2,-490000,-233500,68116,0,92033,459986,2986,695098,8000,-2000,20000
05BB01010201,1,8,7,2,-490000,-6037,68116,0,92033,459990,2990,9236,8000,-2000,20000 05BB01010201,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,9236,8000,-2000,20000
05BB01010202,1,8,7,2,-490000,-6037,68116,0,92033,459990,2990,45334,8000,-2000,20000 05BB01010202,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,45334,8000,-2000,20000
05BB01010203,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,81432,8000,-2000,20000 05BB01010203,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,81432,8000,-2000,20000
05BB01010204,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,117530,8000,-2000,20000 05BB01010204,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,117530,8000,-2000,20000
05BB01010205,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,153628,8000,-2000,20000 05BB01010205,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,153628,8000,-2000,20000
05BB01010206,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,189726,8000,-2000,20000 05BB01010206,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,189726,8000,-2000,20000
05BB01010207,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,225824,8000,-2000,20000 05BB01010207,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,225824,8000,-2000,20000
05BB01010208,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,261922,8000,-2000,20000 05BB01010208,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,261922,8000,-2000,20000
05BB01010209,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,298020,8000,-2000,20000 05BB01010209,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,298020,8000,-2000,20000
05BB01010210,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,334118,8000,-2000,20000 05BB01010210,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,334118,8000,-2000,20000
05BB01010211,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,370216,8000,-2000,20000 05BB01010211,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,370216,8000,-2000,20000
05BB01010212,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,406314,8000,-2000,20000 05BB01010212,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,406314,8000,-2000,20000
05BB01010213,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,442412,8000,-2000,20000 05BB01010213,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,442412,8000,-2000,20000
05BB01010214,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,478510,8000,-2000,20000 05BB01010214,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,478510,8000,-2000,20000
05BB01010215,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,514608,8000,-2000,20000 05BB01010215,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,514608,8000,-2000,20000
05BB01010216,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,550706,8000,-2000,20000 05BB01010216,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,550706,8000,-2000,20000
05BB01010217,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,586804,8000,-2000,20000 05BB01010217,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,586804,8000,-2000,20000
05BB01010218,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,622902,8000,-2000,20000 05BB01010218,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,622902,8000,-2000,20000
05BB01010219,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,659000,8000,-2000,20000 05BB01010219,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,659000,8000,-2000,20000
05BB01010220,1,8,7,2,-490000,-6037,68116,0,92033,459991,2991,695098,8000,-2000,20000 05BB01010220,1,8,7,2,-490000,-6737,68116,0,92033,459986,2986,695098,8000,-2000,20000
05BB01010301,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,9236,8000,-2000,20000 05BB01010301,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,9236,8000,-2000,20000
05BB01010302,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,45334,8000,-2000,20000 05BB01010302,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,45334,8000,-2000,20000
05BB01010303,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,81432,8000,-2000,20000 05BB01010303,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,81432,8000,-2000,20000
05BB01010304,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,117530,8000,-2000,20000 05BB01010304,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,117530,8000,-2000,20000
05BB01010305,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,153628,8000,-2000,20000 05BB01010305,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,153628,8000,-2000,20000
05BB01010306,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,189726,8000,-2000,20000 05BB01010306,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,189726,8000,-2000,20000
05BB01010307,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,225824,8000,-2000,20000 05BB01010307,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,225824,8000,-2000,20000
05BB01010308,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,261922,8000,-2000,20000 05BB01010308,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,261922,8000,-2000,20000
05BB01010309,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,298020,8000,-2000,20000 05BB01010309,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,298020,8000,-2000,20000
05BB01010310,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,334118,8000,-2000,20000 05BB01010310,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,334118,8000,-2000,20000
05BB01010311,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,370216,8000,-2000,20000 05BB01010311,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,370216,8000,-2000,20000
05BB01010312,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,406314,8000,-2000,20000 05BB01010312,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,406314,8000,-2000,20000
05BB01010313,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,442412,8000,-2000,20000 05BB01010313,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,442412,8000,-2000,20000
05BB01010314,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,478510,8000,-2000,20000 05BB01010314,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,478510,8000,-2000,20000
05BB01010315,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,514608,8000,-2000,20000 05BB01010315,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,514608,8000,-2000,20000
05BB01010316,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,550706,8000,-2000,20000 05BB01010316,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,550706,8000,-2000,20000
05BB01010317,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,586804,8000,-2000,20000 05BB01010317,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,586804,8000,-2000,20000
05BB01010318,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,622902,8000,-2000,20000 05BB01010318,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,622902,8000,-2000,20000
05BB01010319,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,659000,8000,-2000,20000 05BB01010319,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,659000,8000,-2000,20000
05BB01010320,1,8,7,2,-490000,216854,68116,0,92033,459991,2991,695098,8000,-2000,20000 05BB01010320,1,8,7,2,-490000,216154,68116,0,92033,459986,2986,695098,8000,-2000,20000
05BB01010401,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,9236,8000,-2000,20000 05BB01010401,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,9236,8000,-2000,20000
05BB01010402,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,45334,8000,-2000,20000 05BB01010402,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,45334,8000,-2000,20000
05BB01010403,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,81432,8000,-2000,20000 05BB01010403,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,81432,8000,-2000,20000
05BB01010404,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,117530,8000,-2000,20000 05BB01010404,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,117530,8000,-2000,20000
05BB01010405,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,153628,8000,-2000,20000 05BB01010405,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,153628,8000,-2000,20000
05BB01010406,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,189726,8000,-2000,20000 05BB01010406,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,189726,8000,-2000,20000
05BB01010407,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,225824,8000,-2000,20000 05BB01010407,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,225824,8000,-2000,20000
05BB01010408,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,261922,8000,-2000,20000 05BB01010408,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,261922,8000,-2000,20000
05BB01010409,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,298020,8000,-2000,20000 05BB01010409,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,298020,8000,-2000,20000
05BB01010410,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,334118,8000,-2000,20000 05BB01010410,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,334118,8000,-2000,20000
05BB01010411,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,370216,8000,-2000,20000 05BB01010411,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,370216,8000,-2000,20000
05BB01010412,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,406314,8000,-2000,20000 05BB01010412,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,406314,8000,-2000,20000
05BB01010413,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,442412,8000,-2000,20000 05BB01010413,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,442412,8000,-2000,20000
05BB01010414,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,478510,8000,-2000,20000 05BB01010414,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,478510,8000,-2000,20000
05BB01010415,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,514608,8000,-2000,20000 05BB01010415,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,514608,8000,-2000,20000
05BB01010416,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,550706,8000,-2000,20000 05BB01010416,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,550706,8000,-2000,20000
05BB01010417,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,586804,8000,-2000,20000 05BB01010417,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,586804,8000,-2000,20000
05BB01010418,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,622902,8000,-2000,20000 05BB01010418,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,622902,8000,-2000,20000
05BB01010419,1,8,7,2,-490000,442210,68116,0,92033,459990,2990,659000,8000,-2000,20000 05BB01010419,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,659000,8000,-2000,20000
05BB01010420,1,8,7,2,-490000,442210,68116,0,92033,459991,2991,695098,8000,-2000,20000 05BB01010420,1,8,7,2,-490000,441510,68116,0,92033,459986,2986,695098,8000,-2000,20000
05BB01020101,1,8,7,2,-490000,-232800,67813,-303,950340,459686,2686,9236,8000,-2000,19697 05BB01020101,1,8,7,2,-491779,-234306,68116,0,959408,459986,1750,9236,8000,-2000,20000
05BB01020102,1,8,7,2,-490000,-232800,67813,-303,950340,459686,2686,45334,8000,-2000,19697 05BB01020102,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,45334,8000,-2000,20000
05BB01020103,1,8,7,2,-490000,-232800,67813,-303,950340,459686,2686,81432,8000,-2000,19697 05BB01020103,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,81432,8000,-2000,20000
05BB01020104,1,8,7,2,-490000,-232800,67813,-303,950340,459686,2686,117530,8000,-2000,19697 05BB01020104,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,117530,8000,-2000,20000
05BB01020105,1,8,7,2,-490000,-232800,67813,-303,950340,459686,2686,153628,8000,-2000,19697 05BB01020105,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,153628,8000,-2000,20000
05BB01020106,1,8,7,2,-490000,-232800,67813,-303,950340,459687,2687,189726,8000,-2000,19697 05BB01020106,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,189726,8000,-2000,20000
05BB01020107,1,8,7,2,-490000,-232800,67813,-303,950340,459687,2687,225824,8000,-2000,19697 05BB01020107,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,225824,8000,-2000,20000
05BB01020108,1,8,7,2,-490000,-232800,67814,-302,950340,459687,2687,261922,8000,-2000,19698 05BB01020108,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,261922,8000,-2000,20000
05BB01020109,1,8,7,2,-490000,-232800,67814,-302,950340,459687,2687,298020,8000,-2000,19698 05BB01020109,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,298020,8000,-2000,20000
05BB01020110,1,8,7,2,-490000,-232800,67814,-302,950340,459687,2687,334118,8000,-2000,19698 05BB01020110,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,334118,8000,-2000,20000
05BB01020111,1,8,7,2,-490000,-232800,67814,-302,950340,459687,2687,370216,8000,-2000,19698 05BB01020111,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,370216,8000,-2000,20000
05BB01020112,1,8,7,2,-490000,-232800,67814,-302,950340,459687,2687,406314,8000,-2000,19698 05BB01020112,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,406314,8000,-2000,20000
05BB01020113,1,8,7,2,-490000,-232800,67814,-302,950340,459687,2687,442412,8000,-2000,19698 05BB01020113,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,442412,8000,-2000,20000
05BB01020114,1,8,7,2,-490000,-232800,67814,-302,950340,459687,2687,478510,8000,-2000,19698 05BB01020114,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,478510,8000,-2000,20000
05BB01020115,1,8,7,2,-490000,-232800,67814,-302,950340,459687,2687,514608,8000,-2000,19698 05BB01020115,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,514608,8000,-2000,20000
05BB01020116,1,8,7,2,-490000,-232800,67814,-302,950340,459687,2687,550706,8000,-2000,19698 05BB01020116,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,550706,8000,-2000,20000
05BB01020117,1,8,7,2,-490000,-232800,67814,-302,950340,459687,2687,586804,8000,-2000,19698 05BB01020117,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,586804,8000,-2000,20000
05BB01020118,1,8,7,2,-490000,-232800,67814,-302,950340,459687,2687,622902,8000,-2000,19698 05BB01020118,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,622902,8000,-2000,20000
05BB01020119,1,8,7,2,-490000,-232800,67814,-302,950340,459687,2687,659000,8000,-2000,19698 05BB01020119,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,659000,8000,-2000,20000
05BB01020120,1,8,7,2,-490000,-232800,67815,-301,950340,459687,2687,695098,8000,-2000,19699 05BB01020120,1,8,7,2,-490000,-232800,68116,0,92033,459986,2986,695098,8000,-2000,20000
05BB01020201,1,8,7,2,-490000,-6037,67815,-301,950340,459687,2687,9236,8000,-2000,19699 05BB01020201,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,9236,8000,-2000,20000
05BB01020202,1,8,7,2,-490000,-6037,67815,-301,950340,459687,2687,45334,8000,-2000,19699 05BB01020202,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,45334,8000,-2000,20000
05BB01020203,1,8,7,2,-490000,-6037,67815,-301,950340,459687,2687,81432,8000,-2000,19699 05BB01020203,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,81432,8000,-2000,20000
05BB01020204,1,8,7,2,-490000,-6037,67815,-301,950340,459687,2687,117530,8000,-2000,19699 05BB01020204,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,117530,8000,-2000,20000
05BB01020205,1,8,7,2,-490000,-6037,67815,-301,950340,459687,2687,153628,8000,-2000,19699 05BB01020205,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,153628,8000,-2000,20000
05BB01020206,1,8,7,2,-490000,-6037,67815,-301,950340,459687,2687,189726,8000,-2000,19699 05BB01020206,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,189726,8000,-2000,20000
05BB01020207,1,8,7,2,-490000,-6037,67815,-301,950340,459687,2687,225824,8000,-2000,19699 05BB01020207,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,225824,8000,-2000,20000
05BB01020208,1,8,7,2,-490000,-6037,67815,-301,950340,459688,2688,261922,8000,-2000,19699 05BB01020208,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,261922,8000,-2000,20000
05BB01020209,1,8,7,2,-490000,-6037,67815,-301,950340,459688,2688,298020,8000,-2000,19699 05BB01020209,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,298020,8000,-2000,20000
05BB01020210,1,8,7,2,-490000,-6037,67815,-301,950340,459688,2688,334118,8000,-2000,19699 05BB01020210,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,334118,8000,-2000,20000
05BB01020211,1,8,7,2,-490000,-6037,67815,-301,950340,459688,2688,370216,8000,-2000,19699 05BB01020211,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,370216,8000,-2000,20000
05BB01020212,1,8,7,2,-490000,-6037,67815,-301,950340,459688,2688,406314,8000,-2000,19699 05BB01020212,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,406314,8000,-2000,20000
05BB01020213,1,8,7,2,-490000,-6037,67815,-301,950340,459688,2688,442412,8000,-2000,19699 05BB01020213,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,442412,8000,-2000,20000
05BB01020214,1,8,7,2,-490000,-6037,67816,-300,950340,459688,2688,478510,8000,-2000,19700 05BB01020214,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,478510,8000,-2000,20000
05BB01020215,1,8,7,2,-490000,-6037,67816,-300,950340,459688,2688,514608,8000,-2000,19700 05BB01020215,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,514608,8000,-2000,20000
05BB01020216,1,8,7,2,-490000,-6037,67816,-300,950340,459688,2688,550706,8000,-2000,19700 05BB01020216,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,550706,8000,-2000,20000
05BB01020217,1,8,7,2,-490000,-6037,67816,-300,950340,459688,2688,586804,8000,-2000,19700 05BB01020217,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,586804,8000,-2000,20000
05BB01020218,1,8,7,2,-490000,-6037,67816,-300,950340,459688,2688,622902,8000,-2000,19700 05BB01020218,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,622902,8000,-2000,20000
05BB01020219,1,8,7,2,-490000,-6037,67816,-300,950340,459688,2688,659000,8000,-2000,19700 05BB01020219,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,659000,8000,-2000,20000
05BB01020220,1,8,7,2,-490000,-6037,67816,-300,950340,459688,2688,695098,8000,-2000,19700 05BB01020220,1,8,7,2,-490000,-6037,68116,0,92033,459986,2986,695098,8000,-2000,20000
05BB01020301,1,8,7,2,-490000,216854,67816,-300,950340,459688,2688,9236,8000,-2000,19700 05BB01020301,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,9236,8000,-2000,20000
05BB01020302,1,8,7,2,-490000,216854,67816,-300,950340,459688,2688,45334,8000,-2000,19700 05BB01020302,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,45334,8000,-2000,20000
05BB01020303,1,8,7,2,-490000,216854,67816,-300,950340,459688,2688,81432,8000,-2000,19700 05BB01020303,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,81432,8000,-2000,20000
05BB01020304,1,8,7,2,-490000,216854,67816,-300,950340,459688,2688,117530,8000,-2000,19700 05BB01020304,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,117530,8000,-2000,20000
05BB01020305,1,8,7,2,-490000,216854,67816,-300,950340,459688,2688,153628,8000,-2000,19700 05BB01020305,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,153628,8000,-2000,20000
05BB01020306,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,189726,8000,-2000,19700 05BB01020306,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,189726,8000,-2000,20000
05BB01020307,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,225824,8000,-2000,19700 05BB01020307,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,225824,8000,-2000,20000
05BB01020308,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,261922,8000,-2000,19700 05BB01020308,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,261922,8000,-2000,20000
05BB01020309,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,298020,8000,-2000,19700 05BB01020309,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,298020,8000,-2000,20000
05BB01020310,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,334118,8000,-2000,19700 05BB01020310,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,334118,8000,-2000,20000
05BB01020311,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,370216,8000,-2000,19700 05BB01020311,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,370216,8000,-2000,20000
05BB01020312,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,406314,8000,-2000,19700 05BB01020312,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,406314,8000,-2000,20000
05BB01020313,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,442412,8000,-2000,19700 05BB01020313,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,442412,8000,-2000,20000
05BB01020314,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,478510,8000,-2000,19700 05BB01020314,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,478510,8000,-2000,20000
05BB01020315,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,514608,8000,-2000,19700 05BB01020315,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,514608,8000,-2000,20000
05BB01020316,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,550706,8000,-2000,19700 05BB01020316,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,550706,8000,-2000,20000
05BB01020317,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,586804,8000,-2000,19700 05BB01020317,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,586804,8000,-2000,20000
05BB01020318,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,622902,8000,-2000,19700 05BB01020318,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,622902,8000,-2000,20000
05BB01020319,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,659000,8000,-2000,19700 05BB01020319,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,659000,8000,-2000,20000
05BB01020320,1,8,7,2,-490000,216854,67816,-300,950340,459689,2689,695098,8000,-2000,19700 05BB01020320,1,8,7,2,-490000,216854,68116,0,92033,459986,2986,695098,8000,-2000,20000
05BB01020401,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,9236,8000,-2000,19700 05BB01020401,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,9236,8000,-2000,20000
05BB01020402,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,45334,8000,-2000,19700 05BB01020402,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,45334,8000,-2000,20000
05BB01020403,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,81432,8000,-2000,19700 05BB01020403,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,81432,8000,-2000,20000
05BB01020404,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,117530,8000,-2000,19700 05BB01020404,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,117530,8000,-2000,20000
05BB01020405,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,153628,8000,-2000,19700 05BB01020405,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,153628,8000,-2000,20000
05BB01020406,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,189726,8000,-2000,19700 05BB01020406,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,189726,8000,-2000,20000
05BB01020407,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,225824,8000,-2000,19700 05BB01020407,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,225824,8000,-2000,20000
05BB01020408,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,261922,8000,-2000,19700 05BB01020408,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,261922,8000,-2000,20000
05BB01020409,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,298020,8000,-2000,19700 05BB01020409,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,298020,8000,-2000,20000
05BB01020410,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,334118,8000,-2000,19700 05BB01020410,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,334118,8000,-2000,20000
05BB01020411,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,370216,8000,-2000,19700 05BB01020411,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,370216,8000,-2000,20000
05BB01020412,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,406314,8000,-2000,19700 05BB01020412,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,406314,8000,-2000,20000
05BB01020413,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,442412,8000,-2000,19700 05BB01020413,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,442412,8000,-2000,20000
05BB01020414,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,478510,8000,-2000,19700 05BB01020414,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,478510,8000,-2000,20000
05BB01020415,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,514608,8000,-2000,19700 05BB01020415,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,514608,8000,-2000,20000
05BB01020416,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,550706,8000,-2000,19700 05BB01020416,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,550706,8000,-2000,20000
05BB01020417,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,586804,8000,-2000,19700 05BB01020417,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,586804,8000,-2000,20000
05BB01020418,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,622902,8000,-2000,19700 05BB01020418,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,622902,8000,-2000,20000
05BB01020419,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,659000,8000,-2000,19700 05BB01020419,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,659000,8000,-2000,20000
05BB01020420,1,8,7,2,-490000,442210,67816,-300,950340,459689,2689,695098,8000,-2000,19700 05BB01020420,1,8,7,2,-490000,442210,68116,0,92033,459986,2986,695098,8000,-2000,20000
05BB01030101,1,8,7,2,-490000,-232800,73797,5681,1815417,465669,8669,9236,8000,-2000,25681 05BB01030101,1,8,7,2,-493604,-233806,68116,0,1822106,630000,42001,9236,8000,-2000,40000
05BB01030102,1,8,7,2,-490000,-232800,73797,5681,1815417,465669,8669,45334,8000,-2000,25681 05BB01030102,1,8,7,2,-490000,-232800,68116,0,958285,459986,2986,45334,8000,-2000,20000
05BB01030103,1,8,7,2,-490000,-232800,73797,5681,1815417,465668,8668,81432,8000,-2000,25681 05BB01030103,1,8,7,2,-490000,-232800,68116,0,958285,459986,2986,81432,8000,-2000,20000
05BB01030104,1,8,7,2,-490000,-232800,73797,5681,1815417,465668,8668,117530,8000,-2000,25681 05BB01030104,1,8,7,2,-490000,-232800,68116,0,958285,459986,2986,117530,8000,-2000,20000
05BB01030105,1,8,7,2,-490000,-232800,73797,5681,1815417,465668,8668,153628,8000,-2000,25681 05BB01030105,1,8,7,2,-490000,-232800,68116,0,958285,459986,2986,153628,8000,-2000,20000
05BB01030106,1,8,7,2,-490000,-232800,73797,5681,1815417,465668,8668,189726,8000,-2000,25681 05BB01030106,1,8,7,2,-490000,-232800,68116,0,958285,459986,2986,189726,8000,-2000,20000
05BB01030107,1,8,7,2,-490000,-232800,73797,5681,1815417,465668,8668,225824,8000,-2000,25681 05BB01030107,1,8,7,2,-490000,-232800,68116,0,958285,459986,2986,225824,8000,-2000,20000
05BB01030108,1,8,7,2,-490000,-232800,73797,5681,1815417,465668,8668,261922,8000,-2000,25681 05BB01030108,1,8,7,2,-490000,-232800,68116,0,958285,459986,2986,261922,8000,-2000,20000
05BB01030109,1,8,7,2,-490000,-232800,73796,5680,1815417,465668,8668,298020,8000,-2000,25680 05BB01030109,1,8,7,2,-490000,-232800,68116,0,958285,459986,2986,298020,8000,-2000,20000
05BB01030110,1,8,7,2,-490000,-232800,73796,5680,1815417,465668,8668,334118,8000,-2000,25680 05BB01030110,1,8,7,2,-490000,-232800,68116,0,958285,459986,2986,334118,8000,-2000,20000
05BB01030111,1,8,7,2,-490000,-232800,73796,5680,1815417,465668,8668,370216,8000,-2000,25680 05BB01030111,1,8,7,2,-490000,-232800,68116,0,958314,459986,2986,370216,8000,-2000,20000
05BB01030112,1,8,7,2,-490000,-232800,73796,5680,1815417,465668,8668,406314,8000,-2000,25680 05BB01030112,1,8,7,2,-490000,-232800,68116,0,958456,459986,2986,406314,8000,-2000,20000
05BB01030113,1,8,7,2,-490000,-232800,73796,5680,1815417,465668,8668,442412,8000,-2000,25680 05BB01030113,1,8,7,2,-490000,-232800,68116,0,958799,459986,2986,442412,8000,-2000,20000
05BB01030114,1,8,7,2,-490000,-232800,73796,5680,1815417,465668,8668,478510,8000,-2000,25680 05BB01030114,1,8,7,2,-490000,-232800,68116,0,959043,459986,2986,478510,8000,-2000,20000
05BB01030115,1,8,7,2,-490000,-232800,73796,5680,1815417,465668,8668,514608,8000,-2000,25680 05BB01030115,1,8,7,2,-490000,-232800,68116,0,959395,459986,2986,514608,8000,-2000,20000
05BB01030116,1,8,7,2,-490000,-232800,73796,5680,1815417,465668,8668,550706,8000,-2000,25680 05BB01030116,1,8,7,2,-490000,-232800,68116,0,959624,459986,2986,550706,8000,-2000,20000
05BB01030117,1,8,7,2,-490000,-232800,73796,5680,1815417,465668,8668,586804,8000,-2000,25680 05BB01030117,1,8,7,2,-490000,-232800,68116,0,959882,459986,2986,586804,8000,-2000,20000
05BB01030118,1,8,7,2,-490000,-232800,73796,5680,1815417,465668,8668,622902,8000,-2000,25680 05BB01030118,1,8,7,2,-490000,-232800,68116,0,960101,459986,2986,622902,8000,-2000,20000
05BB01030119,1,8,7,2,-490000,-232800,73796,5680,1815417,465668,8668,659000,8000,-2000,25680 05BB01030119,1,8,7,2,-490000,-232800,68116,0,960389,459986,2986,659000,8000,-2000,20000
05BB01030120,1,8,7,2,-490000,-232800,73796,5680,1815417,465668,8668,695098,8000,-2000,25680 05BB01030120,1,8,7,2,-490000,-232800,68116,0,960610,459986,2986,695098,8000,-2000,20000
05BB01030201,1,8,7,2,-490000,-6037,73796,5680,1815417,465668,8668,9236,8000,-2000,25680 05BB01030201,1,8,7,2,-490000,-6037,68116,0,961059,459986,2986,9236,8000,-2000,20000
05BB01030202,1,8,7,2,-490000,-6037,73795,5679,1815417,465668,8668,45334,8000,-2000,25679 05BB01030202,1,8,7,2,-490000,-6037,68116,0,961388,459986,2986,45334,8000,-2000,20000
05BB01030203,1,8,7,2,-490000,-6037,73795,5679,1815417,465668,8668,81432,8000,-2000,25679 05BB01030203,1,8,7,2,-490000,-6037,68116,0,961639,459986,2986,81432,8000,-2000,20000
05BB01030204,1,8,7,2,-490000,-6037,73795,5679,1815417,465668,8668,117530,8000,-2000,25679 05BB01030204,1,8,7,2,-490000,-6037,68116,0,961850,459986,2986,117530,8000,-2000,20000
05BB01030205,1,8,7,2,-490000,-6037,73795,5679,1815417,465668,8668,153628,8000,-2000,25679 05BB01030205,1,8,7,2,-490000,-6037,68116,0,962080,459986,2986,153628,8000,-2000,20000
05BB01030206,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,189726,8000,-2000,25679 05BB01030206,1,8,7,2,-490000,-6037,68116,0,962429,459986,2986,189726,8000,-2000,20000
05BB01030207,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,225824,8000,-2000,25679 05BB01030207,1,8,7,2,-490000,-6037,68116,0,962699,459986,2986,225824,8000,-2000,20000
05BB01030208,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,261922,8000,-2000,25679 05BB01030208,1,8,7,2,-490000,-6037,68116,0,962941,459986,2986,261922,8000,-2000,20000
05BB01030209,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,298020,8000,-2000,25679 05BB01030209,1,8,7,2,-490000,-6037,68116,0,963320,459986,2986,298020,8000,-2000,20000
05BB01030210,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,334118,8000,-2000,25679 05BB01030210,1,8,7,2,-490000,-6037,68116,0,963559,459986,2986,334118,8000,-2000,20000
05BB01030211,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,370216,8000,-2000,25679 05BB01030211,1,8,7,2,-490000,-6037,68116,0,963960,459986,2986,370216,8000,-2000,20000
05BB01030212,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,406314,8000,-2000,25679 05BB01030212,1,8,7,2,-490000,-6037,68116,0,964200,459986,2986,406314,8000,-2000,20000
05BB01030213,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,442412,8000,-2000,25679 05BB01030213,1,8,7,2,-490000,-6037,68116,0,964459,459986,2986,442412,8000,-2000,20000
05BB01030214,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,478510,8000,-2000,25679 05BB01030214,1,8,7,2,-490000,-6037,68116,0,964708,459986,2986,478510,8000,-2000,20000
05BB01030215,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,514608,8000,-2000,25679 05BB01030215,1,8,7,2,-490000,-6037,68116,0,965039,459986,2986,514608,8000,-2000,20000
05BB01030216,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,550706,8000,-2000,25679 05BB01030216,1,8,7,2,-490000,-6037,68116,0,965270,459986,2986,550706,8000,-2000,20000
05BB01030217,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,586804,8000,-2000,25679 05BB01030217,1,8,7,2,-490000,-6037,68116,0,965650,459986,2986,586804,8000,-2000,20000
05BB01030218,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,622902,8000,-2000,25679 05BB01030218,1,8,7,2,-490000,-6037,68116,0,965879,459986,2986,622902,8000,-2000,20000
05BB01030219,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,659000,8000,-2000,25679 05BB01030219,1,8,7,2,-490000,-6037,68116,0,966280,459986,2986,659000,8000,-2000,20000
05BB01030220,1,8,7,2,-490000,-6037,73795,5679,1815417,465667,8667,695098,8000,-2000,25679 05BB01030220,1,8,7,2,-490000,-6037,68116,0,966529,459986,2986,695098,8000,-2000,20000
05BB01030301,1,8,7,2,-490000,216854,73795,5679,1815417,465667,8667,9236,8000,-2000,25679 05BB01030301,1,8,7,2,-490000,216854,68116,0,966908,459986,2986,9236,8000,-2000,20000
05BB01030302,1,8,7,2,-490000,216854,73795,5679,1815417,465667,8667,45334,8000,-2000,25679 05BB01030302,1,8,7,2,-490000,216854,68116,0,967149,459986,2986,45334,8000,-2000,20000
05BB01030303,1,8,7,2,-490000,216854,73795,5679,1815417,465667,8667,81432,8000,-2000,25679 05BB01030303,1,8,7,2,-490000,216854,68116,0,967431,459986,2986,81432,8000,-2000,20000
05BB01030304,1,8,7,2,-490000,216854,73795,5679,1815417,465667,8667,117530,8000,-2000,25679 05BB01030304,1,8,7,2,-490000,216854,68116,0,967651,459986,2986,117530,8000,-2000,20000
05BB01030305,1,8,7,2,-490000,216854,73795,5679,1815417,465667,8667,153628,8000,-2000,25679 05BB01030305,1,8,7,2,-490000,216854,68116,0,967921,459986,2986,153628,8000,-2000,20000
05BB01030306,1,8,7,2,-490000,216854,73795,5679,1815417,465667,8667,189726,8000,-2000,25679 05BB01030306,1,8,7,2,-490000,216854,68116,0,968150,459986,2986,189726,8000,-2000,20000
05BB01030307,1,8,7,2,-490000,216854,73795,5679,1815417,465667,8667,225824,8000,-2000,25679 05BB01030307,1,8,7,2,-490000,216854,68116,0,968500,459986,2986,225824,8000,-2000,20000
05BB01030308,1,8,7,2,-490000,216854,73795,5679,1815417,465667,8667,261922,8000,-2000,25679 05BB01030308,1,8,7,2,-490000,216854,68116,0,968740,459986,2986,261922,8000,-2000,20000
05BB01030309,1,8,7,2,-490000,216854,73795,5679,1815417,465667,8667,298020,8000,-2000,25679 05BB01030309,1,8,7,2,-490000,216854,68116,0,969120,459986,2986,298020,8000,-2000,20000
05BB01030310,1,8,7,2,-490000,216854,73795,5679,1815417,465667,8667,334118,8000,-2000,25679 05BB01030310,1,8,7,2,-490000,216854,68116,0,969369,459986,2986,334118,8000,-2000,20000
05BB01030311,1,8,7,2,-490000,216854,73795,5679,1815417,465667,8667,370216,8000,-2000,25679 05BB01030311,1,8,7,2,-490000,216854,68116,0,969630,459986,2986,370216,8000,-2000,20000
05BB01030312,1,8,7,2,-490000,216854,73795,5679,1815417,465666,8666,406314,8000,-2000,25679 05BB01030312,1,8,7,2,-490000,216854,68116,0,969870,459986,2986,406314,8000,-2000,20000
05BB01030313,1,8,7,2,-490000,216854,73795,5679,1815417,465666,8666,442412,8000,-2000,25679 05BB01030313,1,8,7,2,-490000,216854,68116,0,970250,459986,2986,442412,8000,-2000,20000
05BB01030314,1,8,7,2,-490000,216854,73795,5679,1815417,465666,8666,478510,8000,-2000,25679 05BB01030314,1,8,7,2,-490000,216854,68116,0,970480,459986,2986,478510,8000,-2000,20000
05BB01030315,1,8,7,2,-490000,216854,73795,5679,1815417,465666,8666,514608,8000,-2000,25679 05BB01030315,1,8,7,2,-490000,216854,68116,0,970850,459986,2986,514608,8000,-2000,20000
05BB01030316,1,8,7,2,-490000,216854,73795,5679,1815417,465666,8666,550706,8000,-2000,25679 05BB01030316,1,8,7,2,-490000,216854,68116,0,971090,459986,2986,550706,8000,-2000,20000
05BB01030317,1,8,7,2,-490000,216854,73795,5679,1815417,465666,8666,586804,8000,-2000,25679 05BB01030317,1,8,7,2,-490000,216854,68116,0,971470,459986,2986,586804,8000,-2000,20000
05BB01030318,1,8,7,2,-490000,216854,73795,5679,1815417,465666,8666,622902,8000,-2000,25679 05BB01030318,1,8,7,2,-490000,216854,68116,0,971720,459986,2986,622902,8000,-2000,20000
05BB01030319,1,8,7,2,-490000,216854,73795,5679,1815417,465666,8666,659000,8000,-2000,25679 05BB01030319,1,8,7,2,-490000,216854,68116,0,972140,459986,2986,659000,8000,-2000,20000
05BB01030320,1,8,7,2,-490000,216854,73795,5679,1815417,465666,8666,695098,8000,-2000,25679 05BB01030320,1,8,7,2,-490000,216854,68116,0,972400,459986,2986,695098,8000,-2000,20000
05BB01030401,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,9236,8000,-2000,25679 05BB01030401,1,8,7,2,-490000,442210,68116,0,972860,459986,2986,9236,8000,-2000,20000
05BB01030402,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,45334,8000,-2000,25679 05BB01030402,1,8,7,2,-490000,442210,68116,0,973180,459986,2986,45334,8000,-2000,20000
05BB01030403,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,81432,8000,-2000,25679 05BB01030403,1,8,7,2,-490000,442210,68116,0,973560,459986,2986,81432,8000,-2000,20000
05BB01030404,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,117530,8000,-2000,25679 05BB01030404,1,8,7,2,-490000,442210,68116,0,974029,459986,2986,117530,8000,-2000,20000
05BB01030405,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,153628,8000,-2000,25679 05BB01030405,1,8,7,2,-490000,442210,68116,0,974269,459986,2986,153628,8000,-2000,20000
05BB01030406,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,189726,8000,-2000,25679 05BB01030406,1,8,7,2,-490000,442210,68116,0,974580,459986,2986,189726,8000,-2000,20000
05BB01030407,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,225824,8000,-2000,25679 05BB01030407,1,8,7,2,-490000,442210,68116,0,974969,459986,2986,225824,8000,-2000,20000
05BB01030408,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,261922,8000,-2000,25679 05BB01030408,1,8,7,2,-490000,442210,68116,0,975209,459986,2986,261922,8000,-2000,20000
05BB01030409,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,298020,8000,-2000,25679 05BB01030409,1,8,7,2,-490000,442210,68116,0,975589,459986,2986,298020,8000,-2000,20000
05BB01030410,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,334118,8000,-2000,25679 05BB01030410,1,8,7,2,-490000,442210,68116,0,975799,459986,2986,334118,8000,-2000,20000
05BB01030411,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,370216,8000,-2000,25679 05BB01030411,1,8,7,2,-490000,442210,68116,0,976219,459986,2986,370216,8000,-2000,20000
05BB01030412,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,406314,8000,-2000,25679 05BB01030412,1,8,7,2,-490000,442210,68116,0,976459,459986,2986,406314,8000,-2000,20000
05BB01030413,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,442412,8000,-2000,25679 05BB01030413,1,8,7,2,-490000,442210,68116,0,976939,459986,2986,442412,8000,-2000,20000
05BB01030414,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,478510,8000,-2000,25679 05BB01030414,1,8,7,2,-490000,442210,68116,0,977199,459986,2986,478510,8000,-2000,20000
05BB01030415,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,514608,8000,-2000,25679 05BB01030415,1,8,7,2,-490000,442210,68116,0,977660,459986,2986,514608,8000,-2000,20000
05BB01030416,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,550706,8000,-2000,25679 05BB01030416,1,8,7,2,-490000,442210,68116,0,978070,459986,2986,550706,8000,-2000,20000
05BB01030417,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,586804,8000,-2000,25679 05BB01030417,1,8,7,2,-490000,442210,68116,0,978349,459986,2986,586804,8000,-2000,20000
05BB01030418,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,622902,8000,-2000,25679 05BB01030418,1,8,7,2,-490000,442210,68116,0,978749,459986,2986,622902,8000,-2000,20000
05BB01030419,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,659000,8000,-2000,25679 05BB01030419,1,8,7,2,-490000,442210,68116,0,979019,459986,2986,659000,8000,-2000,20000
05BB01030420,1,8,7,2,-490000,442210,73795,5679,1815417,465666,8666,695098,8000,-2000,25679 05BB01030420,1,8,7,2,-490000,442210,68116,0,979530,459986,2986,695098,8000,-2000,20000
05BB01040101,1,8,7,2,-490000,-232800,73795,5679,2681736,465666,8666,9236,8000,-2000,25679 05BB01040101,1,8,7,2,-490000,-232800,73795,5679,2681736,465666,8666,9236,8000,-2000,25679
05BB01040102,1,8,7,2,-490000,-232800,73795,5679,2681736,465666,8666,45334,8000,-2000,25679 05BB01040102,1,8,7,2,-490000,-232800,73795,5679,2681736,465666,8666,45334,8000,-2000,25679
05BB01040103,1,8,7,2,-490000,-232800,73795,5679,2681736,465666,8666,81432,8000,-2000,25679 05BB01040103,1,8,7,2,-490000,-232800,73795,5679,2681736,465666,8666,81432,8000,-2000,25679
...@@ -8079,86 +8079,86 @@ ...@@ -8079,86 +8079,86 @@
05BB02050418,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,622902,8000,-2000,430090 05BB02050418,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,622902,8000,-2000,430090
05BB02050419,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,659000,8000,-2000,430090 05BB02050419,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,659000,8000,-2000,430090
05BB02050420,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,695098,8000,-2000,430090 05BB02050420,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,695098,8000,-2000,430090
05BB02060101,1,8,7,2,-490000,-232800,478209,410093,85000,870096,413096,9236,8000,-2000,430093 05BB02060101,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,9236,8000,-2000,438812
05BB02060102,1,8,7,2,-490000,-232800,478209,410093,85000,870096,413096,45334,8000,-2000,430093 05BB02060102,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,45334,8000,-2000,438812
05BB02060103,1,8,7,2,-490000,-232800,478208,410092,85000,870096,413096,81432,8000,-2000,430092 05BB02060103,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,81432,8000,-2000,438812
05BB02060104,1,8,7,2,-490000,-232800,478208,410092,85000,870096,413096,117530,8000,-2000,430092 05BB02060104,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,117530,8000,-2000,438812
05BB02060105,1,8,7,2,-490000,-232800,478208,410092,85000,870096,413096,153628,8000,-2000,430092 05BB02060105,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,153628,8000,-2000,438812
05BB02060106,1,8,7,2,-490000,-232800,478208,410092,85000,870096,413096,189726,8000,-2000,430092 05BB02060106,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,189726,8000,-2000,438812
05BB02060107,1,8,7,2,-490000,-232800,478208,410092,85000,870096,413096,225824,8000,-2000,430092 05BB02060107,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,225824,8000,-2000,438812
05BB02060108,1,8,7,2,-490000,-232800,478208,410092,85000,870095,413095,261922,8000,-2000,430092 05BB02060108,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,261922,8000,-2000,438812
05BB02060109,1,8,7,2,-490000,-232800,478208,410092,85000,870095,413095,298020,8000,-2000,430092 05BB02060109,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,298020,8000,-2000,438812
05BB02060110,1,8,7,2,-490000,-232800,478208,410092,85000,870095,413095,334118,8000,-2000,430092 05BB02060110,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,334118,8000,-2000,438812
05BB02060111,1,8,7,2,-490000,-232800,478208,410092,85000,870095,413095,370216,8000,-2000,430092 05BB02060111,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,370216,8000,-2000,438812
05BB02060112,1,8,7,2,-490000,-232800,478208,410092,85000,870095,413095,406314,8000,-2000,430092 05BB02060112,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,406314,8000,-2000,438812
05BB02060113,1,8,7,2,-490000,-232800,478208,410092,85000,870095,413095,442412,8000,-2000,430092 05BB02060113,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,442412,8000,-2000,438812
05BB02060114,1,8,7,2,-490000,-232800,478208,410092,85000,870095,413095,478510,8000,-2000,430092 05BB02060114,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,478510,8000,-2000,438812
05BB02060115,1,8,7,2,-490000,-232800,478208,410092,85000,870095,413095,514608,8000,-2000,430092 05BB02060115,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,514608,8000,-2000,438812
05BB02060116,1,8,7,2,-490000,-232800,478208,410092,85000,870095,413095,550706,8000,-2000,430092 05BB02060116,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,550706,8000,-2000,438812
05BB02060117,1,8,7,2,-490000,-232800,478208,410092,85000,870094,413094,586804,8000,-2000,430092 05BB02060117,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,586804,8000,-2000,438812
05BB02060118,1,8,7,2,-490000,-232800,478208,410092,85000,870094,413094,622902,8000,-2000,430092 05BB02060118,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,622902,8000,-2000,438812
05BB02060119,1,8,7,2,-490000,-232800,478208,410092,85000,870094,413094,659000,8000,-2000,430092 05BB02060119,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,659000,8000,-2000,438812
05BB02060120,1,8,7,2,-490000,-232800,478207,410091,85000,870094,413094,695098,8000,-2000,430091 05BB02060120,1,8,7,2,-490000,-232800,486928,418812,1826097,878796,421796,695098,8000,-2000,438812
05BB02060201,1,8,7,2,-490000,-6037,478207,410091,85000,870094,413094,9236,8000,-2000,430091 05BB02060201,1,8,7,2,-490000,-6037,486938,418822,1826097,878823,421823,9236,8000,-2000,438822
05BB02060202,1,8,7,2,-490000,-6037,478207,410091,85000,870094,413094,45334,8000,-2000,430091 05BB02060202,1,8,7,2,-490000,-6037,487748,419632,1826097,879811,422811,45334,8000,-2000,439632
05BB02060203,1,8,7,2,-490000,-6037,478207,410091,85000,870094,413094,81432,8000,-2000,430091 05BB02060203,1,8,7,2,-490000,-6037,489582,421466,1826097,881725,424802,81432,8000,-2000,441466
05BB02060204,1,8,7,2,-490000,-6037,478207,410091,85000,870094,413094,117530,8000,-2000,430091 05BB02060204,1,8,7,2,-490000,-6037,491460,423251,1826097,883706,426706,117530,8000,-2000,443344
05BB02060205,1,8,7,2,-490000,-6037,478207,410091,85000,870094,413094,153628,8000,-2000,430091 05BB02060205,1,8,7,2,-490000,-6037,495486,427370,1826097,888008,431008,153628,8000,-2000,447370
05BB02060206,1,8,7,2,-490000,-6037,478207,410091,85000,870094,413094,189726,8000,-2000,430091 05BB02060206,1,8,7,2,-490000,-6037,500942,432826,1826097,893639,436639,189726,8000,-2000,452826
05BB02060207,1,8,7,2,-490000,-6037,478207,410091,85000,870094,413094,225824,8000,-2000,430091 05BB02060207,1,8,7,2,-490000,-6037,504633,436517,1826097,897435,440435,225824,8000,-2000,456517
05BB02060208,1,8,7,2,-490000,-6037,478207,410091,85000,870093,413093,261922,8000,-2000,430091 05BB02060208,1,8,7,2,-490000,-6037,509221,441105,1826097,902074,445074,261922,8000,-2000,461105
05BB02060209,1,8,7,2,-490000,-6037,478207,410091,85000,870093,413093,298020,8000,-2000,430091 05BB02060209,1,8,7,2,-490000,-6037,514952,446836,1826097,907801,450801,298020,8000,-2000,466836
05BB02060210,1,8,7,2,-490000,-6037,478207,410091,85000,870093,413093,334118,8000,-2000,430091 05BB02060210,1,8,7,2,-490000,-6037,521492,453376,1826097,914355,457355,334118,8000,-2000,473376
05BB02060211,1,8,7,2,-490000,-6037,478207,410091,85000,870093,413093,370216,8000,-2000,430091 05BB02060211,1,8,7,2,-490000,-6037,526084,457968,1826097,918950,461950,370216,8000,-2000,477968
05BB02060212,1,8,7,2,-490000,-6037,478207,410091,85000,870093,413093,406314,8000,-2000,430091 05BB02060212,1,8,7,2,-490000,-6037,533067,464951,1826097,925942,468942,406314,8000,-2000,484951
05BB02060213,1,8,7,2,-490000,-6037,478207,410091,85000,870093,413093,442412,8000,-2000,430091 05BB02060213,1,8,7,2,-490000,-6037,540268,472152,1826097,933138,476138,442412,8000,-2000,492152
05BB02060214,1,8,7,2,-490000,-6037,478207,410091,85000,870093,413093,478510,8000,-2000,430091 05BB02060214,1,8,7,2,-490000,-6037,546870,478554,1826097,939533,482533,478510,8000,-2000,498754
05BB02060215,1,8,7,2,-490000,-6037,478207,410091,85000,870093,413093,514608,8000,-2000,430091 05BB02060215,1,8,7,2,-490000,-6037,551664,483548,1826097,944532,487532,514608,8000,-2000,503548
05BB02060216,1,8,7,2,-490000,-6037,478207,410091,85000,870093,413093,550706,8000,-2000,430091 05BB02060216,1,8,7,2,-490000,-6037,556661,488545,1826097,949532,492532,550706,8000,-2000,508545
05BB02060217,1,8,7,2,-490000,-6037,478207,410091,85000,870093,413093,586804,8000,-2000,430091 05BB02060217,1,8,7,2,-490000,-6037,562065,493949,1826097,954937,497937,586804,8000,-2000,513949
05BB02060218,1,8,7,2,-490000,-6037,478207,410091,85000,870093,413093,622902,8000,-2000,430091 05BB02060218,1,8,7,2,-490000,-6037,566860,498744,1826097,959537,502737,622902,8000,-2000,518744
05BB02060219,1,8,7,2,-490000,-6037,478206,410090,85000,870093,413093,659000,8000,-2000,430090 05BB02060219,1,8,7,2,-490000,-6037,573667,505551,1826097,966330,509530,659000,8000,-2000,525551
05BB02060220,1,8,7,2,-490000,-6037,478206,410090,85000,870093,413093,695098,8000,-2000,430090 05BB02060220,1,8,7,2,-490000,-6037,580260,512144,1826097,972935,516135,695098,8000,-2000,532144
05BB02060301,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,9236,8000,-2000,430090 05BB02060301,1,8,7,2,-490000,216854,586864,518748,1826097,979533,522533,9236,8000,-2000,538748
05BB02060302,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,45334,8000,-2000,430090 05BB02060302,1,8,7,2,-490000,216854,591668,523351,1826097,984337,527337,45334,8000,-2000,543351
05BB02060303,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,81432,8000,-2000,430090 05BB02060303,1,8,7,2,-490000,216854,597860,529744,1826097,990738,533738,81432,8000,-2000,549744
05BB02060304,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,117530,8000,-2000,430090 05BB02060304,1,8,7,2,-490000,216854,603466,535350,1826097,996336,539336,117530,8000,-2000,555350
05BB02060305,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,153628,8000,-2000,430090 05BB02060305,1,8,7,2,-490000,216854,608066,539950,1826097,1000942,543942,153628,8000,-2000,559950
05BB02060306,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,189726,8000,-2000,430090 05BB02060306,1,8,7,2,-490000,216854,613867,545551,1826097,1006539,549539,189726,8000,-2000,565751
05BB02060307,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,225824,8000,-2000,430090 05BB02060307,1,8,7,2,-490000,216854,618671,550555,1826097,1011536,554536,225824,8000,-2000,570555
05BB02060308,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,261922,8000,-2000,430090 05BB02060308,1,8,7,2,-490000,216854,626465,558149,1826097,1019136,562136,261922,8000,-2000,578349
05BB02060309,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,298020,8000,-2000,430090 05BB02060309,1,8,7,2,-490000,216854,631068,562952,1826097,1023735,566934,298020,8000,-2000,582952
05BB02060310,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,334118,8000,-2000,430090 05BB02060310,1,8,7,2,-490000,216854,638273,570157,1826097,1031134,574134,334118,8000,-2000,590157
05BB02060311,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,370216,8000,-2000,430090 05BB02060311,1,8,7,2,-490000,216854,643271,575155,1826097,1036141,579141,370216,8000,-2000,595155
05BB02060312,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,406314,8000,-2000,430090 05BB02060312,1,8,7,2,-490000,216854,651076,582960,1826097,1043730,586930,406314,8000,-2000,602960
05BB02060313,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,442412,8000,-2000,430090 05BB02060313,1,8,7,2,-490000,216854,655470,587354,1826097,1048334,591334,442412,8000,-2000,607354
05BB02060314,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,478510,8000,-2000,430090 05BB02060314,1,8,7,2,-490000,216854,660876,592760,1826097,1053738,596738,478510,8000,-2000,612760
05BB02060315,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,514608,8000,-2000,430090 05BB02060315,1,8,7,2,-490000,216854,665475,597359,1826097,1058338,601338,514608,8000,-2000,617359
05BB02060316,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,550706,8000,-2000,430090 05BB02060316,1,8,7,2,-490000,216854,673865,605749,1826097,1066740,609740,550706,8000,-2000,625749
05BB02060317,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,586804,8000,-2000,430090 05BB02060317,1,8,7,2,-490000,216854,678870,610554,1826097,1071538,614538,586804,8000,-2000,630554
05BB02060318,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,622902,8000,-2000,430090 05BB02060318,1,8,7,2,-490000,216854,686271,618155,1826097,1079133,622133,622902,8000,-2000,638155
05BB02060319,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,659000,8000,-2000,430090 05BB02060319,1,8,7,2,-490000,216854,690866,622750,1826097,1083738,626738,659000,8000,-2000,642750
05BB02060320,1,8,7,2,-490000,216854,478206,410090,85000,870093,413093,695098,8000,-2000,430090 05BB02060320,1,8,7,2,-490000,216854,697872,629556,1826097,1090531,633531,695098,8000,-2000,649756
05BB02060401,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,9236,8000,-2000,430090 05BB02060401,1,8,7,2,-490000,442210,702271,634155,1826097,1095132,638132,9236,8000,-2000,654155
05BB02060402,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,45334,8000,-2000,430090 05BB02060402,1,8,7,2,-490000,442210,710472,642356,1826097,1103333,646333,45334,8000,-2000,662356
05BB02060403,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,81432,8000,-2000,430090 05BB02060403,1,8,7,2,-490000,442210,715264,647148,1826097,1108130,651130,81432,8000,-2000,667148
05BB02060404,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,117530,8000,-2000,430090 05BB02060404,1,8,7,2,-490000,442210,723474,655358,1826097,1116332,659332,117530,8000,-2000,675358
05BB02060405,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,153628,8000,-2000,430090 05BB02060405,1,8,7,2,-490000,442210,728866,660750,1826097,1121727,664727,153628,8000,-2000,680750
05BB02060406,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,189726,8000,-2000,430090 05BB02060406,1,8,7,2,-490000,442210,733868,665752,1826097,1126729,669729,189726,8000,-2000,685752
05BB02060407,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,225824,8000,-2000,430090 05BB02060407,1,8,7,2,-490000,442210,742271,674155,1826097,1135138,678138,225824,8000,-2000,694155
05BB02060408,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,261922,8000,-2000,430090 05BB02060408,1,8,7,2,-490000,442210,747066,678950,1826097,1139940,682940,261922,8000,-2000,698950
05BB02060409,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,298020,8000,-2000,430090 05BB02060409,1,8,7,2,-490000,442210,755072,686956,1826097,1147933,690933,298020,8000,-2000,706956
05BB02060410,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,334118,8000,-2000,430090 05BB02060410,1,8,7,2,-490000,442210,759667,691551,1826097,1152535,695535,334118,8000,-2000,711551
05BB02060411,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,370216,8000,-2000,430090 05BB02060411,1,8,7,2,-490000,442210,765863,697747,1826097,1158729,701729,370216,8000,-2000,717747
05BB02060412,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,406314,8000,-2000,430090 05BB02060412,1,8,7,2,-490000,442210,770467,702351,1826097,1163130,706331,406314,8000,-2000,722351
05BB02060413,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,442412,8000,-2000,430090 05BB02060413,1,8,7,2,-490000,442210,775062,706946,1826097,1167937,710937,442412,8000,-2000,726946
05BB02060414,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,478510,8000,-2000,430090 05BB02060414,1,8,7,2,-490000,442210,779861,711745,1826097,1172736,715736,478510,8000,-2000,731745
05BB02060415,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,514608,8000,-2000,430090 05BB02060415,1,8,7,2,-490000,442210,787865,719749,1826097,1180735,723735,514608,8000,-2000,739749
05BB02060416,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,550706,8000,-2000,430090 05BB02060416,1,8,7,2,-490000,442210,792659,724543,1826097,1185329,728329,550706,8000,-2000,744543
05BB02060417,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,586804,8000,-2000,430090 05BB02060417,1,8,7,2,-490000,442210,799692,731576,1826097,1192445,735445,586804,8000,-2000,751576
05BB02060418,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,622902,8000,-2000,430090 05BB02060418,1,8,7,2,-490000,442210,804380,736264,1826097,1197030,740030,622902,8000,-2000,756264
05BB02060419,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,659000,8000,-2000,430090 05BB02060419,1,8,7,2,-490000,442210,809798,741682,1826097,1202168,745292,659000,8000,-2000,761682
05BB02060420,1,8,7,2,-490000,442210,478206,410090,85000,870093,413093,695098,8000,-2000,430090 05BB02060420,1,8,7,2,-490000,442210,812947,744724,1826097,1205233,748233,695098,8000,-2000,764831
05BB03010101,1,8,7,2,-490000,-232800,888817,820701,85000,1280706,823706,9236,8000,-2000,840701 05BB03010101,1,8,7,2,-490000,-232800,888817,820701,85000,1280706,823706,9236,8000,-2000,840701
05BB03010102,1,8,7,2,-490000,-232800,888817,820701,85000,1280706,823706,45334,8000,-2000,840701 05BB03010102,1,8,7,2,-490000,-232800,888817,820701,85000,1280706,823706,45334,8000,-2000,840701
05BB03010103,1,8,7,2,-490000,-232800,888817,820701,85000,1280706,823706,81432,8000,-2000,840701 05BB03010103,1,8,7,2,-490000,-232800,888817,820701,85000,1280706,823706,81432,8000,-2000,840701
......
source/DeviceLibrary/manager/StoreManager.cs
...@@ -18,6 +18,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -18,6 +18,7 @@ namespace OnlineStore.DeviceLibrary
public static int OutMoveId = 7; public static int OutMoveId = 7;
public static bool TrayToOutLineTest = false; public static bool TrayToOutLineTest = false;
public static bool UseSecurityAccess = ConfigAppSettings.GetIntValue(Setting_Init.UseSecurityAccess).Equals(1);
public static bool DisGetWare = false; public static bool DisGetWare = false;
public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1); public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1);
......
source/DeviceLibrary/storeBean/inputBean/InputEquip.cs
...@@ -43,8 +43,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -43,8 +43,8 @@ namespace OnlineStore.DeviceLibrary
MiddleAxis = new AxisBean(config.TakeAxis_Middle, Name, false); MiddleAxis = new AxisBean(config.TakeAxis_Middle, Name, false);
UpdownAxis = new AxisBean(config.TakeAxis_Updown, Name, false); UpdownAxis = new AxisBean(config.TakeAxis_Updown, Name, false);
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 }; moveAxisArray = new AxisBean[] { MiddleAxis, UpdownAxis };
if (config.UseClampJaw.Equals(1)) if (config.UseClampJaw.Equals(1))
{ {
...@@ -62,7 +62,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -62,7 +62,7 @@ namespace OnlineStore.DeviceLibrary
{ {
config.MiddleOffsetValue = 40000; config.MiddleOffsetValue = 40000;
} }
runStatus = RunStatus.Wait; runStatus = RunStatus.Wait;
} }
#region 启动，复位，停止 处理 #region 启动，复位，停止 处理
...@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo("StartRun ： 开始启动 "); LogInfo("StartRun ： 开始启动 ");
runStatus = RunStatus.HomeMoving; runStatus = RunStatus.HomeMoving;
MoveInfo.NewMove(MoveType.RHome,new InOutParam()); MoveInfo.NewMove(MoveType.RHome, new InOutParam());
if (!BatchMove_A.Reset()) if (!BatchMove_A.Reset())
{ {
...@@ -121,7 +121,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -121,7 +121,7 @@ namespace OnlineStore.DeviceLibrary
} }
LogInfo("Reset 开始重置 "); LogInfo("Reset 开始重置 ");
runStatus = RunStatus.Reset; runStatus = RunStatus.Reset;
MoveInfo.NewMove(MoveType.Reset,new InOutParam()); MoveInfo.NewMove(MoveType.Reset, new InOutParam());
if (!BatchMove_A.Reset()) if (!BatchMove_A.Reset())
{ {
SetWarnMsg("复位失败：A料口复位失败"); SetWarnMsg("复位失败：A料口复位失败");
...@@ -178,21 +178,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -178,21 +178,21 @@ namespace OnlineStore.DeviceLibrary
int updownP = UpdownAxis.GetAclPosition(); int updownP = UpdownAxis.GetAclPosition();
int middleP = MiddleAxis.GetAclPosition(); int middleP = MiddleAxis.GetAclPosition();
int middleWucha = 20000; int middleWucha = 20000;
int updownWucha = 20000; int updownWucha = 20000;
//旋转轴在A暂存区 //旋转轴在A暂存区
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_AUpperL + 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}");
...@@ -203,18 +203,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -203,18 +203,18 @@ namespace OnlineStore.DeviceLibrary
SetWarnMsg($"复位失败，当前旋转轴位置{middleP}，升降轴位置{updownP}，无法判断位于A侧暂存区上方或下方"); SetWarnMsg($"复位失败，当前旋转轴位置{middleP}，升降轴位置{updownP}，无法判断位于A侧暂存区上方或下方");
Alarm(AlarmType.SuddenStop); Alarm(AlarmType.SuddenStop);
} }
} }
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_BUpperL + 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}");
...@@ -225,7 +225,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -225,7 +225,7 @@ namespace OnlineStore.DeviceLibrary
SetWarnMsg($"复位失败，当前旋转轴位置{middleP}，升降轴位置{updownP}，无法判断位于A侧暂存区上方或下方"); SetWarnMsg($"复位失败，当前旋转轴位置{middleP}，升降轴位置{updownP}，无法判断位于A侧暂存区上方或下方");
Alarm(AlarmType.SuddenStop); Alarm(AlarmType.SuddenStop);
} }
} }
else else
{ {
if (MiddleAxis.IsNeedHome) if (MiddleAxis.IsNeedHome)
...@@ -366,6 +366,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -366,6 +366,7 @@ namespace OnlineStore.DeviceLibrary
{ {
return; return;
} }
SecurityAccessProcess();
BusyMoveProcess(); BusyMoveProcess();
IOTimeOutProcess(); IOTimeOutProcess();
//判断流水线打开了才可以运行 //判断流水线打开了才可以运行
...@@ -377,7 +378,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -377,7 +378,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (moveBean.MoveInfo.MoveType.Equals(MoveType.InStore) && moveBean.MoveInfo.IsStep(StepEnum.IB10_ScanOK)) if (moveBean.MoveInfo.MoveType.Equals(MoveType.InStore) && moveBean.MoveInfo.IsStep(StepEnum.IB10_ScanOK))
{ {
LogInfo(moveBean.Name + "开始取料:"+moveBean.GetInstoreParam().PosInfo.ToStr()); LogInfo(moveBean.Name + "开始取料:" + moveBean.GetInstoreParam().PosInfo.ToStr());
StartInstore(moveBean.GetInstoreParam()); StartInstore(moveBean.GetInstoreParam());
break; break;
} }
...@@ -552,10 +553,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -552,10 +553,10 @@ namespace OnlineStore.DeviceLibrary
} }
} }
public bool IsNoReelAlarm() public bool IsNoReelAlarm()
{ {
if (runStatus.Equals(RunStatus.Busy) && alarmType.Equals(AlarmType.IoSingleTimeOut)) if (runStatus.Equals(RunStatus.Busy) && alarmType.Equals(AlarmType.IoSingleTimeOut))
{ {
if (MoveInfo.MoveType.Equals(MoveType.InStore) && MoveInfo.MoveStep.Equals(StepEnum.II08_ClampWork)) if (MoveInfo.MoveType.Equals(MoveType.InStore) && MoveInfo.MoveStep.Equals(StepEnum.II08_ClampWork))
{ {
return true; return true;
...@@ -594,7 +595,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -594,7 +595,7 @@ namespace OnlineStore.DeviceLibrary
//在A下暂存区 //在A下暂存区
if (areaNum == 2) if (areaNum == 2)
{ {
return true ; return true;
} }
} }
//升降轴高于上方低点 //升降轴高于上方低点
...@@ -649,17 +650,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -649,17 +650,17 @@ namespace OnlineStore.DeviceLibrary
/// <returns></returns> /// <returns></returns>
public bool AxisIsInShelfUp(int shelfType) public bool AxisIsInShelfUp(int shelfType)
{ {
int middleP = MiddleAxis.GetAclPosition(); int middleP = MiddleAxis.GetAclPosition();
int middleWucha = 20000; int middleWucha = 20000;
//旋转轴在A暂存区 //旋转轴在A暂存区
if (MiddleAxis.IsInPosition(Config.Middle_P2_ATake, middleWucha) ) if (MiddleAxis.IsInPosition(Config.Middle_P2_ATake, middleWucha))
{ {
if (shelfType.Equals(1)) if (shelfType.Equals(1))
{ {
return true; return true;
} }
} }
else if (MiddleAxis.IsInPosition(Config.Middle_P3_BTake, middleWucha) ) else if (MiddleAxis.IsInPosition(Config.Middle_P3_BTake, middleWucha))
{ {
if (shelfType.Equals(2)) if (shelfType.Equals(2))
{ {
...@@ -668,6 +669,84 @@ namespace OnlineStore.DeviceLibrary ...@@ -668,6 +669,84 @@ namespace OnlineStore.DeviceLibrary
} }
return false; return false;
} }
//光栅状态：0正常。1=安全门禁打开，已停止运动
private int CurrSecurityAccess = 0;
protected void SecurityAccessProcess()
{
try
{
if (!baseConfig.DIList.ContainsKey(IO_Type.SafetyRasterSignal))
{
return;
}
if (CurrSecurityAccess.Equals(0) && StoreManager.UseSecurityAccess)
{
if (BatchMove_A.ProcessShelfEnter || BatchMove_A.ProcessShelfOut)
{
return;
}
if (BatchMove_B.ProcessShelfEnter || BatchMove_B.ProcessShelfOut)
{
return;
}
if (IOValue(IO_Type.SafetyRasterSignal).Equals(IO_VALUE.LOW))
{
SecurityAccessStop();
}
}
else if (CurrSecurityAccess.Equals(1))
{
if (IOValue(IO_Type.SafetyRasterSignal).Equals(IO_VALUE.HIGH))
{
SecurityAccessReset();
}
}
}
catch (Exception ex)
{
LogUtil.error(Name + " 出错 ：" + ex.ToString());
}
}
private void SecurityAccessStop()
{
if (!baseConfig.DIList.ContainsKey(IO_Type.SafetyRasterSignal))
{
return;
}
CurrSecurityAccess = 1;
if (alarmType > (AlarmType.IoSingleTimeOut))
{
return;
}
ConfigIO di = baseConfig.DIList[IO_Type.SafetyRasterSignal];
LogUtil.info($"{Name }光栅被遮挡，停止当前运动{MoveInfo.MoveType},MoveStop={MoveStop}，报警急停");
SetWarnMsg("光栅被遮挡，报警急停");
Alarm(AlarmType.SuddenStop);
}
private void SecurityAccessReset()
{
if (!baseConfig.DIList.ContainsKey(IO_Type.SafetyRasterSignal))
{
return;
}
CurrSecurityAccess = 0;
MoveStop = false;
ConfigIO di = baseConfig.DIList[IO_Type.SafetyRasterSignal];
if (alarmType > (AlarmType.IoSingleTimeOut))
{
return;
}
//光栅恢复处理
}
} }
} }
source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs
...@@ -56,6 +56,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -56,6 +56,7 @@ namespace OnlineStore.DeviceLibrary
} }
#region 入库 #region 入库
private DateTime startInTime = DateTime.Now;
public override bool StartInstore(InOutParam param) public override bool StartInstore(InOutParam param)
{ {
if (!NoAlarm()) if (!NoAlarm())
...@@ -68,6 +69,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -68,6 +69,7 @@ namespace OnlineStore.DeviceLibrary
{ {
runStatus = RunStatus.Busy; runStatus = RunStatus.Busy;
MoveInfo.NewMove(MoveType.InStore, param); MoveInfo.NewMove(MoveType.InStore, param);
startInTime = DateTime.Now;
//if (MiddleAxis.IsInPosition(Config.Middle_P1)) //if (MiddleAxis.IsInPosition(Config.Middle_P1))
//{ //{
if (UpdownAxis.IsInPosition(Config.Updown_P1)) if (UpdownAxis.IsInPosition(Config.Updown_P1))
...@@ -315,7 +317,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -315,7 +317,8 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StepEnum.II47_MiddleToP1)) else if (MoveInfo.IsStep(StepEnum.II47_MiddleToP1))
{ {
ClearTimeoutAlarm("扫码结束"); ClearTimeoutAlarm("扫码结束");
MoveLog($" 入料->A侧放料结束，更新A上暂存区物料{MoveInfo.MoveParam.PosInfo.ToStr()}"); TimeSpan span = DateTime.Now - startInTime;
MoveLog($" 入料->A侧放料结束，更新A上暂存区物料{MoveInfo.MoveParam.PosInfo.ToStr()}，耗时【{FormUtil.GetSpanStr(span)}】");
BufferDataManager.AInStoreInfo = MoveInfo.MoveParam.PosInfo; BufferDataManager.AInStoreInfo = MoveInfo.MoveParam.PosInfo;
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = RunStatus.Runing; runStatus = RunStatus.Runing;
...@@ -401,7 +404,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -401,7 +404,8 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StepEnum.II67_MiddleToP1)) else if (MoveInfo.IsStep(StepEnum.II67_MiddleToP1))
{ {
ClearTimeoutAlarm("扫码结束"); ClearTimeoutAlarm("扫码结束");
MoveLog($" 入料->B侧放料结束，更新B上暂存区物料{MoveInfo.MoveParam.PosInfo.ToStr()}"); TimeSpan span = DateTime.Now - startInTime;
MoveLog($" 入料->B侧放料结束，更新B上暂存区物料{MoveInfo.MoveParam.PosInfo.ToStr()}，耗时【{FormUtil.GetSpanStr(span)}】");
BufferDataManager.BInStoreInfo = MoveInfo.MoveParam.PosInfo; BufferDataManager.BInStoreInfo = MoveInfo.MoveParam.PosInfo;
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = RunStatus.Runing; runStatus = RunStatus.Runing;
...@@ -452,7 +456,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -452,7 +456,8 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(StepEnum.II86_MiddleToP1)) else if (MoveInfo.IsStep(StepEnum.II86_MiddleToP1))
{ {
MoveLog($" 入料->NG箱放料结束"); TimeSpan span = DateTime.Now - startInTime;
MoveLog($" 入料->NG箱放料结束，耗时【{FormUtil.GetSpanStr(span)}】");
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = RunStatus.Runing; runStatus = RunStatus.Runing;
} }
...@@ -655,6 +660,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -655,6 +660,7 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region 出库 #region 出库
private DateTime startOutTime = DateTime.Now;
public override bool StartOutstore(InOutParam param) public override bool StartOutstore(InOutParam param)
{ {
if (!NoAlarm()) if (!NoAlarm())
...@@ -671,6 +677,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -671,6 +677,7 @@ namespace OnlineStore.DeviceLibrary
{ {
runStatus = RunStatus.Busy; runStatus = RunStatus.Busy;
MoveInfo.NewMove(MoveType.OutStore, param); MoveInfo.NewMove(MoveType.OutStore, param);
startOutTime = DateTime.Now;
MoveInfo.NextMoveStep(StepEnum.IO01_ReelCheck); MoveInfo.NextMoveStep(StepEnum.IO01_ReelCheck);
if (!MiddleAxis.IsInPosition(Config.Middle_P1)) if (!MiddleAxis.IsInPosition(Config.Middle_P1))
{ {
...@@ -688,6 +695,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -688,6 +695,7 @@ namespace OnlineStore.DeviceLibrary
{ {
runStatus = RunStatus.Busy; runStatus = RunStatus.Busy;
MoveInfo.NewMove(MoveType.OutStore, param); MoveInfo.NewMove(MoveType.OutStore, param);
startOutTime = DateTime.Now;
MoveInfo.NextMoveStep(StepEnum.IO11_ReelCheck); MoveInfo.NextMoveStep(StepEnum.IO11_ReelCheck);
if (!MiddleAxis.IsInPosition(Config.Middle_P1)) if (!MiddleAxis.IsInPosition(Config.Middle_P1))
{ {
...@@ -900,7 +908,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -900,7 +908,8 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.EndMove(); MoveInfo.EndMove();
runStatus = RunStatus.Runing; runStatus = RunStatus.Runing;
MoveLog($"出库->料串 {MoveInfo.SLog}: 放料完成"); TimeSpan span = DateTime.Now - startOutTime;
MoveLog($"出库->料串 {MoveInfo.SLog}: 放料完成，耗时【{FormUtil.GetSpanStr(span)}】");
} }
#endregion #endregion
......
source/XLRStoreClient/FrmXLRStore.Designer.cs
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
this.aGVCancelStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aGVCancelStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
this.启用安全光栅ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
...@@ -137,7 +138,7 @@ ...@@ -137,7 +138,7 @@
this.tabPage2.Controls.Add(this.panel1); this.tabPage2.Controls.Add(this.panel1);
this.tabPage2.Location = new System.Drawing.Point(4, 29); this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(988, 605); this.tabPage2.Size = new System.Drawing.Size(192, 67);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 设备状态 "; this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -148,7 +149,7 @@ ...@@ -148,7 +149,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(988, 605); this.panel1.Size = new System.Drawing.Size(192, 67);
this.panel1.TabIndex = 1; this.panel1.TabIndex = 1;
// //
// tableLayoutPanel1 // tableLayoutPanel1
...@@ -173,7 +174,7 @@ ...@@ -173,7 +174,7 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(988, 605); this.tableLayoutPanel1.Size = new System.Drawing.Size(192, 67);
this.tableLayoutPanel1.TabIndex = 0; this.tableLayoutPanel1.TabIndex = 0;
// //
// InputControl // InputControl
...@@ -184,10 +185,10 @@ ...@@ -184,10 +185,10 @@
this.tableLayoutPanel1.SetColumnSpan(this.InputControl, 2); this.tableLayoutPanel1.SetColumnSpan(this.InputControl, 2);
this.InputControl.Dock = System.Windows.Forms.DockStyle.Fill; this.InputControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.InputControl.EquipText = "上料机构"; this.InputControl.EquipText = "上料机构";
this.InputControl.Location = new System.Drawing.Point(3, 376); this.InputControl.Location = new System.Drawing.Point(3, 43);
this.InputControl.MoveInfo = "暂无出入库"; this.InputControl.MoveInfo = "暂无出入库";
this.InputControl.Name = "InputControl"; this.InputControl.Name = "InputControl";
this.InputControl.Size = new System.Drawing.Size(982, 109); this.InputControl.Size = new System.Drawing.Size(186, 6);
this.InputControl.TabIndex = 5; this.InputControl.TabIndex = 5;
this.InputControl.WorkStatus = "暂未启动"; this.InputControl.WorkStatus = "暂未启动";
// //
...@@ -197,10 +198,10 @@ ...@@ -197,10 +198,10 @@
this.ReelControlA1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlA1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlA1.ColorStatus = System.Drawing.Color.White; this.ReelControlA1.ColorStatus = System.Drawing.Color.White;
this.ReelControlA1.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlA1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlA1.Location = new System.Drawing.Point(3, 204); this.ReelControlA1.Location = new System.Drawing.Point(3, 25);
this.ReelControlA1.Name = "ReelControlA1"; this.ReelControlA1.Name = "ReelControlA1";
this.ReelControlA1.ReelText = "暂存区物料"; this.ReelControlA1.ReelText = "暂存区物料";
this.ReelControlA1.Size = new System.Drawing.Size(488, 80); this.ReelControlA1.Size = new System.Drawing.Size(90, 3);
this.ReelControlA1.TabIndex = 0; this.ReelControlA1.TabIndex = 0;
// //
// ReelControlA2 // ReelControlA2
...@@ -209,10 +210,10 @@ ...@@ -209,10 +210,10 @@
this.ReelControlA2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlA2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlA2.ColorStatus = System.Drawing.Color.White; this.ReelControlA2.ColorStatus = System.Drawing.Color.White;
this.ReelControlA2.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlA2.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlA2.Location = new System.Drawing.Point(3, 290); this.ReelControlA2.Location = new System.Drawing.Point(3, 34);
this.ReelControlA2.Name = "ReelControlA2"; this.ReelControlA2.Name = "ReelControlA2";
this.ReelControlA2.ReelText = "暂存区物料"; this.ReelControlA2.ReelText = "暂存区物料";
this.ReelControlA2.Size = new System.Drawing.Size(488, 80); this.ReelControlA2.Size = new System.Drawing.Size(90, 3);
this.ReelControlA2.TabIndex = 1; this.ReelControlA2.TabIndex = 1;
// //
// ReelControlB1 // ReelControlB1
...@@ -221,10 +222,10 @@ ...@@ -221,10 +222,10 @@
this.ReelControlB1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlB1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlB1.ColorStatus = System.Drawing.Color.White; this.ReelControlB1.ColorStatus = System.Drawing.Color.White;
this.ReelControlB1.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlB1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlB1.Location = new System.Drawing.Point(497, 204); this.ReelControlB1.Location = new System.Drawing.Point(99, 25);
this.ReelControlB1.Name = "ReelControlB1"; this.ReelControlB1.Name = "ReelControlB1";
this.ReelControlB1.ReelText = "暂存区物料"; this.ReelControlB1.ReelText = "暂存区物料";
this.ReelControlB1.Size = new System.Drawing.Size(488, 80); this.ReelControlB1.Size = new System.Drawing.Size(90, 3);
this.ReelControlB1.TabIndex = 2; this.ReelControlB1.TabIndex = 2;
// //
// ReelControlB2 // ReelControlB2
...@@ -233,10 +234,10 @@ ...@@ -233,10 +234,10 @@
this.ReelControlB2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlB2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlB2.ColorStatus = System.Drawing.Color.White; this.ReelControlB2.ColorStatus = System.Drawing.Color.White;
this.ReelControlB2.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlB2.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlB2.Location = new System.Drawing.Point(497, 290); this.ReelControlB2.Location = new System.Drawing.Point(99, 34);
this.ReelControlB2.Name = "ReelControlB2"; this.ReelControlB2.Name = "ReelControlB2";
this.ReelControlB2.ReelText = "暂存区物料"; this.ReelControlB2.ReelText = "暂存区物料";
this.ReelControlB2.Size = new System.Drawing.Size(488, 80); this.ReelControlB2.Size = new System.Drawing.Size(90, 3);
this.ReelControlB2.TabIndex = 3; this.ReelControlB2.TabIndex = 3;
// //
// BoxControl // BoxControl
...@@ -250,7 +251,7 @@ ...@@ -250,7 +251,7 @@
this.BoxControl.Location = new System.Drawing.Point(3, 3); this.BoxControl.Location = new System.Drawing.Point(3, 3);
this.BoxControl.MoveInfo = "暂无出入库"; this.BoxControl.MoveInfo = "暂无出入库";
this.BoxControl.Name = "BoxControl"; this.BoxControl.Name = "BoxControl";
this.BoxControl.Size = new System.Drawing.Size(982, 195); this.BoxControl.Size = new System.Drawing.Size(186, 16);
this.BoxControl.TabIndex = 4; this.BoxControl.TabIndex = 4;
this.BoxControl.WorkStatus = "暂未启动"; this.BoxControl.WorkStatus = "暂未启动";
// //
...@@ -261,10 +262,10 @@ ...@@ -261,10 +262,10 @@
this.ShelfAControl.ColorStatus = System.Drawing.Color.White; this.ShelfAControl.ColorStatus = System.Drawing.Color.White;
this.ShelfAControl.Dock = System.Windows.Forms.DockStyle.Fill; this.ShelfAControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.ShelfAControl.EquipText = "A料口"; this.ShelfAControl.EquipText = "A料口";
this.ShelfAControl.Location = new System.Drawing.Point(3, 491); this.ShelfAControl.Location = new System.Drawing.Point(3, 55);
this.ShelfAControl.MoveInfo = "暂无出入库"; this.ShelfAControl.MoveInfo = "暂无出入库";
this.ShelfAControl.Name = "ShelfAControl"; this.ShelfAControl.Name = "ShelfAControl";
this.ShelfAControl.Size = new System.Drawing.Size(488, 111); this.ShelfAControl.Size = new System.Drawing.Size(90, 9);
this.ShelfAControl.TabIndex = 6; this.ShelfAControl.TabIndex = 6;
this.ShelfAControl.WorkStatus = "暂未启动"; this.ShelfAControl.WorkStatus = "暂未启动";
// //
...@@ -275,10 +276,10 @@ ...@@ -275,10 +276,10 @@
this.ShelfBControl.ColorStatus = System.Drawing.Color.White; this.ShelfBControl.ColorStatus = System.Drawing.Color.White;
this.ShelfBControl.Dock = System.Windows.Forms.DockStyle.Fill; this.ShelfBControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.ShelfBControl.EquipText = "B料口"; this.ShelfBControl.EquipText = "B料口";
this.ShelfBControl.Location = new System.Drawing.Point(497, 491); this.ShelfBControl.Location = new System.Drawing.Point(99, 55);
this.ShelfBControl.MoveInfo = "暂无出入库"; this.ShelfBControl.MoveInfo = "暂无出入库";
this.ShelfBControl.Name = "ShelfBControl"; this.ShelfBControl.Name = "ShelfBControl";
this.ShelfBControl.Size = new System.Drawing.Size(488, 111); this.ShelfBControl.Size = new System.Drawing.Size(90, 9);
this.ShelfBControl.TabIndex = 7; this.ShelfBControl.TabIndex = 7;
this.ShelfBControl.WorkStatus = "暂未启动"; this.ShelfBControl.WorkStatus = "暂未启动";
// //
...@@ -533,7 +534,8 @@ ...@@ -533,7 +534,8 @@
this.启用蜂鸣器ToolStripMenuItem, this.启用蜂鸣器ToolStripMenuItem,
this.toolStripSeparator25, this.toolStripSeparator25,
this.aGVCancelStateToolStripMenuItem, this.aGVCancelStateToolStripMenuItem,
this.toolStripSeparator17}); this.toolStripSeparator17,
this.启用安全光栅ToolStripMenuItem});
this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem"; this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem";
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(86, 25); this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
this.运行参数ToolStripMenuItem.Text = "运行参数"; this.运行参数ToolStripMenuItem.Text = "运行参数";
...@@ -576,6 +578,13 @@ ...@@ -576,6 +578,13 @@
this.toolStripSeparator17.Size = new System.Drawing.Size(203, 6); this.toolStripSeparator17.Size = new System.Drawing.Size(203, 6);
this.toolStripSeparator17.Visible = false; this.toolStripSeparator17.Visible = false;
// //
// 启用安全光栅ToolStripMenuItem
//
this.启用安全光栅ToolStripMenuItem.Name = "启用安全光栅ToolStripMenuItem";
this.启用安全光栅ToolStripMenuItem.Size = new System.Drawing.Size(206, 26);
this.启用安全光栅ToolStripMenuItem.Text = "启用安全光栅";
this.启用安全光栅ToolStripMenuItem.Click += new System.EventHandler(this.启用安全光栅ToolStripMenuItem_Click);
//
// FrmXLRStore // FrmXLRStore
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
...@@ -664,6 +673,7 @@ ...@@ -664,6 +673,7 @@
private EquipControl BoxControl; private EquipControl BoxControl;
private EquipControl ShelfAControl; private EquipControl ShelfAControl;
private EquipControl ShelfBControl; private EquipControl ShelfBControl;
private System.Windows.Forms.ToolStripMenuItem 启用安全光栅ToolStripMenuItem;
} }
} }
source/XLRStoreClient/FrmXLRStore.cs
...@@ -53,6 +53,14 @@ namespace OnlineStore.XLRStore ...@@ -53,6 +53,14 @@ namespace OnlineStore.XLRStore
this.notifyIcon1.Visible = false; this.notifyIcon1.Visible = false;
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
this.Cursor = Cursors.Default; this.Cursor = Cursors.Default;
if (StoreManager.UseSecurityAccess)
{
启用安全光栅ToolStripMenuItem.Text = gouStr + "启用安全光栅";
}
else
{
启用安全光栅ToolStripMenuItem.Text = "启用安全光栅";
}
//tabControl1.TabPages.Remove(tabPage5); //tabControl1.TabPages.Remove(tabPage5);
timer1.Start(); timer1.Start();
} }
...@@ -695,5 +703,30 @@ namespace OnlineStore.XLRStore ...@@ -695,5 +703,30 @@ namespace OnlineStore.XLRStore
inputEquip.FrmInputEquip_VisibleChanged(null, null); inputEquip.FrmInputEquip_VisibleChanged(null, null);
} }
} }
private void 启用安全光栅ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
bool result = !启用安全光栅ToolStripMenuItem.Text.Contains(gouStr);
if (result.Equals(StoreManager.UseSecurityAccess))
{
return;
}
StoreManager.UseSecurityAccess = result;
ConfigAppSettings.SaveValue(Setting_Init.UseSecurityAccess, (StoreManager.UseSecurityAccess ? 1 : 0));
if (result)
{
启用安全光栅ToolStripMenuItem.Text = gouStr + " 启用安全光栅";
}
else
{
启用安全光栅ToolStripMenuItem.Text = "启用安全光栅";
}
LogUtil.info(Name + " 点击：" + 启用安全光栅ToolStripMenuItem.Text);
}
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!