Skip to content

孙克 / RC30-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 8851ef0f 由 几米阳光
选项

服务器通信修改

1 个父辈 c0ea1ea8
内嵌 并排
正在显示 11 个修改的文件 包含 360 行增加 和 562 行删除
source/ACSingleStore/FrmStoreBox.cs
...@@ -303,14 +303,15 @@ namespace OnlineStore.AutoInOutStore ...@@ -303,14 +303,15 @@ namespace OnlineStore.AutoInOutStore
btnGetOutTray.Enabled = map[ParamDefine.takeOutReel].Equals(ParamDefine.enable); btnGetOutTray.Enabled = map[ParamDefine.takeOutReel].Equals(ParamDefine.enable);
btnCloseDoor.Enabled = map[ParamDefine.closeLock].Equals(ParamDefine.enable); btnCloseDoor.Enabled = map[ParamDefine.closeLock].Equals(ParamDefine.enable);
if (AutomaticBaiting.DoorStatus.Equals(2)) //if (AutomaticBaiting.DoorStatus.Equals(2))
{ //{
lblDoorStatus.Text = "仓门状态：关闭"; // lblDoorStatus.Text = "仓门状态：关闭";
} //}
else //else
{ //{
lblDoorStatus.Text = "仓门状态：打开"; // lblDoorStatus.Text = "仓门状态：打开";
} //}
lblDoorStatus.Text = map[ParamDefine.doorStatus];
lblOutInfo.Visible = !lblWaitTragGo.Visible; lblOutInfo.Visible = !lblWaitTragGo.Visible;
lblOutInfo.Text = "批量出入库信息： 入库：" + AutomaticBaiting.BatchInStoreCount + "盘共" + AutomaticBaiting.BatchInStoreHeight + "mm，" + lblOutInfo.Text = "批量出入库信息： 入库：" + AutomaticBaiting.BatchInStoreCount + "盘共" + AutomaticBaiting.BatchInStoreHeight + "mm，" +
"出库： " + AutomaticBaiting.BatchOutStoreCount + "盘共" + AutomaticBaiting.BatchOutStoreHeight + "mm"; "出库： " + AutomaticBaiting.BatchOutStoreCount + "盘共" + AutomaticBaiting.BatchOutStoreHeight + "mm";
......
source/Common/bean/Bean.cs
...@@ -226,6 +226,8 @@ namespace OnlineStore.Common ...@@ -226,6 +226,8 @@ namespace OnlineStore.Common
/// </summary> /// </summary>
public static string confirmReelOut = "confirmReelOut"; public static string confirmReelOut = "confirmReelOut";
public static string doorStatus = "doorStatus";
public static string doit = "doit"; public static string doit = "doit";
public static string enable = "enable"; public static string enable = "enable";
......
source/Common/util/HttpHelper.cs
...@@ -80,7 +80,7 @@ namespace OnlineStore.Common ...@@ -80,7 +80,7 @@ namespace OnlineStore.Common
} }
return null; return null;
} }
private static int isLog = ConfigAppSettings.GetIntValue(Setting_Init.Server_Log_Open); public static int isLog = ConfigAppSettings.GetIntValue(Setting_Init.Server_Log_Open);
public static string Post(string url, string paramData, Encoding encoding) public static string Post(string url, string paramData, Encoding encoding)
{ {
if (isLog == 1) if (isLog == 1)
......
source/DeviceLibrary/StoreConfig/AC/linePositions.csv
位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴仓门出料点P4,进出轴吸盘取料点P2 位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴仓门出料点P4,进出轴吸盘取料点P2
1#AC1_1_1_1,774,40,13,,80430,407400,415100,415100,407400,86693,-40000,-20000,84854,84854 2#AC1_1_1_1,774,40,13,,80430,407400,415100,415100,407400,86693,-40000,-20000,84854,84854
1#AC1_1_1_2,774,40,13,,80430,407400,415100,415100,407400,86693,-40000,-20000,84854,84854 2#AC1_1_1_2,774,40,13,,80430,407400,415100,415100,407400,86693,-40000,-20000,84854,84854
1#AC1_1_1_3,774,40,13,,80430,407400,415100,415100,407400,86693,-40000,-20000,84854,84854 2#AC1_1_1_3,774,40,13,,80430,407400,415100,415100,407400,86693,-40000,-20000,84854,84854
1#AC1_1_1_4,774,40,13,,80430,407400,415100,415100,407400,86693,-40000,-20000,84854,84854 2#AC1_1_1_4,774,40,13,,80430,407400,415100,415100,407400,86693,-40000,-20000,84854,84854
1#AC1_1_1_5,773,40,13,,211783,67807,71168,71168,67807,86693,-40000,-20000,84854,84854 2#AC1_1_1_5,773,40,13,,211783,67807,71168,71168,67807,86693,-40000,-20000,84854,84854
1#AC1_1_1_6,772,40,13,,211783,83730,87091,87091,83730,86693,-40000,-20000,84854,84854 2#AC1_1_1_6,772,40,13,,211783,83730,87091,87091,83730,86693,-40000,-20000,84854,84854
1#AC1_1_1_7,771,40,13,,211783,99653,103014,103014,99653,86693,-40000,-20000,84854,84854 2#AC1_1_1_7,771,40,13,,211783,99653,103014,103014,99653,86693,-40000,-20000,84854,84854
1#AC1_1_1_8,770,40,13,,211783,115576,118937,118937,115576,86693,-40000,-20000,84854,84854 2#AC1_1_1_8,770,40,13,,211783,115576,118937,118937,115576,86693,-40000,-20000,84854,84854
1#AC1_1_1_9,769,40,13,,211783,131499,134860,134860,131499,86693,-40000,-20000,84854,84854 2#AC1_1_1_9,769,40,13,,211783,131499,134860,134860,131499,86693,-40000,-20000,84854,84854
1#AC1_1_1_10,768,40,13,,211783,147422,150783,150783,147422,86693,-40000,-20000,84854,84854 2#AC1_1_1_10,768,40,13,,211783,147422,150783,150783,147422,86693,-40000,-20000,84854,84854
1#AC1_1_1_11,767,40,13,,211783,163345,166706,166706,163345,86693,-40000,-20000,84854,84854 2#AC1_1_1_11,767,40,13,,211783,163345,166706,166706,163345,86693,-40000,-20000,84854,84854
1#AC1_1_1_12,766,40,13,,211783,179268,182629,182629,179268,86693,-40000,-20000,84854,84854 2#AC1_1_1_12,766,40,13,,211783,179268,182629,182629,179268,86693,-40000,-20000,84854,84854
1#AC1_1_1_13,765,52,13,,211783,195191,198552,198552,195191,86693,-40000,-10000,84854,84854 2#AC1_1_1_13,765,52,13,,211783,195191,198552,198552,195191,86693,-40000,-10000,84854,84854
1#AC1_1_2_1,755,40,13,,211783,385700,389433,389433,385700,86693,-40000,-20000,84854,84854 2#AC1_1_2_1,755,40,13,,211783,385700,389433,389433,385700,86693,-40000,-20000,84854,84854
1#AC1_1_2_2,755,40,13,,211783,385700,389433,389433,385700,86693,-40000,-20000,84854,84854 2#AC1_1_2_2,755,40,13,,211783,385700,389433,389433,385700,86693,-40000,-20000,84854,84854
1#AC1_1_2_3,755,40,13,,211783,385700,389433,389433,385700,86693,-40000,-20000,84854,84854 2#AC1_1_2_3,755,40,13,,211783,385700,389433,389433,385700,86693,-40000,-20000,84854,84854
1#AC1_1_2_4,754,40,13,,211783,403000,405356,405356,403000,86693,-40000,-20000,84854,84854 2#AC1_1_2_4,754,40,13,,211783,403000,405356,405356,403000,86693,-40000,-20000,84854,84854
1#AC1_1_2_5,753,40,13,,211783,418345,421279,421279,418345,86693,-40000,-20000,84854,84854 2#AC1_1_2_5,753,40,13,,211783,418345,421279,421279,418345,86693,-40000,-20000,84854,84854
1#AC1_1_2_6,752,40,13,,211783,434000,437202,437202,434000,86693,-40000,-20000,84854,84854 2#AC1_1_2_6,752,40,13,,211783,434000,437202,437202,434000,86693,-40000,-20000,84854,84854
1#AC1_1_2_7,751,40,13,,211783,450000,453125,453125,450000,86693,-40000,-20000,84854,84854 2#AC1_1_2_7,751,40,13,,211783,450000,453125,453125,450000,86693,-40000,-20000,84854,84854
1#AC1_1_2_8,750,40,13,,211783,465900,469048,469048,465900,86693,-40000,-20000,84854,84854 2#AC1_1_2_8,750,40,13,,211783,465900,469048,469048,465900,86693,-40000,-20000,84854,84854
1#AC1_1_2_9,749,40,13,,211783,481800,484971,484971,481800,86693,-40000,-20000,84854,84854 2#AC1_1_2_9,749,40,13,,211783,481800,484971,484971,481800,86693,-40000,-20000,84854,84854
1#AC1_1_2_10,748,40,13,,211783,497660,500894,500894,497660,86693,-40000,-20000,84854,84854 2#AC1_1_2_10,748,40,13,,211783,497660,500894,500894,497660,86693,-40000,-20000,84854,84854
1#AC1_1_2_11,747,40,13,,211783,513600,516817,516817,513600,86693,-40000,-20000,84854,84854 2#AC1_1_2_11,747,40,13,,211783,513600,516817,516817,513600,86693,-40000,-20000,84854,84854
1#AC1_1_2_12,746,40,13,,211783,529200,532740,532740,529200,86693,-40000,-20000,84854,84854 2#AC1_1_2_12,746,40,13,,211783,529200,532740,532740,529200,86693,-40000,-20000,84854,84854
1#AC1_1_2_13,745,40,13,,211783,545100,548663,548663,545100,86693,-40000,-20000,84854,84854 2#AC1_1_2_13,745,40,13,,211783,545100,548663,548663,545100,86693,-40000,-20000,84854,84854
1#AC1_1_3_1,735,40,13,,211400,706257,709866,709866,706257,86693,-40000,-20000,84854,84854 2#AC1_1_3_1,735,40,13,,211400,706257,709866,709866,706257,86693,-40000,-20000,84854,84854
1#AC1_1_3_2,734,40,13,,211400,722180,725789,725789,722180,86693,-40000,-20000,84854,84854 2#AC1_1_3_2,734,40,13,,211400,722180,725789,725789,722180,86693,-40000,-20000,84854,84854
1#AC1_1_3_3,733,40,13,,211400,738103,741712,741712,738103,86693,-40000,-20000,84854,84854 2#AC1_1_3_3,733,40,13,,211400,738103,741712,741712,738103,86693,-40000,-20000,84854,84854
1#AC1_1_3_4,732,40,13,,211400,753026,757635,757635,753026,86693,-40000,-20000,84854,84854 2#AC1_1_3_4,732,40,13,,211400,753026,757635,757635,753026,86693,-40000,-20000,84854,84854
1#AC1_1_3_5,731,40,13,,211400,767949,773558,773558,767949,86693,-40000,-20000,84854,84854 2#AC1_1_3_5,731,40,13,,211400,767949,773558,773558,767949,86693,-40000,-20000,84854,84854
1#AC1_1_3_6,730,40,13,,211400,783872,789481,789481,783872,86693,-40000,-20000,84854,84854 2#AC1_1_3_6,730,40,13,,211400,783872,789481,789481,783872,86693,-40000,-20000,84854,84854
1#AC1_1_3_7,729,40,13,,211400,799795,805404,805404,799795,86693,-40000,-20000,84854,84854 2#AC1_1_3_7,729,40,13,,211400,799795,805404,805404,799795,86693,-40000,-20000,84854,84854
1#AC1_1_3_8,728,40,13,,211800,814218,819327,819327,814218,86693,-40000,-20000,84854,84854 2#AC1_1_3_8,728,40,13,,211800,814218,819327,819327,814218,86693,-40000,-20000,84854,84854
1#AC1_1_3_9,727,40,13,,211800,832141,835250,835250,832141,86693,-40000,-20000,84854,84854 2#AC1_1_3_9,727,40,13,,211800,832141,835250,835250,832141,86693,-40000,-20000,84854,84854
1#AC1_1_3_10,726,40,13,,211800,848064,851173,851173,848064,86693,-40000,-20000,84854,84854 2#AC1_1_3_10,726,40,13,,211800,848064,851173,851173,848064,86693,-40000,-20000,84854,84854
1#AC1_1_3_11,725,40,13,,212000,861987,867096,867096,861987,86693,-40000,-20000,84854,84854 2#AC1_1_3_11,725,40,13,,212000,861987,867096,867096,861987,86693,-40000,-20000,84854,84854
1#AC1_1_3_12,724,40,13,,212000,877910,883019,883019,877910,86693,-40000,-20000,84854,84854 2#AC1_1_3_12,724,40,13,,212000,877910,883019,883019,877910,86693,-40000,-20000,84854,84854
1#AC1_1_3_13,723,52,13,,212000,893833,898942,898942,893833,86693,-40000,-10000,84854,84854 2#AC1_1_3_13,723,52,13,,212000,893833,898942,898942,893833,86693,-40000,-10000,84854,84854
1#AC1_2_1_1,714,40,13,1,75212,7370,11760,11760,7370,86693,-50000,-20000,84854,84854 2#AC1_2_1_1,714,40,13,1,75212,7370,11760,11760,7370,86693,-50000,-20000,84854,84854
1#AC1_2_1_2,713,40,13,1,75212,37397,41787,41787,37397,86693,-40000,-20000,84854,84854 2#AC1_2_1_2,713,40,13,1,75212,37397,41787,41787,37397,86693,-40000,-20000,84854,84854
1#AC1_2_1_3,712,40,13,1,75212,67424,71814,71814,67424,86693,-40000,-20000,84854,84854 2#AC1_2_1_3,712,40,13,1,75212,67424,71814,71814,67424,86693,-40000,-20000,84854,84854
1#AC1_2_1_4,711,40,13,1,75212,97451,101841,101841,97451,86693,-40000,-20000,84854,84854 2#AC1_2_1_4,711,40,13,1,75212,97451,101841,101841,97451,86693,-40000,-20000,84854,84854
1#AC1_2_1_5,710,40,13,1,75212,127478,131868,131868,127478,86693,-40000,-20000,84854,84854 2#AC1_2_1_5,710,40,13,1,75212,127478,131868,131868,127478,86693,-40000,-20000,84854,84854
1#AC1_2_1_6,709,40,13,1,75212,157505,161895,161895,157505,86693,-40000,-20000,84854,84854 2#AC1_2_1_6,709,40,13,1,75212,157505,161895,161895,157505,86693,-40000,-20000,84854,84854
1#AC1_2_1_7,708,40,13,1,75212,187532,191922,191922,187532,86693,-40000,-20000,84854,84854 2#AC1_2_1_7,708,40,13,1,75212,187532,191922,191922,187532,86693,-40000,-20000,84854,84854
1#AC1_2_1_8,707,40,13,1,75212,217559,221949,221949,217559,86693,-40000,-20000,84854,84854 2#AC1_2_1_8,707,40,13,1,75212,217559,221949,221949,217559,86693,-40000,-20000,84854,84854
1#AC1_2_1_9,706,40,13,1,75212,247586,251976,251976,247586,86693,-40000,-20000,84854,84854 2#AC1_2_1_9,706,40,13,1,75212,247586,251976,251976,247586,86693,-40000,-20000,84854,84854
1#AC1_2_1_10,705,40,13,1,75212,277613,282003,282003,277613,86693,-40000,-20000,84854,84854 2#AC1_2_1_10,705,40,13,1,75212,277613,282003,282003,277613,86693,-40000,-20000,84854,84854
1#AC1_2_1_11,704,40,13,1,75212,307640,312030,312030,307640,86693,-40000,-20000,84854,84854 2#AC1_2_1_11,704,40,13,1,75212,307640,312030,312030,307640,86693,-40000,-20000,84854,84854
1#AC1_2_1_12,703,40,13,1,75212,337667,342057,342057,337667,86693,-40000,-20000,84854,84854 2#AC1_2_1_12,703,40,13,1,75212,337667,342057,342057,337667,86693,-40000,-20000,84854,84854
1#AC1_2_1_13,702,52,13,1,75212,367694,372084,372084,367694,86693,-40000,-10000,84854,84854 2#AC1_2_1_13,702,52,13,1,75212,367694,372084,372084,367694,86693,-40000,-10000,84854,84854
1#AC1_2_2_1,693,40,13,1,75134,354811,358235,358235,354811,86693,-40000,-20000,84854,84854 2#AC1_2_2_1,693,40,13,1,75134,354811,358235,358235,354811,86693,-40000,-20000,84854,84854
1#AC1_2_2_2,692,40,13,1,75134,370576,374000,374000,370576,86693,-40000,-20000,84854,84854 2#AC1_2_2_2,692,40,13,1,75134,370576,374000,374000,370576,86693,-40000,-20000,84854,84854
1#AC1_2_2_3,691,40,13,1,75134,386341,389765,389765,386341,86693,-40000,-20000,84854,84854 2#AC1_2_2_3,691,40,13,1,75134,386341,389765,389765,386341,86693,-40000,-20000,84854,84854
1#AC1_2_2_4,690,40,13,1,75134,402106,405530,405530,402106,86693,-40000,-20000,84854,84854 2#AC1_2_2_4,690,40,13,1,75134,402106,405530,405530,402106,86693,-40000,-20000,84854,84854
1#AC1_2_2_5,689,40,13,1,75134,417871,421295,421295,417871,86693,-40000,-20000,84854,84854 2#AC1_2_2_5,689,40,13,1,75134,417871,421295,421295,417871,86693,-40000,-20000,84854,84854
1#AC1_2_2_6,688,40,13,1,75134,433636,437060,437060,433636,86693,-40000,-20000,84854,84854 2#AC1_2_2_6,688,40,13,1,75134,433636,437060,437060,433636,86693,-40000,-20000,84854,84854
1#AC1_2_2_7,687,40,13,1,75134,449401,452825,452825,449401,86693,-40000,-20000,84854,84854 2#AC1_2_2_7,687,40,13,1,75134,449401,452825,452825,449401,86693,-40000,-20000,84854,84854
1#AC1_2_2_8,686,40,13,1,75134,465166,468590,468590,465166,86693,-40000,-20000,84854,84854 2#AC1_2_2_8,686,40,13,1,75134,465166,468590,468590,465166,86693,-40000,-20000,84854,84854
1#AC1_2_2_9,685,40,13,1,75134,480931,484355,484355,480931,86693,-40000,-20000,84854,84854 2#AC1_2_2_9,685,40,13,1,75134,480931,484355,484355,480931,86693,-40000,-20000,84854,84854
1#AC1_2_2_10,684,40,13,1,75134,496696,500120,500120,496696,86693,-40000,-20000,84854,84854 2#AC1_2_2_10,684,40,13,1,75134,496696,500120,500120,496696,86693,-40000,-20000,84854,84854
1#AC1_2_2_11,683,40,13,1,75134,512461,515885,515885,512461,86693,-40000,-20000,84854,84854 2#AC1_2_2_11,683,40,13,1,75134,512461,515885,515885,512461,86693,-40000,-20000,84854,84854
1#AC1_2_2_12,682,40,13,1,75134,528226,531650,531650,528226,86693,-40000,-20000,84854,84854 2#AC1_2_2_12,682,40,13,1,75134,528226,531650,531650,528226,86693,-40000,-20000,84854,84854
1#AC1_2_2_13,681,40,13,1,75134,543991,547415,547415,543991,86693,-40000,-20000,84854,84854 2#AC1_2_2_13,681,40,13,1,75134,543991,547415,547415,543991,86693,-40000,-20000,84854,84854
1#AC1_2_3_1,671,40,13,1,75605,706257,709866,709866,706257,86693,-40000,-20000,84854,84854 2#AC1_2_3_1,671,40,13,1,75605,706257,709866,709866,706257,86693,-40000,-20000,84854,84854
1#AC1_2_3_2,670,40,13,1,75605,720180,723789,723789,720180,86693,-40000,-20000,84854,84854 2#AC1_2_3_2,670,40,13,1,75605,720180,723789,723789,720180,86693,-40000,-20000,84854,84854
1#AC1_2_3_3,669,40,13,1,75605,736103,739712,739712,736103,86693,-40000,-20000,84854,84854 2#AC1_2_3_3,669,40,13,1,75605,736103,739712,739712,736103,86693,-40000,-20000,84854,84854
1#AC1_2_3_4,668,40,13,1,75605,752526,757135,757135,752526,86693,-40000,-20000,84854,84854 2#AC1_2_3_4,668,40,13,1,75605,752526,757135,757135,752526,86693,-40000,-20000,84854,84854
1#AC1_2_3_5,667,40,13,1,75605,767449,773058,773058,767449,86693,-40000,-20000,84854,84854 2#AC1_2_3_5,667,40,13,1,75605,767449,773058,773058,767449,86693,-40000,-20000,84854,84854
1#AC1_2_3_6,666,40,13,1,75605,783372,788981,788981,783372,86693,-40000,-20000,84854,84854 2#AC1_2_3_6,666,40,13,1,75605,783372,788981,788981,783372,86693,-40000,-20000,84854,84854
1#AC1_2_3_7,665,40,13,1,75605,799295,804904,804904,799295,86693,-40000,-20000,84854,84854 2#AC1_2_3_7,665,40,13,1,75605,799295,804904,804904,799295,86693,-40000,-20000,84854,84854
1#AC1_2_3_8,664,40,13,1,75605,815218,820327,820327,815218,86693,-40000,-20000,84854,84854 2#AC1_2_3_8,664,40,13,1,75605,815218,820327,820327,815218,86693,-40000,-20000,84854,84854
1#AC1_2_3_9,663,40,13,1,75605,832000,836000,836000,832000,86693,-40000,-20000,84854,84854 2#AC1_2_3_9,663,40,13,1,75605,832000,836000,836000,832000,86693,-40000,-20000,84854,84854
1#AC1_2_3_10,662,40,13,1,75605,847500,852173,852173,847500,86693,-40000,-20000,84854,84854 2#AC1_2_3_10,662,40,13,1,75605,847500,852173,852173,847500,86693,-40000,-20000,84854,84854
1#AC1_2_3_11,661,40,13,1,75605,862987,868096,868096,862987,86693,-40000,-20000,84854,84854 2#AC1_2_3_11,661,40,13,1,75605,862987,868096,868096,862987,86693,-40000,-20000,84854,84854
1#AC1_2_3_12,660,40,13,1,75605,878910,884019,884019,878910,86693,-40000,-20000,84854,84854 2#AC1_2_3_12,660,40,13,1,75605,878910,884019,884019,878910,86693,-40000,-20000,84854,84854
1#AC1_2_3_13,659,52,13,1,75605,894833,899942,899942,894833,86693,-40000,-10000,84854,84854 2#AC1_2_3_13,659,52,13,1,75605,894833,899942,899942,894833,86693,-40000,-10000,84854,84854
1#AC1_3_1_1,650,40,13,1,127750,5800,8700,8700,5800,86693,-40000,-20000,84854,84854 2#AC1_3_1_1,650,40,13,1,127750,5800,8700,8700,5800,86693,-40000,-20000,84854,84854
1#AC1_3_1_2,649,40,13,1,127750,21565,24465,24465,21565,86693,-40000,-20000,84854,84854 2#AC1_3_1_2,649,40,13,1,127750,21565,24465,24465,21565,86693,-40000,-20000,84854,84854
1#AC1_3_1_3,648,40,13,1,127750,37330,40230,40230,37330,86693,-40000,-20000,84854,84854 2#AC1_3_1_3,648,40,13,1,127750,37330,40230,40230,37330,86693,-40000,-20000,84854,84854
1#AC1_3_1_4,647,40,13,1,127750,53095,55995,55995,53095,86693,-40000,-20000,84854,84854 2#AC1_3_1_4,647,40,13,1,127750,53095,55995,55995,53095,86693,-40000,-20000,84854,84854
1#AC1_3_1_5,646,40,13,1,127750,68860,71760,71760,68860,86693,-40000,-20000,84854,84854 2#AC1_3_1_5,646,40,13,1,127750,68860,71760,71760,68860,86693,-40000,-20000,84854,84854
1#AC1_3_1_6,645,40,13,1,127750,84625,87525,87525,84625,86693,-40000,-20000,84854,84854 2#AC1_3_1_6,645,40,13,1,127750,84625,87525,87525,84625,86693,-40000,-20000,84854,84854
1#AC1_3_1_7,644,40,13,1,127750,100390,103290,103290,100390,86693,-40000,-20000,84854,84854 2#AC1_3_1_7,644,40,13,1,127750,100390,103290,103290,100390,86693,-40000,-20000,84854,84854
1#AC1_3_1_8,643,40,13,1,127750,116155,119055,119055,116155,86693,-40000,-20000,84854,84854 2#AC1_3_1_8,643,40,13,1,127750,116155,119055,119055,116155,86693,-40000,-20000,84854,84854
1#AC1_3_1_9,642,40,13,1,127750,131920,134820,134820,131920,86693,-40000,-20000,84854,84854 2#AC1_3_1_9,642,40,13,1,127750,131920,134820,134820,131920,86693,-40000,-20000,84854,84854
1#AC1_3_1_10,641,40,13,1,127750,147685,150585,150585,147685,86693,-40000,-20000,84854,84854 2#AC1_3_1_10,641,40,13,1,127750,147685,150585,150585,147685,86693,-40000,-20000,84854,84854
1#AC1_3_1_11,640,40,13,1,127750,163450,166350,166350,163450,86693,-40000,-20000,84854,84854 2#AC1_3_1_11,640,40,13,1,127750,163450,166350,166350,163450,86693,-40000,-20000,84854,84854
1#AC1_3_1_12,639,40,13,1,127750,179215,182115,182115,179215,86693,-40000,-20000,84854,84854 2#AC1_3_1_12,639,40,13,1,127750,179215,182115,182115,179215,86693,-40000,-20000,84854,84854
1#AC1_3_1_13,638,52,13,1,127750,194980,197880,197880,194980,86693,-40000,-10000,84854,84854 2#AC1_3_1_13,638,52,13,1,127750,194980,197880,197880,194980,86693,-40000,-10000,84854,84854
1#AC1_3_2_1,628,40,13,1,127750,353670,358470,358470,353670,86693,-40000,-20000,84854,84854 2#AC1_3_2_1,628,40,13,1,127750,353670,358470,358470,353670,86693,-40000,-20000,84854,84854
1#AC1_3_2_2,627,40,13,1,127750,369435,374235,374235,369435,86693,-40000,-20000,84854,84854 2#AC1_3_2_2,627,40,13,1,127750,369435,374235,374235,369435,86693,-40000,-20000,84854,84854
1#AC1_3_2_3,626,40,13,1,127750,385200,390000,390000,385200,86693,-40000,-20000,84854,84854 2#AC1_3_2_3,626,40,13,1,127750,385200,390000,390000,385200,86693,-40000,-20000,84854,84854
1#AC1_3_2_4,625,40,13,1,127750,400965,405765,405765,400965,86693,-40000,-20000,84854,84854 2#AC1_3_2_4,625,40,13,1,127750,400965,405765,405765,400965,86693,-40000,-20000,84854,84854
1#AC1_3_2_5,624,40,13,1,127750,416730,421530,421530,416730,86693,-40000,-20000,84854,84854 2#AC1_3_2_5,624,40,13,1,127750,416730,421530,421530,416730,86693,-40000,-20000,84854,84854
1#AC1_3_2_6,623,40,13,1,127750,432495,437295,437295,432495,86693,-40000,-20000,84854,84854 2#AC1_3_2_6,623,40,13,1,127750,432495,437295,437295,432495,86693,-40000,-20000,84854,84854
1#AC1_3_2_7,622,40,13,1,127750,448260,453060,453060,448260,86693,-40000,-20000,84854,84854 2#AC1_3_2_7,622,40,13,1,127750,448260,453060,453060,448260,86693,-40000,-20000,84854,84854
1#AC1_3_2_8,621,40,13,1,127750,464025,468825,468825,464025,86693,-40000,-20000,84854,84854 2#AC1_3_2_8,621,40,13,1,127750,464025,468825,468825,464025,86693,-40000,-20000,84854,84854
1#AC1_3_2_9,620,40,13,1,127750,479790,484590,484590,479790,86693,-40000,-20000,84854,84854 2#AC1_3_2_9,620,40,13,1,127750,479790,484590,484590,479790,86693,-40000,-20000,84854,84854
1#AC1_3_2_10,619,40,13,1,127750,495555,500355,500355,495555,86693,-40000,-20000,84854,84854 2#AC1_3_2_10,619,40,13,1,127750,495555,500355,500355,495555,86693,-40000,-20000,84854,84854
1#AC1_3_2_11,618,40,13,1,127750,511320,516120,516120,511320,86693,-40000,-20000,84854,84854 2#AC1_3_2_11,618,40,13,1,127750,511320,516120,516120,511320,86693,-40000,-20000,84854,84854
1#AC1_3_2_12,617,40,13,1,127750,527085,531885,531885,527085,86693,-40000,-20000,84854,84854 2#AC1_3_2_12,617,40,13,1,127750,527085,531885,531885,527085,86693,-40000,-20000,84854,84854
1#AC1_3_2_13,616,40,13,1,127750,542850,547650,547650,542850,86693,-40000,-20000,84854,84854 2#AC1_3_2_13,616,40,13,1,127750,542850,547650,547650,542850,86693,-40000,-20000,84854,84854
1#AC1_3_3_1,606,40,13,1,128049,706000,710366,710366,706000,86693,-40000,-20000,84854,84854 2#AC1_3_3_1,606,40,13,1,128049,706000,710366,710366,706000,86693,-40000,-20000,84854,84854
1#AC1_3_3_2,605,40,13,1,128049,721880,726289,726289,721880,86693,-40000,-20000,84854,84854 2#AC1_3_3_2,605,40,13,1,128049,721880,726289,726289,721880,86693,-40000,-20000,84854,84854
1#AC1_3_3_3,604,40,13,1,128049,737500,742212,742212,737500,86693,-40000,-20000,84854,84854 2#AC1_3_3_3,604,40,13,1,128049,737500,742212,742212,737500,86693,-40000,-20000,84854,84854
1#AC1_3_3_4,603,40,13,1,128049,752726,758135,758135,752726,86693,-40000,-20000,84854,84854 2#AC1_3_3_4,603,40,13,1,128049,752726,758135,758135,752726,86693,-40000,-20000,84854,84854
1#AC1_3_3_5,602,40,13,1,128049,767649,774200,774200,767649,86693,-40000,-20000,84854,84854 2#AC1_3_3_5,602,40,13,1,128049,767649,774200,774200,767649,86693,-40000,-20000,84854,84854
1#AC1_3_3_6,601,40,13,1,128049,783772,789981,789981,783772,86693,-40000,-20000,84854,84854 2#AC1_3_3_6,601,40,13,1,128049,783772,789981,789981,783772,86693,-40000,-20000,84854,84854
1#AC1_3_3_7,600,40,13,1,128049,799495,805904,805904,799495,86693,-40000,-20000,84854,84854 2#AC1_3_3_7,600,40,13,1,128049,799495,805904,805904,799495,86693,-40000,-20000,84854,84854
1#AC1_3_3_8,599,40,13,1,128049,815100,819827,819827,815100,86693,-40000,-20000,84854,84854 2#AC1_3_3_8,599,40,13,1,128049,815100,819827,819827,815100,86693,-40000,-20000,84854,84854
1#AC1_3_3_9,598,40,13,1,128049,831841,835750,835750,831841,86693,-40000,-20000,84854,84854 2#AC1_3_3_9,598,40,13,1,128049,831841,835750,835750,831841,86693,-40000,-20000,84854,84854
1#AC1_3_3_10,597,40,13,1,128049,847764,851673,851673,847764,86693,-40000,-20000,84854,84854 2#AC1_3_3_10,597,40,13,1,128049,847764,851673,851673,847764,86693,-40000,-20000,84854,84854
1#AC1_3_3_11,596,40,13,1,128049,862100,867596,867596,862100,86693,-40000,-20000,84854,84854 2#AC1_3_3_11,596,40,13,1,128049,862100,867596,867596,862100,86693,-40000,-20000,84854,84854
1#AC1_3_3_12,595,40,13,1,128049,878100,883519,883519,878100,86693,-40000,-20000,84854,84854 2#AC1_3_3_12,595,40,13,1,128049,878100,883519,883519,878100,86693,-40000,-20000,84854,84854
1#AC1_3_3_13,594,52,13,1,128049,894000,899442,899442,894000,86693,-40000,-10000,84854,84854 2#AC1_3_3_13,594,52,13,1,128049,894000,899442,899442,894000,86693,-40000,-10000,84854,84854
1#AC1_4_1_1,585,40,13,1,85107,6115,9476,9476,6115,86693,-40000,-20000,84854,84854 2#AC1_4_1_1,585,40,13,1,85107,6115,9476,9476,6115,86693,-40000,-20000,84854,84854
1#AC1_4_1_2,584,40,13,1,85107,21538,25399,25399,21538,86693,-40000,-20000,84854,84854 2#AC1_4_1_2,584,40,13,1,85107,21538,25399,25399,21538,86693,-40000,-20000,84854,84854
1#AC1_4_1_3,583,40,13,1,85107,37461,40822,40822,37461,86693,-40000,-20000,84854,84854 2#AC1_4_1_3,583,40,13,1,85107,37461,40822,40822,37461,86693,-40000,-20000,84854,84854
1#AC1_4_1_4,582,40,13,1,85107,52300,55245,55245,52300,86693,-40000,-20000,84854,84854 2#AC1_4_1_4,582,40,13,1,85107,52300,55245,55245,52300,86693,-40000,-20000,84854,84854
1#AC1_4_1_5,581,40,13,1,85107,68300,71168,71168,68300,86693,-40000,-20000,84854,84854 2#AC1_4_1_5,581,40,13,1,85107,68300,71168,71168,68300,86693,-40000,-20000,84854,84854
1#AC1_4_1_6,580,40,13,1,85107,83730,87091,87091,83730,86693,-40000,-20000,84854,84854 2#AC1_4_1_6,580,40,13,1,85107,83730,87091,87091,83730,86693,-40000,-20000,84854,84854
1#AC1_4_1_7,579,40,13,1,85107,99800,103014,103014,99800,86693,-40000,-20000,84854,84854 2#AC1_4_1_7,579,40,13,1,85107,99800,103014,103014,99800,86693,-40000,-20000,84854,84854
1#AC1_4_1_8,578,40,13,1,85107,115700,118937,118937,115700,86693,-40000,-20000,84854,84854 2#AC1_4_1_8,578,40,13,1,85107,115700,118937,118937,115700,86693,-40000,-20000,84854,84854
1#AC1_4_1_9,577,40,13,1,85107,131499,134860,134860,131499,86693,-40000,-20000,84854,84854 2#AC1_4_1_9,577,40,13,1,85107,131499,134860,134860,131499,86693,-40000,-20000,84854,84854
1#AC1_4_1_10,576,40,13,1,85107,147422,150783,150783,147422,86693,-40000,-20000,84854,84854 2#AC1_4_1_10,576,40,13,1,85107,147422,150783,150783,147422,86693,-40000,-20000,84854,84854
1#AC1_4_1_11,575,40,13,1,85107,163345,166706,166706,163345,86693,-40000,-20000,84854,84854 2#AC1_4_1_11,575,40,13,1,85107,163345,166706,166706,163345,86693,-40000,-20000,84854,84854
1#AC1_4_1_12,574,40,13,1,85107,179268,182629,182629,179268,86693,-40000,-20000,84854,84854 2#AC1_4_1_12,574,40,13,1,85107,179268,182629,182629,179268,86693,-40000,-20000,84854,84854
1#AC1_4_1_13,573,52,13,1,85107,195191,198552,198552,195191,86693,-40000,-10000,84854,84854 2#AC1_4_1_13,573,52,13,1,85107,195191,198552,198552,195191,86693,-40000,-10000,84854,84854
1#AC1_4_2_1,563,40,13,1,85107,354653,357587,357587,354653,86693,-40000,-20000,84854,84854 2#AC1_4_2_1,563,40,13,1,85107,354653,357587,357587,354653,86693,-40000,-20000,84854,84854
1#AC1_4_2_2,562,40,13,1,85107,371100,373510,373510,371100,86693,-40000,-20000,84854,84854 2#AC1_4_2_2,562,40,13,1,85107,371100,373510,373510,371100,86693,-40000,-20000,84854,84854
1#AC1_4_2_3,561,40,13,1,85107,386200,389433,389433,386200,86693,-40000,-20000,84854,84854 2#AC1_4_2_3,561,40,13,1,85107,386200,389433,389433,386200,86693,-40000,-20000,84854,84854
1#AC1_4_2_4,560,40,13,1,85107,403000,405356,405356,403000,86693,-40000,-20000,84854,84854 2#AC1_4_2_4,560,40,13,1,85107,403000,405356,405356,403000,86693,-40000,-20000,84854,84854
1#AC1_4_2_5,559,40,13,1,85107,418345,421279,421279,418345,86693,-40000,-20000,84854,84854 2#AC1_4_2_5,559,40,13,1,85107,418345,421279,421279,418345,86693,-40000,-20000,84854,84854
1#AC1_4_2_6,558,40,13,1,85107,434000,437202,437202,434000,86693,-40000,-20000,84854,84854 2#AC1_4_2_6,558,40,13,1,85107,434000,437202,437202,434000,86693,-40000,-20000,84854,84854
1#AC1_4_2_7,557,40,13,1,85107,450000,453125,453125,450000,86693,-40000,-20000,84854,84854 2#AC1_4_2_7,557,40,13,1,85107,450000,453125,453125,450000,86693,-40000,-20000,84854,84854
1#AC1_4_2_8,556,40,13,1,85107,465900,469048,469048,465900,86693,-40000,-20000,84854,84854 2#AC1_4_2_8,556,40,13,1,85107,465900,469048,469048,465900,86693,-40000,-20000,84854,84854
1#AC1_4_2_9,555,40,13,1,85107,481800,484971,484971,481800,86693,-40000,-20000,84854,84854 2#AC1_4_2_9,555,40,13,1,85107,481800,484971,484971,481800,86693,-40000,-20000,84854,84854
1#AC1_4_2_10,554,40,13,1,85107,497660,500894,500894,497660,86693,-40000,-20000,84854,84854 2#AC1_4_2_10,554,40,13,1,85107,497660,500894,500894,497660,86693,-40000,-20000,84854,84854
1#AC1_4_2_11,553,40,13,1,85107,513600,516817,516817,513600,86693,-40000,-20000,84854,84854 2#AC1_4_2_11,553,40,13,1,85107,513600,516817,516817,513600,86693,-40000,-20000,84854,84854
1#AC1_4_2_12,552,40,13,1,85107,529200,532740,532740,529200,86693,-40000,-20000,84854,84854 2#AC1_4_2_12,552,40,13,1,85107,529200,532740,532740,529200,86693,-40000,-20000,84854,84854
1#AC1_4_2_13,551,40,13,1,85107,545100,548663,548663,545100,86693,-40000,-20000,84854,84854 2#AC1_4_2_13,551,40,13,1,85107,545100,548663,548663,545100,86693,-40000,-20000,84854,84854
1#AC1_4_3_1,541,40,13,1,85107,705700,709866,709866,705700,86693,-40000,-20000,84854,84854 2#AC1_4_3_1,541,40,13,1,85107,705700,709866,709866,705700,86693,-40000,-20000,84854,84854
1#AC1_4_3_2,540,40,13,1,85107,721200,725789,725789,721200,86693,-40000,-20000,84854,84854 2#AC1_4_3_2,540,40,13,1,85107,721200,725789,725789,721200,86693,-40000,-20000,84854,84854
1#AC1_4_3_3,539,40,13,1,85107,737103,741712,741712,737103,86693,-40000,-20000,84854,84854 2#AC1_4_3_3,539,40,13,1,85107,737103,741712,741712,737103,86693,-40000,-20000,84854,84854
1#AC1_4_3_4,538,40,13,1,85107,752026,757635,757635,752026,86693,-40000,-20000,84854,84854 2#AC1_4_3_4,538,40,13,1,85107,752026,757635,757635,752026,86693,-40000,-20000,84854,84854
1#AC1_4_3_5,537,40,13,1,85107,768400,773558,773558,768400,86693,-40000,-20000,84854,84854 2#AC1_4_3_5,537,40,13,1,85107,768400,773558,773558,768400,86693,-40000,-20000,84854,84854
1#AC1_4_3_6,536,40,13,1,85107,783970,789481,789481,783970,86693,-40000,-20000,84854,84854 2#AC1_4_3_6,536,40,13,1,85107,783970,789481,789481,783970,86693,-40000,-20000,84854,84854
1#AC1_4_3_7,535,40,13,1,85107,799600,805404,805404,799600,86693,-40000,-20000,84854,84854 2#AC1_4_3_7,535,40,13,1,85107,799600,805404,805404,799600,86693,-40000,-20000,84854,84854
1#AC1_4_3_8,534,40,13,1,85600,815000,819327,819327,815000,86693,-40000,-20000,84854,84854 2#AC1_4_3_8,534,40,13,1,85600,815000,819327,819327,815000,86693,-40000,-20000,84854,84854
1#AC1_4_3_9,533,40,13,1,85600,832141,835250,835250,832141,86693,-40000,-20000,84854,84854 2#AC1_4_3_9,533,40,13,1,85600,832141,835250,835250,832141,86693,-40000,-20000,84854,84854
1#AC1_4_3_10,532,40,13,1,85600,847200,851173,851173,847200,86693,-40000,-20000,84854,84854 2#AC1_4_3_10,532,40,13,1,85600,847200,851173,851173,847200,86693,-40000,-20000,84854,84854
1#AC1_4_3_11,531,40,13,1,85600,863000,867096,867096,863000,86693,-40000,-20000,84854,84854 2#AC1_4_3_11,531,40,13,1,85600,863000,867096,867096,863000,86693,-40000,-20000,84854,84854
1#AC1_4_3_12,530,40,13,1,85600,878500,883019,883019,878500,86693,-40000,-20000,84854,84854 2#AC1_4_3_12,530,40,13,1,85600,878500,883019,883019,878500,86693,-40000,-20000,84854,84854
1#AC1_4_3_13,529,52,13,1,85600,894300,898942,898942,894300,86693,-40000,-10000,84854,84854 2#AC1_4_3_13,529,52,13,1,85600,894300,898942,898942,894300,86693,-40000,-10000,84854,84854
1#AC1_5_1_1,520,40,13,1,43306,5000,9476,9476,5000,86693,-40000,-20000,84854,84854 2#AC1_5_1_1,520,40,13,1,43306,5000,9476,9476,5000,86693,-40000,-20000,84854,84854
1#AC1_5_1_2,519,40,13,1,43306,21538,25399,25399,21538,86693,-40000,-20000,84854,84854 2#AC1_5_1_2,519,40,13,1,43306,21538,25399,25399,21538,86693,-40000,-20000,84854,84854
1#AC1_5_1_3,518,40,13,1,43306,37000,40822,40822,37000,86693,-40000,-20000,84854,84854 2#AC1_5_1_3,518,40,13,1,43306,37000,40822,40822,37000,86693,-40000,-20000,84854,84854
1#AC1_5_1_4,517,40,13,1,43306,51884,55245,55245,51884,86693,-40000,-20000,84854,84854 2#AC1_5_1_4,517,40,13,1,43306,51884,55245,55245,51884,86693,-40000,-20000,84854,84854
1#AC1_5_1_5,516,40,13,1,43306,68000,71168,71168,68000,86693,-40000,-20000,84854,84854 2#AC1_5_1_5,516,40,13,1,43306,68000,71168,71168,68000,86693,-40000,-20000,84854,84854
1#AC1_5_1_6,515,40,13,1,43306,83730,87091,87091,83730,86693,-40000,-20000,84854,84854 2#AC1_5_1_6,515,40,13,1,43306,83730,87091,87091,83730,86693,-40000,-20000,84854,84854
1#AC1_5_1_7,514,40,13,1,43306,99653,103014,103014,99653,86693,-40000,-20000,84854,84854 2#AC1_5_1_7,514,40,13,1,43306,99653,103014,103014,99653,86693,-40000,-20000,84854,84854
1#AC1_5_1_8,513,40,13,1,43306,115576,118937,118937,115576,86693,-40000,-20000,84854,84854 2#AC1_5_1_8,513,40,13,1,43306,115576,118937,118937,115576,86693,-40000,-20000,84854,84854
1#AC1_5_1_9,512,40,13,1,43306,131499,134860,134860,131499,86693,-40000,-20000,84854,84854 2#AC1_5_1_9,512,40,13,1,43306,131499,134860,134860,131499,86693,-40000,-20000,84854,84854
1#AC1_5_1_10,511,40,13,1,43306,147422,150783,150783,147422,86693,-40000,-20000,84854,84854 2#AC1_5_1_10,511,40,13,1,43306,147422,150783,150783,147422,86693,-40000,-20000,84854,84854
1#AC1_5_1_11,510,40,13,1,43306,163345,166706,166706,163345,86693,-40000,-20000,84854,84854 2#AC1_5_1_11,510,40,13,1,43306,163345,166706,166706,163345,86693,-40000,-20000,84854,84854
1#AC1_5_1_12,509,40,13,1,43306,179268,182629,182629,179268,86693,-40000,-20000,84854,84854 2#AC1_5_1_12,509,40,13,1,43306,179268,182629,182629,179268,86693,-40000,-20000,84854,84854
1#AC1_5_1_13,508,52,13,1,43306,195191,198552,198552,195191,86693,-40000,-10000,84854,84854 2#AC1_5_1_13,508,52,13,1,43306,195191,198552,198552,195191,86693,-40000,-10000,84854,84854
1#AC1_5_2_1,498,40,13,1,42979,356000,360000,360000,356000,86693,-40000,-20000,84854,84854 2#AC1_5_2_1,498,40,13,1,42979,356000,360000,360000,356000,86693,-40000,-20000,84854,84854
1#AC1_5_2_2,497,40,13,1,42979,370600,373010,373010,370600,86693,-40000,-20000,84854,84854 2#AC1_5_2_2,497,40,13,1,42979,370600,373010,373010,370600,86693,-40000,-20000,84854,84854
1#AC1_5_2_3,496,40,13,1,42979,385500,388933,388933,385500,86693,-40000,-20000,84854,84854 2#AC1_5_2_3,496,40,13,1,42979,385500,388933,388933,385500,86693,-40000,-20000,84854,84854
1#AC1_5_2_4,495,40,13,1,42979,402500,404856,404856,402500,86693,-40000,-20000,84854,84854 2#AC1_5_2_4,495,40,13,1,42979,402500,404856,404856,402500,86693,-40000,-20000,84854,84854
1#AC1_5_2_5,494,40,13,1,42979,417845,420779,420779,417845,86693,-40000,-20000,84854,84854 2#AC1_5_2_5,494,40,13,1,42979,417845,420779,420779,417845,86693,-40000,-20000,84854,84854
1#AC1_5_2_6,493,40,13,1,42979,434000,436702,436702,434000,86693,-40000,-20000,84854,84854 2#AC1_5_2_6,493,40,13,1,42979,434000,436702,436702,434000,86693,-40000,-20000,84854,84854
1#AC1_5_2_7,492,40,13,1,42979,449500,452625,452625,449500,86693,-40000,-20000,84854,84854 2#AC1_5_2_7,492,40,13,1,42979,449500,452625,452625,449500,86693,-40000,-20000,84854,84854
1#AC1_5_2_8,491,40,13,1,42979,465400,468548,468548,465400,86693,-40000,-20000,84854,84854 2#AC1_5_2_8,491,40,13,1,42979,465400,468548,468548,465400,86693,-40000,-20000,84854,84854
1#AC1_5_2_9,490,40,13,1,42979,481300,484471,484471,481300,86693,-40000,-20000,84854,84854 2#AC1_5_2_9,490,40,13,1,42979,481300,484471,484471,481300,86693,-40000,-20000,84854,84854
1#AC1_5_2_10,489,40,13,1,42979,497160,500394,500394,497160,86693,-40000,-20000,84854,84854 2#AC1_5_2_10,489,40,13,1,42979,497160,500394,500394,497160,86693,-40000,-20000,84854,84854
1#AC1_5_2_11,488,40,13,1,42979,513100,516317,516317,513100,86693,-40000,-20000,84854,84854 2#AC1_5_2_11,488,40,13,1,42979,513100,516317,516317,513100,86693,-40000,-20000,84854,84854
1#AC1_5_2_12,487,40,13,1,42979,528700,532240,532240,528700,86693,-40000,-20000,84854,84854 2#AC1_5_2_12,487,40,13,1,42979,528700,532240,532240,528700,86693,-40000,-20000,84854,84854
1#AC1_5_2_13,486,40,13,1,42979,544600,548163,548163,544600,86693,-40000,-20000,84854,84854 2#AC1_5_2_13,486,40,13,1,42979,544600,548163,548163,544600,86693,-40000,-20000,84854,84854
1#AC1_5_3_1,476,40,13,1,42979,705757,709366,709366,705757,86693,-40000,-20000,84854,84854 2#AC1_5_3_1,476,40,13,1,42979,705757,709366,709366,705757,86693,-40000,-20000,84854,84854
1#AC1_5_3_2,475,40,13,1,42979,720680,725289,725289,720680,86693,-40000,-20000,84854,84854 2#AC1_5_3_2,475,40,13,1,42979,720680,725289,725289,720680,86693,-40000,-20000,84854,84854
1#AC1_5_3_3,474,40,13,1,42979,736600,741212,741212,736600,86693,-40000,-20000,84854,84854 2#AC1_5_3_3,474,40,13,1,42979,736600,741212,741212,736600,86693,-40000,-20000,84854,84854
1#AC1_5_3_4,473,40,13,1,42979,752526,757135,757135,752526,86693,-40000,-20000,84854,84854 2#AC1_5_3_4,473,40,13,1,42979,752526,757135,757135,752526,86693,-40000,-20000,84854,84854
1#AC1_5_3_5,472,40,13,1,42979,767449,773058,773058,767449,86693,-40000,-20000,84854,84854 2#AC1_5_3_5,472,40,13,1,42979,767449,773058,773058,767449,86693,-40000,-20000,84854,84854
1#AC1_5_3_6,471,40,13,1,42979,783372,788981,788981,783372,86693,-40000,-20000,84854,84854 2#AC1_5_3_6,471,40,13,1,42979,783372,788981,788981,783372,86693,-40000,-20000,84854,84854
1#AC1_5_3_7,470,40,13,1,42979,799295,804904,804904,799295,86693,-40000,-20000,84854,84854 2#AC1_5_3_7,470,40,13,1,42979,799295,804904,804904,799295,86693,-40000,-20000,84854,84854
1#AC1_5_3_8,469,40,13,1,42979,814718,818827,818827,814718,86693,-40000,-20000,84854,84854 2#AC1_5_3_8,469,40,13,1,42979,814718,818827,818827,814718,86693,-40000,-20000,84854,84854
1#AC1_5_3_9,468,40,13,1,42979,831641,834750,834750,831641,86693,-40000,-20000,84854,84854 2#AC1_5_3_9,468,40,13,1,42979,831641,834750,834750,831641,86693,-40000,-20000,84854,84854
1#AC1_5_3_10,467,40,13,1,42979,847564,850673,850673,847564,86693,-40000,-20000,84854,84854 2#AC1_5_3_10,467,40,13,1,42979,847564,850673,850673,847564,86693,-40000,-20000,84854,84854
1#AC1_5_3_11,466,40,13,1,42979,861487,866596,866596,861487,86693,-40000,-20000,84854,84854 2#AC1_5_3_11,466,40,13,1,42979,861487,866596,866596,861487,86693,-40000,-20000,84854,84854
1#AC1_5_3_12,465,40,13,1,42979,877900,882519,882519,877900,86693,-40000,-20000,84854,84854 2#AC1_5_3_12,465,40,13,1,42979,877900,882519,882519,877900,86693,-40000,-20000,84854,84854
1#AC1_5_3_13,464,52,13,1,42979,893333,898442,898442,893333,86693,-40000,-10000,84854,84854 2#AC1_5_3_13,464,52,13,1,42979,893333,898442,898442,893333,86693,-40000,-10000,84854,84854
1#AC1_6_1_1,455,40,13,1,863,5500,8900,8900,5500,86693,-40000,-20000,84854,84854 2#AC1_6_1_1,455,40,13,1,863,5500,8900,8900,5500,86693,-40000,-20000,84854,84854
1#AC1_6_1_2,454,40,13,1,863,21038,24899,24899,21038,86693,-40000,-20000,84854,84854 2#AC1_6_1_2,454,40,13,1,863,21038,24899,24899,21038,86693,-40000,-20000,84854,84854
1#AC1_6_1_3,453,40,13,1,863,36500,40322,40322,36500,86693,-40000,-20000,84854,84854 2#AC1_6_1_3,453,40,13,1,863,36500,40322,40322,36500,86693,-40000,-20000,84854,84854
1#AC1_6_1_4,452,40,13,1,863,51384,54745,54745,51384,86693,-40000,-20000,84854,84854 2#AC1_6_1_4,452,40,13,1,863,51384,54745,54745,51384,86693,-40000,-20000,84854,84854
1#AC1_6_1_5,451,40,13,1,863,67307,70668,70668,67307,86693,-40000,-20000,84854,84854 2#AC1_6_1_5,451,40,13,1,863,67307,70668,70668,67307,86693,-40000,-20000,84854,84854
1#AC1_6_1_6,450,40,13,1,863,83230,86591,86591,83230,86693,-40000,-20000,84854,84854 2#AC1_6_1_6,450,40,13,1,863,83230,86591,86591,83230,86693,-40000,-20000,84854,84854
1#AC1_6_1_7,449,40,13,1,863,99153,102514,102514,99153,86693,-40000,-20000,84854,84854 2#AC1_6_1_7,449,40,13,1,863,99153,102514,102514,99153,86693,-40000,-20000,84854,84854
1#AC1_6_1_8,448,40,13,1,863,115076,118437,118437,115076,86693,-40000,-20000,84854,84854 2#AC1_6_1_8,448,40,13,1,863,115076,118437,118437,115076,86693,-40000,-20000,84854,84854
1#AC1_6_1_9,447,40,13,1,863,130999,134360,134360,130999,86693,-40000,-20000,84854,84854 2#AC1_6_1_9,447,40,13,1,863,130999,134360,134360,130999,86693,-40000,-20000,84854,84854
1#AC1_6_1_10,446,40,13,1,863,146700,150283,150283,146700,86693,-40000,-20000,84854,84854 2#AC1_6_1_10,446,40,13,1,863,146700,150283,150283,146700,86693,-40000,-20000,84854,84854
1#AC1_6_1_11,445,40,13,1,863,162845,166206,166206,162845,86693,-40000,-20000,84854,84854 2#AC1_6_1_11,445,40,13,1,863,162845,166206,166206,162845,86693,-40000,-20000,84854,84854
1#AC1_6_1_12,444,40,13,1,863,178768,182129,182129,178768,86693,-40000,-20000,84854,84854 2#AC1_6_1_12,444,40,13,1,863,178768,182129,182129,178768,86693,-40000,-20000,84854,84854
1#AC1_6_1_13,443,52,13,1,863,194200,198052,198052,194200,86693,-40000,-10000,84854,84854 2#AC1_6_1_13,443,52,13,1,863,194200,198052,198052,194200,86693,-40000,-10000,84854,84854
1#AC1_6_2_1,433,40,13,1,863,354153,357087,357087,354153,86693,-40000,-20000,84854,84854 2#AC1_6_2_1,433,40,13,1,863,354153,357087,357087,354153,86693,-40000,-20000,84854,84854
1#AC1_6_2_2,432,40,13,1,863,370076,373500,373500,370076,86693,-40000,-20000,84854,84854 2#AC1_6_2_2,432,40,13,1,863,370076,373500,373500,370076,86693,-40000,-20000,84854,84854
1#AC1_6_2_3,431,40,13,1,863,385200,389200,389200,385200,86693,-40000,-20000,84854,84854 2#AC1_6_2_3,431,40,13,1,863,385200,389200,389200,385200,86693,-40000,-20000,84854,84854
1#AC1_6_2_4,430,40,13,1,863,401600,404856,404856,401600,86693,-40000,-20000,84854,84854 2#AC1_6_2_4,430,40,13,1,863,401600,404856,404856,401600,86693,-40000,-20000,84854,84854
1#AC1_6_2_5,429,40,13,1,863,417845,421700,421700,417845,86693,-40000,-20000,84854,84854 2#AC1_6_2_5,429,40,13,1,863,417845,421700,421700,417845,86693,-40000,-20000,84854,84854
1#AC1_6_2_6,428,40,13,1,863,433500,437700,437700,433500,86693,-40000,-20000,84854,84854 2#AC1_6_2_6,428,40,13,1,863,433500,437700,437700,433500,86693,-40000,-20000,84854,84854
1#AC1_6_2_7,427,40,13,1,863,449500,454000,454000,449500,86693,-40000,-20000,84854,84854 2#AC1_6_2_7,427,40,13,1,863,449500,454000,454000,449500,86693,-40000,-20000,84854,84854
1#AC1_6_2_8,426,40,13,1,863,465000,470000,470000,465000,86693,-40000,-20000,84854,84854 2#AC1_6_2_8,426,40,13,1,863,465000,470000,470000,465000,86693,-40000,-20000,84854,84854
1#AC1_6_2_9,425,40,13,1,863,481000,485400,485400,481000,86693,-40000,-20000,84854,84854 2#AC1_6_2_9,425,40,13,1,863,481000,485400,485400,481000,86693,-40000,-20000,84854,84854
1#AC1_6_2_10,424,40,13,1,863,496000,501300,501300,496000,86693,-40000,-20000,84854,84854 2#AC1_6_2_10,424,40,13,1,863,496000,501300,501300,496000,86693,-40000,-20000,84854,84854
1#AC1_6_2_11,423,40,13,1,863,512000,517317,517317,512000,86693,-40000,-20000,84854,84854 2#AC1_6_2_11,423,40,13,1,863,512000,517317,517317,512000,86693,-40000,-20000,84854,84854
1#AC1_6_2_12,422,40,13,1,863,527700,533240,533240,527700,86693,-40000,-20000,84854,84854 2#AC1_6_2_12,422,40,13,1,863,527700,533240,533240,527700,86693,-40000,-20000,84854,84854
1#AC1_6_2_13,421,40,13,1,863,543300,549163,549163,543300,86693,-40000,-20000,84854,84854 2#AC1_6_2_13,421,40,13,1,863,543300,549163,549163,543300,86693,-40000,-20000,84854,84854
1#AC1_6_3_1,411,40,13,1,863,704757,708366,708366,704757,86693,-40000,-20000,84854,84854 2#AC1_6_3_1,411,40,13,1,863,704757,708366,708366,704757,86693,-40000,-20000,84854,84854
1#AC1_6_3_2,410,40,13,1,863,720300,724289,724289,720300,86693,-40000,-20000,84854,84854 2#AC1_6_3_2,410,40,13,1,863,720300,724289,724289,720300,86693,-40000,-20000,84854,84854
1#AC1_6_3_3,409,40,13,1,863,736603,740212,740212,736603,86693,-40000,-20000,84854,84854 2#AC1_6_3_3,409,40,13,1,863,736603,740212,740212,736603,86693,-40000,-20000,84854,84854
1#AC1_6_3_4,408,40,13,1,863,751526,756135,756135,751526,86693,-40000,-20000,84854,84854 2#AC1_6_3_4,408,40,13,1,863,751526,756135,756135,751526,86693,-40000,-20000,84854,84854
1#AC1_6_3_5,407,40,13,1,863,766449,772058,772058,766449,86693,-40000,-20000,84854,84854 2#AC1_6_3_5,407,40,13,1,863,766449,772058,772058,766449,86693,-40000,-20000,84854,84854
1#AC1_6_3_6,406,40,13,1,863,782372,787981,787981,782372,86693,-40000,-20000,84854,84854 2#AC1_6_3_6,406,40,13,1,863,782372,787981,787981,782372,86693,-40000,-20000,84854,84854
1#AC1_6_3_7,405,40,13,1,863,798295,803904,803904,798295,86693,-40000,-20000,84854,84854 2#AC1_6_3_7,405,40,13,1,863,798295,803904,803904,798295,86693,-40000,-20000,84854,84854
1#AC1_6_3_8,404,40,13,1,863,812718,817827,817827,812718,86693,-40000,-20000,84854,84854 2#AC1_6_3_8,404,40,13,1,863,812718,817827,817827,812718,86693,-40000,-20000,84854,84854
1#AC1_6_3_9,403,40,13,1,863,830641,833750,833750,830641,86693,-40000,-20000,84854,84854 2#AC1_6_3_9,403,40,13,1,863,830641,833750,833750,830641,86693,-40000,-20000,84854,84854
1#AC1_6_3_10,402,40,13,1,863,846564,849673,849673,846564,86693,-40000,-20000,84854,84854 2#AC1_6_3_10,402,40,13,1,863,846564,849673,849673,846564,86693,-40000,-20000,84854,84854
1#AC1_6_3_11,401,40,13,1,863,860487,865596,865596,860487,86693,-40000,-20000,84854,84854 2#AC1_6_3_11,401,40,13,1,863,860487,865596,865596,860487,86693,-40000,-20000,84854,84854
1#AC1_6_3_12,400,40,13,1,863,876410,881519,881519,876410,86693,-40000,-20000,84854,84854 2#AC1_6_3_12,400,40,13,1,863,876410,881519,881519,876410,86693,-40000,-20000,84854,84854
1#AC1_6_3_13,399,52,13,1,863,892333,897442,897442,892333,86693,-40000,-10000,84854,84854 2#AC1_6_3_13,399,52,13,1,863,892333,897442,897442,892333,86693,-40000,-10000,84854,84854
1#AC1_7_1_1,390,40,13,1,535149,5000,9476,9476,5000,86693,-40000,-20000,84854,84854 2#AC1_7_1_1,390,40,13,1,535149,5000,9476,9476,5000,86693,-40000,-20000,84854,84854
1#AC1_7_1_2,389,40,13,1,535149,20538,24399,24399,20538,86693,-40000,-20000,84854,84854 2#AC1_7_1_2,389,40,13,1,535149,20538,24399,24399,20538,86693,-40000,-20000,84854,84854
1#AC1_7_1_3,388,40,13,1,535149,36461,39822,39822,36461,86693,-40000,-20000,84854,84854 2#AC1_7_1_3,388,40,13,1,535149,36461,39822,39822,36461,86693,-40000,-20000,84854,84854
1#AC1_7_1_4,387,40,13,1,535149,50884,54245,54245,50884,86693,-40000,-20000,84854,84854 2#AC1_7_1_4,387,40,13,1,535149,50884,54245,54245,50884,86693,-40000,-20000,84854,84854
1#AC1_7_1_5,386,40,13,1,535149,66807,70168,70168,66807,86693,-40000,-20000,84854,84854 2#AC1_7_1_5,386,40,13,1,535149,66807,70168,70168,66807,86693,-40000,-20000,84854,84854
1#AC1_7_1_6,385,40,13,1,535149,82730,86091,86091,82730,86693,-40000,-20000,84854,84854 2#AC1_7_1_6,385,40,13,1,535149,82730,86091,86091,82730,86693,-40000,-20000,84854,84854
1#AC1_7_1_7,384,40,13,1,535149,98653,102014,102014,98653,86693,-40000,-20000,84854,84854 2#AC1_7_1_7,384,40,13,1,535149,98653,102014,102014,98653,86693,-40000,-20000,84854,84854
1#AC1_7_1_8,383,40,13,1,535149,114576,117937,117937,114576,86693,-40000,-20000,84854,84854 2#AC1_7_1_8,383,40,13,1,535149,114576,117937,117937,114576,86693,-40000,-20000,84854,84854
1#AC1_7_1_9,382,40,13,1,535149,130499,133860,133860,130499,86693,-40000,-20000,84854,84854 2#AC1_7_1_9,382,40,13,1,535149,130499,133860,133860,130499,86693,-40000,-20000,84854,84854
1#AC1_7_1_10,381,40,13,1,535149,146422,149783,149783,146422,86693,-40000,-20000,84854,84854 2#AC1_7_1_10,381,40,13,1,535149,146422,149783,149783,146422,86693,-40000,-20000,84854,84854
1#AC1_7_1_11,380,40,13,1,535149,162345,165706,165706,162345,86693,-40000,-20000,84854,84854 2#AC1_7_1_11,380,40,13,1,535149,162345,165706,165706,162345,86693,-40000,-20000,84854,84854
1#AC1_7_1_12,379,40,13,1,535149,178268,181629,181629,178268,86693,-40000,-20000,84854,84854 2#AC1_7_1_12,379,40,13,1,535149,178268,181629,181629,178268,86693,-40000,-20000,84854,84854
1#AC1_7_1_13,378,52,13,1,535149,194191,197552,197552,194191,86693,-40000,-20000,84854,84854 2#AC1_7_1_13,378,52,13,1,535149,194191,197552,197552,194191,86693,-40000,-20000,84854,84854
1#AC1_7_2_1,368,40,13,1,535149,353653,356587,356587,353653,86693,-40000,-20000,84854,84854 2#AC1_7_2_1,368,40,13,1,535149,353653,356587,356587,353653,86693,-40000,-20000,84854,84854
1#AC1_7_2_2,367,40,13,1,535149,369576,372510,372510,369576,86693,-40000,-20000,84854,84854 2#AC1_7_2_2,367,40,13,1,535149,369576,372510,372510,369576,86693,-40000,-20000,84854,84854
1#AC1_7_2_3,366,40,13,1,535149,384700,388433,388433,384700,86693,-40000,-20000,84854,84854 2#AC1_7_2_3,366,40,13,1,535149,384700,388433,388433,384700,86693,-40000,-20000,84854,84854
1#AC1_7_2_4,365,40,13,1,535149,402000,404356,404356,402000,86693,-40000,-20000,84854,84854 2#AC1_7_2_4,365,40,13,1,535149,402000,404356,404356,402000,86693,-40000,-20000,84854,84854
1#AC1_7_2_5,364,40,13,1,535149,417345,420279,420279,417345,86693,-40000,-20000,84854,84854 2#AC1_7_2_5,364,40,13,1,535149,417345,420279,420279,417345,86693,-40000,-20000,84854,84854
1#AC1_7_2_6,363,40,13,1,535149,433000,436202,436202,433000,86693,-40000,-20000,84854,84854 2#AC1_7_2_6,363,40,13,1,535149,433000,436202,436202,433000,86693,-40000,-20000,84854,84854
1#AC1_7_2_7,362,40,13,1,535149,449000,452125,452125,449000,86693,-40000,-20000,84854,84854 2#AC1_7_2_7,362,40,13,1,535149,449000,452125,452125,449000,86693,-40000,-20000,84854,84854
1#AC1_7_2_8,361,40,13,1,535149,464900,468048,468048,464900,86693,-40000,-20000,84854,84854 2#AC1_7_2_8,361,40,13,1,535149,464900,468048,468048,464900,86693,-40000,-20000,84854,84854
1#AC1_7_2_9,360,40,13,1,535149,480800,483971,483971,480800,86693,-40000,-20000,84854,84854 2#AC1_7_2_9,360,40,13,1,535149,480800,483971,483971,480800,86693,-40000,-20000,84854,84854
1#AC1_7_2_10,359,40,13,1,535149,496660,499894,499894,496660,86693,-40000,-20000,84854,84854 2#AC1_7_2_10,359,40,13,1,535149,496660,499894,499894,496660,86693,-40000,-20000,84854,84854
1#AC1_7_2_11,358,40,13,1,535149,512600,515817,515817,512600,86693,-40000,-20000,84854,84854 2#AC1_7_2_11,358,40,13,1,535149,512600,515817,515817,512600,86693,-40000,-20000,84854,84854
1#AC1_7_2_12,357,40,13,1,535149,528200,531740,531740,528200,86693,-40000,-20000,84854,84854 2#AC1_7_2_12,357,40,13,1,535149,528200,531740,531740,528200,86693,-40000,-20000,84854,84854
1#AC1_7_2_13,356,40,13,1,535149,544100,547663,547663,544100,86693,-40000,-20000,84854,84854 2#AC1_7_2_13,356,40,13,1,535149,544100,547663,547663,544100,86693,-40000,-20000,84854,84854
1#AC1_7_3_1,346,40,13,1,535149,703757,708866,708866,703757,86693,-40000,-20000,84854,84854 2#AC1_7_3_1,346,40,13,1,535149,703757,708866,708866,703757,86693,-40000,-20000,84854,84854
1#AC1_7_3_2,345,40,13,1,535149,719680,724789,724789,719680,86693,-40000,-20000,84854,84854 2#AC1_7_3_2,345,40,13,1,535149,719680,724789,724789,719680,86693,-40000,-20000,84854,84854
1#AC1_7_3_3,344,40,13,1,535149,735603,740712,740712,735603,86693,-40000,-20000,84854,84854 2#AC1_7_3_3,344,40,13,1,535149,735603,740712,740712,735603,86693,-40000,-20000,84854,84854
1#AC1_7_3_4,343,40,13,1,535149,750526,756635,756635,750526,86693,-40000,-20000,84854,84854 2#AC1_7_3_4,343,40,13,1,535149,750526,756635,756635,750526,86693,-40000,-20000,84854,84854
1#AC1_7_3_5,342,40,13,1,535149,765449,772558,772558,765449,86693,-40000,-20000,84854,84854 2#AC1_7_3_5,342,40,13,1,535149,765449,772558,772558,765449,86693,-40000,-20000,84854,84854
1#AC1_7_3_6,341,40,13,1,535149,781372,788481,788481,781372,86693,-40000,-20000,84854,84854 2#AC1_7_3_6,341,40,13,1,535149,781372,788481,788481,781372,86693,-40000,-20000,84854,84854
1#AC1_7_3_7,340,40,13,1,535149,799295,804404,804404,799295,86693,-40000,-20000,84854,84854 2#AC1_7_3_7,340,40,13,1,535149,799295,804404,804404,799295,86693,-40000,-20000,84854,84854
1#AC1_7_3_8,339,40,13,1,535149,813718,818327,818327,813718,86693,-40000,-20000,84854,84854 2#AC1_7_3_8,339,40,13,1,535149,813718,818327,818327,813718,86693,-40000,-20000,84854,84854
1#AC1_7_3_9,338,40,13,1,535149,830641,834250,834250,830641,86693,-40000,-20000,84854,84854 2#AC1_7_3_9,338,40,13,1,535149,830641,834250,834250,830641,86693,-40000,-20000,84854,84854
1#AC1_7_3_10,337,40,13,1,535149,846064,850173,850173,846064,86693,-40000,-20000,84854,84854 2#AC1_7_3_10,337,40,13,1,535149,846064,850173,850173,846064,86693,-40000,-20000,84854,84854
1#AC1_7_3_11,336,40,13,1,535149,861487,866096,866096,861487,86693,-40000,-20000,84854,84854 2#AC1_7_3_11,336,40,13,1,535149,861487,866096,866096,861487,86693,-40000,-20000,84854,84854
1#AC1_7_3_12,335,40,13,1,535149,877410,882019,882019,877410,86693,-40000,-20000,84854,84854 2#AC1_7_3_12,335,40,13,1,535149,877410,882019,882019,877410,86693,-40000,-20000,84854,84854
1#AC1_7_3_13,335,52,13,1,535149,877410,882019,882019,877410,86693,-10000,-10000,84854,84854 2#AC1_7_3_13,335,52,13,1,535149,877410,882019,882019,877410,86693,-10000,-10000,84854,84854
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -127,6 +127,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -127,6 +127,10 @@ namespace OnlineStore.DeviceLibrary
{ {
return; return;
} }
if (isNoAirCheck)
{
return;
}
if (currAirValue.Equals(IO_VALUE.LOW)) if (currAirValue.Equals(IO_VALUE.LOW))
{ {
//判断是否持续了3秒 //判断是否持续了3秒
...@@ -237,7 +241,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -237,7 +241,6 @@ namespace OnlineStore.DeviceLibrary
} }
} }
#region 原点返回和复位处理 #region 原点返回和复位处理
private void ReturnHome() private void ReturnHome()
{ {
...@@ -324,24 +327,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -324,24 +327,12 @@ namespace OnlineStore.DeviceLibrary
{ {
string portName = Config.InOut_Axis.DeviceName; string portName = Config.InOut_Axis.DeviceName;
int slvAddr = Config.InOut_Axis.GetAxisValue(); int slvAddr = Config.InOut_Axis.GetAxisValue();
//if (ACServerManager.GetHomeEndStatus(portName, slvAddr).Equals(1)
// && ACServerManager.GetHomeSingle(portName, slvAddr).Equals(1))
//{
// StoreMove.NextMoveStep(StoreMoveStep.BOX_H_InOutMove);
// LogUtil.info(LOGGER, StoreName + "复位中，进出轴原点亮且已经原点返回过，先相对走-5000");
// int currPos = ACServerManager.GetActualtPosition(portName, slvAddr);
// int targetPos = currPos - 5000;
// ACAxisMove(Config.InOut_Axis, targetPos, Config.InoutAxis_HomeLowSpeed);
// ResetCloseDoor();
//}
//else
//{
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_InOutBack); StoreMove.NextMoveStep(StoreMoveStep.BOX_H_InOutBack);
LogUtil.info(LOGGER, StoreName + "复位中，进出轴开始原点返回"); LogUtil.info(LOGGER, StoreName + "复位中，进出轴开始原点返回");
ACAxisHomeMove(Config.InOut_Axis); ACAxisHomeMove(Config.InOut_Axis);
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(2000)); StoreMove.WaitList.Add(WaitResultInfo.WaitTime(2000));
ResetCloseDoor(); ResetCloseDoor();
//}
} }
/// <summary> /// <summary>
/// 复位处理 /// 复位处理
...@@ -1048,26 +1039,31 @@ namespace OnlineStore.DeviceLibrary ...@@ -1048,26 +1039,31 @@ namespace OnlineStore.DeviceLibrary
//若BOX和移栽都没有在等待Io的过程中则此Io超时异常可能已经处理过 //若BOX和移栽都没有在等待Io的过程中则此Io超时异常可能已经处理过
if (alarmType.Equals(StoreAlarmType.IoSingleTimeOut) && StoreMove.IsInWait == false) if (alarmType.Equals(StoreAlarmType.IoSingleTimeOut) && StoreMove.IsInWait == false)
{ {
LogUtil.info(StoreName + "当前空闲中，清理信号超时异常【" + StoreManager.Store.alarmType + "】"+WarnMsg); LogUtil.info(StoreName + "当前空闲中，清理信号超时异常【" + StoreManager.Store.alarmType + "】" + WarnMsg);
alarmType = StoreAlarmType.None; alarmType = StoreAlarmType.None;
if (AutomaticBaiting.WarnMsg.Contains("超时"))
{
AutomaticBaiting.WarnMsg = "";
}
WarnMsg = ""; WarnMsg = "";
} }
else if (alarmType.Equals(StoreAlarmType.BatchAlarm) || alarmType.Equals(StoreAlarmType.BatchIoTimeOut)) else if (alarmType.Equals(StoreAlarmType.BatchAlarm) || alarmType.Equals(StoreAlarmType.BatchIoTimeOut))
{ {
if (AutomaticBaiting.AutoBaitingStatus.Equals(StoreRunStatus.Runing) && AutomaticBaiting.StoreMove.IsInWait.Equals(false)) if (AutomaticBaiting.AutoBaitingStatus.Equals(StoreRunStatus.Runing) && AutomaticBaiting.StoreMove.IsInWait.Equals(false))
{ {
LogUtil.info( "批量上下料模块空闲中，清理报警【" + StoreManager.Store.alarmType + "】"+AutomaticBaiting.WarnMsg); LogUtil.info("批量上下料模块空闲中，清理报警【" + StoreManager.Store.alarmType + "】" + AutomaticBaiting.WarnMsg);
alarmType = StoreAlarmType.None; alarmType = StoreAlarmType.None;
AutomaticBaiting.WarnMsg = ""; AutomaticBaiting.WarnMsg = "";
if (WarnMsg.Contains("超时")) }
}
}
if (alarmType.Equals(StoreAlarmType.None))
{ {
if (WarnMsg.Contains(AutomaticBaiting.TimeOut))
{
LogUtil.info("清理超时异常信息："+WarnMsg);
WarnMsg = ""; WarnMsg = "";
} }
} if (AutomaticBaiting.WarnMsg.Contains(AutomaticBaiting.TimeOut))
{
LogUtil.info("清理超时异常信息：" + AutomaticBaiting.WarnMsg);
AutomaticBaiting.WarnMsg = "";
} }
} }
...@@ -1539,6 +1535,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -1539,6 +1535,17 @@ namespace OnlineStore.DeviceLibrary
//判断服务端是否返回出库操作 //判断服务端是否返回出库操作
return; return;
} }
OperationProcess(resultOperation);
TimeSpan span = DateTime.Now - time;
if (span.TotalMilliseconds > 100)
{
LogUtil.info(StoreName + "SendLineStatus 共处理了【" + span.TotalMilliseconds + "】毫秒");
}
}
public void OperationProcess(Operation resultOperation)
{
if (resultOperation.op.Equals(2)) if (resultOperation.op.Equals(2))
{ {
doOutStore(resultOperation); doOutStore(resultOperation);
...@@ -1547,15 +1554,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1547,15 +1554,7 @@ namespace OnlineStore.DeviceLibrary
{ {
string result = ""; string result = "";
Dictionary<string, string> dataMap = resultOperation.data; Dictionary<string, string> dataMap = resultOperation.data;
//string reviceData = "";
//foreach(string key in dataMap.Keys)
//{
// reviceData += "["+key+"="+dataMap[key]+"]";
//}
//if (ConfigAppSettings.GetIntValue(Setting_Init.Server_Log_Open).Equals(1))
//{
// LogUtil.info(StoreName + "收到服务器Data："+ reviceData);
//}
if (dataMap.ContainsKey(ParamDefine.openLock) && dataMap[ParamDefine.openLock].Equals(ParamDefine.doit)) if (dataMap.ContainsKey(ParamDefine.openLock) && dataMap[ParamDefine.openLock].Equals(ParamDefine.doit))
{ {
LogUtil.info(StoreName + "收到服务器命令：openLock=doit"); LogUtil.info(StoreName + "收到服务器命令：openLock=doit");
...@@ -1583,15 +1582,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -1583,15 +1582,10 @@ namespace OnlineStore.DeviceLibrary
} }
if (!result.Equals("")) if (!result.Equals(""))
{ {
LogUtil.info(StoreName + "收到服务器命令：doit执行失败："+result); LogUtil.info(StoreName + "收到服务器命令：doit执行失败：" + result);
CodeOrInoutMsg = result; CodeOrInoutMsg = result;
} }
} }
TimeSpan span = DateTime.Now - time;
if (span.TotalMilliseconds > 100)
{
LogUtil.info(StoreName + "SendLineStatus 共处理了【" + span.TotalMilliseconds + "】毫秒");
}
} }
private void doOutStore(Operation resultOperation) private void doOutStore(Operation resultOperation)
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -140,7 +140,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -140,7 +140,7 @@ namespace OnlineStore.DeviceLibrary
wait.IsEnd = ACAxisMoveIsEnd(wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg); wait.IsEnd = ACAxisMoveIsEnd(wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg);
} }
if (!wait.IsEnd && (wait.AxisInfo.DeviceName.Equals(Config.Batch_Axis.DeviceName))&&wait.TargetPosition.Equals(Config.BatchAxis_P1)) if (!wait.IsEnd && (wait.AxisInfo.DeviceName.Equals(Config.Batch_Axis.DeviceName)) && wait.TargetPosition.Equals(Config.BatchAxis_P1))
{ {
wait.IsEnd = AutomaticBaiting.BatchAxisIsEnd(wait); wait.IsEnd = AutomaticBaiting.BatchAxisIsEnd(wait);
} }
...@@ -164,9 +164,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -164,9 +164,9 @@ namespace OnlineStore.DeviceLibrary
if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs) if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs)
{ {
ConfigIO io = Config.getWaitIO(wait.IoType); ConfigIO io = Config.getWaitIO(wait.IoType);
WarnMsg = StoreName + " 等待信号" + io.DisplayStr + "=" + wait.IoValue + "超时！"; WarnMsg = StoreName + " 等待" + io.DisplayStr + "=" + wait.IoValue + "超时";
Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, StoreMove.MoveType); Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, StoreMove.MoveType);
LogUtil.error( StoreName + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14); LogUtil.error(StoreName + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14);
isOk = false; isOk = false;
break; break;
} }
...@@ -212,21 +212,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -212,21 +212,8 @@ namespace OnlineStore.DeviceLibrary
} }
else if (span.TotalSeconds > StoreMove.TimeOutSeconds) else if (span.TotalSeconds > StoreMove.TimeOutSeconds)
{ {
if (NotOkMsg.Equals("")) WarnMsg = "[" + StoreMove.MoveStep + "]等待[" + NotOkMsg + "]超时[" + Math.Round(span.TotalSeconds, 1) + "]秒";
{ LogUtil.error(WarnMsg, 15);
WarnMsg = StoreName + "等待超时【" + StoreMove.MoveType + "】【" + StoreMove.MoveStep + "】已等待【" + Math.Round(span.TotalSeconds) + "】秒";
foreach (WaitResultInfo wait in list)
{
WarnMsg = WarnMsg + "\r\n" + wait.ToStr();
}
LogUtil.error( WarnMsg, 12);
}
else
{
WarnMsg = StoreName + "【" + StoreMove.MoveType + "】【" + StoreMove.MoveStep + "】等待超时 [" + NotOkMsg
+ "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
LogUtil.error(LOGGER, WarnMsg);
}
Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnMsg, StoreMove.MoveType); Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnMsg, StoreMove.MoveType);
} }
} }
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
...@@ -9,6 +9,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -9,6 +9,7 @@ namespace OnlineStore.DeviceLibrary
{ {
public partial class AutomaticBaiting public partial class AutomaticBaiting
{ {
public static string TimeOut = "超时";
/// <summary> /// <summary>
/// 操作人员是否拿走料盘 /// 操作人员是否拿走料盘
/// </summary> /// </summary>
...@@ -391,10 +392,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -391,10 +392,10 @@ namespace OnlineStore.DeviceLibrary
private static int GetHeight() private static int GetHeight()
{ {
//计算高度 //计算高度
EndMovePosition = ACServerManager.GetActualtPosition(StoreManager.Config.Batch_Axis.DeviceName, StoreManager.Config.Batch_Axis.GetAxisValue()); EndMovePosition = ACServerManager.GetActualtPosition(StoreManager.Config.Batch_Axis);
if (EndMovePosition.Equals(-1)) if (EndMovePosition.Equals(-1))
{ {
EndMovePosition = ACServerManager.GetActualtPosition(StoreManager.Config.Batch_Axis.DeviceName, StoreManager.Config.Batch_Axis.GetAxisValue()); EndMovePosition = ACServerManager.GetActualtPosition(StoreManager.Config.Batch_Axis);
} }
LastHeight = (int)Math.Ceiling(1F * (EndMovePosition - StartMovePosition) / AxisChangeValue); LastHeight = (int)Math.Ceiling(1F * (EndMovePosition - StartMovePosition) / AxisChangeValue);
int addHeight = 0; int addHeight = 0;
...@@ -423,8 +424,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -423,8 +424,6 @@ namespace OnlineStore.DeviceLibrary
LastHeight = (int)Math.Ceiling(1F * LastHeight / 4) * 4; LastHeight = (int)Math.Ceiling(1F * LastHeight / 4) * 4;
} }
} }
return LastHeight; return LastHeight;
} }
private static List<AutoStorePosition> AllPosList = null; private static List<AutoStorePosition> AllPosList = null;
...@@ -458,6 +457,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -458,6 +457,15 @@ namespace OnlineStore.DeviceLibrary
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Air, IO_VALUE.HIGH)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SuckingDisc_Air, IO_VALUE.HIGH));
StoreMove.OneWaitCanEndStep = true; StoreMove.OneWaitCanEndStep = true;
} }
private static void ClearTimeOut()
{
if (WarnMsg.Contains(TimeOut))
{
WarnMsg = "";
}
}
private static void IsNeedScanCode() private static void IsNeedScanCode()
{ {
LastCode = ""; LastCode = "";
...@@ -466,10 +474,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -466,10 +474,11 @@ namespace OnlineStore.DeviceLibrary
LastPosId = ""; LastPosId = "";
SuckingDisc_WorkCount = 0; SuckingDisc_WorkCount = 0;
//如果有超时异常，需要清理 //如果有超时异常，需要清理
if ( StoreManager.Store.alarmType.Equals(StoreAlarmType.BatchIoTimeOut)) if (StoreManager.Store.alarmType.Equals(StoreAlarmType.BatchIoTimeOut))
{ {
LogUtil.info(Name + " 复位前，清理报警【" + StoreManager.Store.alarmType + "】"); LogUtil.info(Name + " 扫码前清理超时报警【" + StoreManager.Store.alarmType + "】");
StoreManager.Store.alarmType = StoreAlarmType.None; StoreManager.Store.alarmType = StoreAlarmType.None;
ClearTimeOut();
} }
// if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(0)) // if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(0))
if (KND.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH)) if (KND.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH))
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
...@@ -360,7 +360,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -360,7 +360,8 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
} }
//开启服务器日志
HttpHelper.isLog = 1;
// CodeMsg = "收到二维码【 " + message + "】，发送给服务器获取入库PosID"; // CodeMsg = "收到二维码【 " + message + "】，发送给服务器获取入库PosID";
LogUtil.info(Name + "收到二维码【 " + message + "】，发送给服务器获取入库PosID"); LogUtil.info(Name + "收到二维码【 " + message + "】，发送给服务器获取入库PosID");
//发送扫码内容到服务器进行入库操作 //发送扫码内容到服务器进行入库操作
...@@ -376,6 +377,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -376,6 +377,9 @@ namespace OnlineStore.DeviceLibrary
//{ { "code", message }, { "boxId", StoreManager.Store.StoreID.ToString() } }; //{ { "code", message }, { "boxId", StoreManager.Store.StoreID.ToString() } };
string server = ConfigAppSettings.GetValue(Setting_Init.http_server); string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false); Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false);
HttpHelper.isLog = ConfigAppSettings.GetIntValue(Setting_Init.Server_Log_Open);
if (resultOperation == null) if (resultOperation == null)
{ {
// CodeMsg = "二维码【" + message + "】没有收到服务器反馈"; // CodeMsg = "二维码【" + message + "】没有收到服务器反馈";
...@@ -454,6 +458,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -454,6 +458,15 @@ namespace OnlineStore.DeviceLibrary
map.Add(ParamDefine.closeLock, ParamDefine.disable); map.Add(ParamDefine.closeLock, ParamDefine.disable);
map.Add(ParamDefine.takeOutReel, ParamDefine.disable); map.Add(ParamDefine.takeOutReel, ParamDefine.disable);
map.Add(ParamDefine.confirmReelOut, ParamDefine.disable); map.Add(ParamDefine.confirmReelOut, ParamDefine.disable);
if (AutomaticBaiting.DoorStatus.Equals(2))
{
map.Add(ParamDefine.doorStatus, "门锁关闭");
}
else
{
map.Add(ParamDefine.doorStatus, "门锁打开");
}
if (AutomaticBaiting.IsWaitTragGo && (AutomaticBaiting.IsGetTrayGo.Equals(false))) if (AutomaticBaiting.IsWaitTragGo && (AutomaticBaiting.IsGetTrayGo.Equals(false)))
{ {
......
source/DeviceLibrary/store/AC_DeviceBase.cs deleted 100644 → 0
using log4net;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
namespace OnlineStore.DeviceLibrary
{
public abstract class AC_DeviceBase
{
/// <summary>
/// 料仓单个调试状态(默认不是调试状态)
/// </summary>
public bool IsDebug = false;
public Dictionary<string, ConfigIO> DIList { get; set; }
public Dictionary<string, ConfigIO> DOList { get; set; }
/// <summary>
///1=设备联机（正常就绪）（入库后，BOX恢复原始状态）（出库后，移载装置恢复原始状态），
///2=急停，3=故障，4=警告，5=调试
/// 6=入库执行中,7=入仓完成，8=入仓失败
/// 9=出库执行，10=出仓完成，11=出库失败
/// </summary>
public StoreStatus storeStatus = StoreStatus.StoreOnline;
/// <summary>
/// 提示消息，一般发给服务器后清空（LineBean表示报警提示消息，BoxBean表示出入库失败的原因记录）
/// </summary>
public string WarnMsg = "";
/// <summary>
/// 日志颜色
/// </summary>
protected static Color storeMoveColor = Color.Blue;
protected static readonly ILog LOGGER = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public string StoreName { get; set; }
public int StoreID { get; set; }
/// <summary>
/// 料仓状态
/// </summary>
private StoreRunStatus storerunstatus = StoreRunStatus.Wait;
/// <summary>
/// 定时器
/// </summary>
protected System.Timers.Timer mainTimer;
private bool isInit = false;
/// <summary>
/// 初始化
/// </summary>
protected virtual void Init()
{
if (!isInit)
{
StoreMove = new StoreMoveInfo(StoreName);
mainTimer = new System.Timers.Timer();
mainTimer.Enabled = false;
mainTimer.Interval = 300;
mainTimer.Elapsed += timersTimer_Elapsed;
mainTimer.AutoReset = true;
isInit = true;
}
}
public StoreRunStatus storeRunStatus
{
get
{
return storerunstatus;
}
set
{
StoreRunStatus oldStatus = storerunstatus;
storerunstatus = value;
}
}
/// <summary>
/// 移动信息
/// </summary>
public StoreMoveInfo StoreMove = null;
/// <summary>
/// 定时处理，监听信号，监听IO
/// </summary>
protected abstract void timersTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e);
#region 出库
/// <summary>
/// 开始出库运动
/// </summary>
//public abstract bool StartOutStoreMove(InOutStoreParam param);
protected abstract void OutStoreProcess();
#endregion
#region 入库
/// <summary>
/// 开始入库移动移动
/// </summary>
//public abstract bool StartInStoreMove(InOutStoreParam param);
protected abstract void InStoreProcess();
#endregion
public string GetRunStr(StoreRunStatus runStatus,bool IsStore)
{
string sta = "运行中";
string aa = "";
switch (runStatus)
{
case StoreRunStatus.Busy:
sta = "忙碌";
break;
case StoreRunStatus.HomeMoving:
sta = "原点返回";
break;
case StoreRunStatus.Reset:
sta = "重置";
break;
case StoreRunStatus.Runing:
sta = "运行中";
break;
case StoreRunStatus.Wait:
sta = "等待启动";
break;
}
if (runStatus > StoreRunStatus.Wait)
{
//"0":"急停中", "1":"设备联机", "2":"故障中", "3":"入库执行中", "4":"出库执行中", 5":"料盘入仓位完成", "6":"料盘出仓位完成", 7":"设备调试中",
switch (storeStatus)
{
case StoreStatus.Debugging:
aa = "设备调试中";
break;
case StoreStatus.InStoreEnd:
aa = "料盘入仓位完成";
break;
case StoreStatus.InStoreExecute:
aa = "入库执行中";
break;
case StoreStatus.InTrouble:
aa = "故障中";
break;
case StoreStatus.OutStoreBoxEnd:
aa = "料盘出仓位完成";
break;
case StoreStatus.OutStoreExecute:
aa = "出库执行中";
break;
case StoreStatus.StoreOnline:
aa = "设备联机";
break;
case StoreStatus.SuddenStop:
aa = "急停中";
break;
case StoreStatus.OutMoveExecute:
aa = "出库完成";
break;
case StoreStatus.InStoreFaild:
aa = "入库失败（" + WarnMsg + "）";
break;
case StoreStatus.OutStoreFaild:
aa = "出库失败（" + WarnMsg + "）";
break;
}
if (!aa.Equals(""))
{
return sta + "_" + aa;
}
else
{
return sta;
}
}
else
{
return sta;
}
}
}
}
source/DeviceLibrary/store/IOUtil.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OnlineStore.DeviceLibrary
{
public enum IO_VALUE
{
/// <summary>
/// 低位
/// </summary>
LOW = 0,
/// <summary>
/// 高位
/// </summary>
HIGH = 1,
}
}
source/DeviceLibrary/store/model/StoreMoveInfo.cs
...@@ -323,28 +323,28 @@ namespace OnlineStore.DeviceLibrary ...@@ -323,28 +323,28 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
return "轴【" + AxisInfo.DisplayStr + "】绝对运动，目标位置【" + TargetPosition + "】"; return "轴【" + AxisInfo.DisplayStr + "】绝对位置【" + TargetPosition + "】";
} }
} }
else if (WaitType == (int)Wait_Type.IOMove_2) else if (WaitType == (int)Wait_Type.IOMove_2)
{ {
return "IO信号等待，IO类型【" + IoType + "】,等待值【" + IoValue + "】"; return "IO信号等待【" + IoType + "】【" + IoValue + "】";
} }
else if (WaitType == (int)Wait_Type.Time_3) else if (WaitType == (int)Wait_Type.Time_3)
{ {
return "时间等待：【" + TimeMSeconds + "】毫秒"; return "时间【" + TimeMSeconds + "】毫秒";
} }
else if (WaitType == (int)Wait_Type.StellMove_4) else if (WaitType == (int)Wait_Type.StellMove_4)
{ {
return "电钢目标位置：【" + TargetPosition + "】 "; return "电钢目标位置【" + TargetPosition + "】 ";
} }
else if (WaitType == (int)Wait_Type.ShuoKe_5) else if (WaitType == (int)Wait_Type.ShuoKe_5)
{ {
return "硕科电机目标位置：【" + TargetPosition + "】 "; return "步进电机位置【" + TargetPosition + "】 ";
} }
else if (WaitType == (int)Wait_Type.AxisHomeSingle_6) else if (WaitType == (int)Wait_Type.AxisHomeSingle_6)
{ {
return "轴【" + AxisInfo.DisplayStr + "】ORG信号：【" + IoValue + "】 "; return "轴【" + AxisInfo.DisplayStr + "】原点【" + IoValue + "】 ";
} }
else if (WaitType == (int)Wait_Type.WaitHeight_7) else if (WaitType == (int)Wait_Type.WaitHeight_7)
{ {
...@@ -352,21 +352,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -352,21 +352,21 @@ namespace OnlineStore.DeviceLibrary
} }
else if (WaitType == (int)Wait_Type.AxisLimitNegativeSingle_8) else if (WaitType == (int)Wait_Type.AxisLimitNegativeSingle_8)
{ {
return "轴【" + AxisInfo.DisplayStr + "】负限位：【" + IoValue + "】 "; return "轴【" + AxisInfo.DisplayStr + "】负限位【" + IoValue + "】 ";
} }
else if (WaitType == (int)Wait_Type.AxisLimitPositiveSingle_9) else if (WaitType == (int)Wait_Type.AxisLimitPositiveSingle_9)
{ {
return "轴【" + AxisInfo.DisplayStr + "】正限位：【" + IoValue + "】 "; return "轴【" + AxisInfo.DisplayStr + "】正限位【" + IoValue + "】 ";
} }
else if (WaitType == (int)Wait_Type.BatchAxisMove_10) else if (WaitType == (int)Wait_Type.BatchAxisMove_10)
{ {
return "上料轴运动停止 "; return "上料轴运动停止 ";
}else if (WaitType == (int)Wait_Type.ScanCode_11) }else if (WaitType == (int)Wait_Type.ScanCode_11)
{ {
return "等待扫码结束"; return "扫码结束";
}else if(WaitType == (int)Wait_Type.TakeTrayGo_12) }else if(WaitType == (int)Wait_Type.TakeTrayGo_12)
{ {
return "等待操作人员拿走料盘"; return "操作人员拿走料盘";
}else if (WaitType == (int)Wait_Type.StoreRuning_13) }else if (WaitType == (int)Wait_Type.StoreRuning_13)
{ {
return "等待送料结束"; return "等待送料结束";
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!