Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit f27ffb8e 由 刘韬
选项

1

1 个父辈 c2eb793e
内嵌 并排
正在显示 26 个修改的文件 包含 1056 行增加 和 147 行删除
Common/CodeResourceControl.cs
...@@ -64,7 +64,7 @@ namespace OnlineStore ...@@ -64,7 +64,7 @@ namespace OnlineStore
} }
LoadData(true); LoadData(true);
//SetCurrentCulture(CurrLanguage); //SetCurrentCulture(CurrLanguage);
LanguageChangeEvent?.Invoke(null, EventArgs.Empty); //LanguageChangeEvent?.Invoke(null, EventArgs.Empty);
} }
catch (Exception e) catch (Exception e)
......
Common/StringList.cs
...@@ -126,6 +126,7 @@ namespace OnlineStore.Common ...@@ -126,6 +126,7 @@ namespace OnlineStore.Common
monitor_config_load_fail, monitor_config_load_fail,
monitor_config_not_exist, monitor_config_not_exist,
AxisMoveControl_status_monitor, AxisMoveControl_status_monitor,
string_full_takeout string_full_takeout,
string_not_onposition
} }
} }
DeviceLibrary/DeviceLibrary.csproj
...@@ -147,6 +147,9 @@ ...@@ -147,6 +147,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="StoreConfig\fixPositions.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="StoreConfig\linePositions.csv"> <None Include="StoreConfig\linePositions.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
......
DeviceLibrary/DeviceLibrary/Camera.cs
...@@ -173,4 +173,5 @@ public enum FixtureState ...@@ -173,4 +173,5 @@ public enum FixtureState
ToOut, ToOut,
ToInSide, ToInSide,
ToOutSide, ToOutSide,
ToFix,
} }
DeviceLibrary/DeviceLibrary/ServerCommunication.cs
...@@ -218,6 +218,7 @@ namespace DeviceLibrary ...@@ -218,6 +218,7 @@ namespace DeviceLibrary
} }
return host + api_communication; return host + api_communication;
} }
int getthtime = 0;
public void SendLineStatus() public void SendLineStatus()
{ {
if (RobotManage.InoutDebugMode) if (RobotManage.InoutDebugMode)
...@@ -228,13 +229,19 @@ namespace DeviceLibrary ...@@ -228,13 +229,19 @@ namespace DeviceLibrary
//构建发送给服务器的对象 //构建发送给服务器的对象
Operation lineOperation = getLineBoxStatus(); Operation lineOperation = getLineBoxStatus();
//如果还没湿度范围，先获取 //如果还没湿度范围，先获取
if (Max_Humidity <= 0 || (Max_Temperature <= 0)) if (getthtime < 3)
{ {
lineOperation.op = 5; if (Max_Humidity <= 0 || (Max_Temperature <= 0))
LogUtil.info(StoreName + "没有湿度预警范围，需要从服务器获取，发送OP=" + lineOperation.op); {
lineOperation.op = 5;
LogUtil.info(StoreName + "没有湿度预警范围，需要从服务器获取，发送OP=" + lineOperation.op);
getthtime++;
}
} }
Operation resultOperation = HttpHelper.Post(GetPostApi(), lineOperation, false); Operation resultOperation = HttpHelper.Post(GetPostApi(), lineOperation, false);
if (resultOperation != null)
getthtime = 0;
//LogUtil.info(JsonHelper.SerializeObject(resultOperation.data)); //LogUtil.info(JsonHelper.SerializeObject(resultOperation.data));
ResultProcess(resultOperation); ResultProcess(resultOperation);
TimeSpan span = DateTime.Now - time; TimeSpan span = DateTime.Now - time;
...@@ -421,8 +428,10 @@ namespace DeviceLibrary ...@@ -421,8 +428,10 @@ namespace DeviceLibrary
} }
else if (RobotManage.mainMachine.ClampMoveInfo.MoveStep == MoveStep.InWaitServerCallback) else if (RobotManage.mainMachine.ClampMoveInfo.MoveStep == MoveStep.InWaitServerCallback)
{ {
string msg = resultOperation.msg;
SendStoreState("", StoreStatus.InStoreError); SendStoreState("", StoreStatus.InStoreError);
RobotManage.mainMachine.ClampMoveInfo.NextMoveStep(MoveStep.NGOUT_01); //RobotManage.mainMachine.ClampMoveInfo.NextMoveStep(MoveStep.NGOUT_01);
RobotManage.mainMachine.NGPuted(msg);
LogUtil.info("服务器没有正确返回库位."); LogUtil.info("服务器没有正确返回库位.");
} }
else { else {
......
DeviceLibrary/StoreConfig/fixPositions.csv 0 → 100644
位置,优先级,高度,宽度,料仓ID,旋转轴位置P2,升降轴库位入料高点P3,升降轴库位入料低点P4,进出轴库位点取料点P3
fix#7,1,24,7,1,139000,85635,76635,216000
fix#13,2,24,13,1,139000,114988,105988,216000
DeviceLibrary/StoreConfig/linePositions.csv
位置,优先级,高度,宽度,料仓ID,旋转轴位置P2,升降轴库位入料高点P3,升降轴库位入料低点P4,进出轴库位点取料点P3 位置,优先级,高度,宽度,料仓ID,旋转轴位置P2,升降轴库位入料高点P3,升降轴库位入料低点P4,进出轴库位点取料点P3,,,
1#AC1_0_0_1,1,8,7,1,139000,85635,76635,216000 1069M02_01_11_01,796,8,7,1,219347,31048,20240,236990,,,
1#AC1_0_0_2,2,8,7,1,139000,114988,105988,216000 1069M02_01_11_02,795,8,7,1,219347,60595,49787,236990,,,18296
1#AC1_1_0_1,3,8,7,1,139000,145635,136635,216000 1069M02_01_11_03,794,8,7,1,219347,91377,80569,236990,,,
1#AC1_1_0_2,4,8,7,1,139000,176235,167235,216000 1069M02_01_11_04,793,8,7,1,219347,121147,110339,236990,,,4920
1#AC1_1_0_3,5,8,7,1,139000,206882,197882,216000 1069M02_01_11_05,792,8,7,1,219347,151889,141081,236990,,,
1#AC1_1_0_4,6,8,7,1,139000,236867,227867,216000 1069M02_01_11_06,791,8,7,1,219347,182278,171470,236990,,,
1#AC1_1_0_5,7,8,7,1,139000,268094,259094,216000 1069M02_01_11_07,790,8,7,1,219347,212452,201644,236990,,16926,
1#AC1_1_0_6,8,8,7,1,139000,297486,288486,216000 1069M02_01_11_08,789,8,7,1,219347,242880,232072,236990,,16926,
1#AC1_2_0_1,9,8,7,1,139000,358117,349117,216000 1069M02_01_11_09,788,8,7,1,219347,273824,263016,236990,,6118,
1#AC1_2_0_2,10,8,7,1,139000,389346,380346,216000 1069M02_01_11_10,787,8,7,1,219347,303630,292822,236990,,,
1#AC1_2_0_3,11,8,7,1,139000,419989,410989,216000 1069M02_01_11_11,786,8,7,1,219347,334223,323415,236990,,,
1#AC1_2_0_4,12,8,7,1,139000,449990,440990,216000 1069M02_01_11_12,785,8,7,1,219347,365075,354267,236990,,,
1#AC1_2_0_5,13,8,7,1,139000,479971,470971,216000 1069M02_01_11_13,784,8,7,1,219347,396359,385551,236990,,,
1#AC1_2_0_6,14,8,7,1,139000,509965,500965,216000 1069M02_01_11_14,783,8,7,1,219347,426437,415629,236990,,,
1#AC1_3_0_1,15,8,7,1,139000,571209,562209,216000 1069M02_01_11_15,782,8,7,1,219347,456331,445523,236990,,,
1#AC1_3_0_2,16,8,7,1,139000,601848,592848,216000 1069M02_01_11_16,781,8,7,1,219347,488190,477382,236990,,,
1#AC1_3_0_3,17,8,7,1,139000,634980,625980,216000 1069M02_01_11_17,780,8,7,1,219347,517826,507018,236990,,,
1#AC1_3_0_4,18,8,7,1,139000,1250244,1241244,216000 1069M02_01_21_01,779,8,7,1,219347,548997,538189,236990,,,
1#AC1_3_0_5,19,8,7,1,139000,1281308,1272308,216000 1069M02_01_21_02,778,8,7,1,219347,579010,568202,236990,,,
1#AC1_3_0_6,20,8,7,1,139000,1311808,1302808,216000 1069M02_01_21_03,777,8,7,1,219347,609659,598851,236990,,,
1#AC1_4_0_1,21,8,7,1,139000,1372422,1363422,216000 1069M02_01_21_04,776,8,7,1,219347,640419,629611,236990,,,
1#AC1_4_0_2,22,8,7,1,139000,1403044,1394044,216000 1069M02_01_21_05,775,8,7,1,219347,671882,661074,236990,,,
1#AC1_4_0_3,23,8,7,1,139000,1433668,1424668,216000 1069M02_01_21_06,774,8,7,1,219347,701758,690950,236990,,,
1#AC1_4_0_4,24,8,7,1,139000,1464277,1455277,216000 1069M02_01_21_07,773,8,7,1,219347,732293,721485,236990,,,
1#AC1_4_0_5,25,8,7,1,139000,1494290,1485290,216000 1069M02_01_21_08,772,8,7,1,219347,762346,751538,236990,,,
1#AC1_4_0_6,26,8,7,1,139000,1524909,1515909,216000 1069M02_01_21_09,771,8,7,1,219347,794033,783225,236990,,,
1#AC1_5_0_1,27,8,7,1,139000,1586180,1577180,216000 1069M02_01_21_10,770,8,7,1,219347,823405,812597,236990,,,
1#AC1_5_0_2,28,8,7,1,139000,1614177,1607177,216000 1069M02_01_21_11,769,8,7,1,219347,853356,842548,236990,,,
1#AC1_5_0_3,29,8,7,1,139000,1644603,1637603,216000 1069M02_01_21_12,768,8,7,1,219347,884553,873745,236990,,,
1#AC1_5_0_4,30,8,7,1,139000,1675851,1668851,216000 1069M02_01_21_13,767,8,7,1,219347,914542,903734,236990,,,
1#AC1_5_0_5,31,8,7,1,139000,1705914,1698914,216000 1069M02_01_21_14,766,8,7,1,219347,945451,934643,236990,,,
1#AC1_5_0_6,32,8,7,1,139000,1735870,1728870,216000 1069M02_01_21_15,765,8,7,1,219347,975287,964479,236990,,,
1#AC1_6_0_1,33,8,7,1,139000,1797741,1790741,216000 1069M02_01_21_16,764,8,7,1,219347,1006056,995248,236990,,,
1#AC1_6_0_2,34,8,7,1,139000,1827740,1820740,216000 1069M02_01_21_17,763,8,7,1,219347,1036562,1025754,236990,,,
1#AC1_6_0_3,35,8,7,1,139000,1857727,1850727,216000 1069M02_01_31_01,762,8,7,1,219347,1067806,1056998,236990,,,
1#AC1_6_0_4,36,8,7,1,139000,1888986,1881986,216000 1069M02_01_31_02,761,8,7,1,219347,1097161,1086353,236990,,,
1#AC1_6_0_5,37,8,7,1,139000,1919455,1912455,216000 1069M02_01_31_03,760,8,7,1,219347,1128071,1117263,236990,,,
1#AC1_6_0_6,38,8,7,1,139000,1949292,1942292,216000 1069M02_01_31_04,759,8,7,1,219347,1158489,1147681,236990,,,
1#AC1_7_0_1,39,8,7,1,139000,2009635,2002635,216000 1069M02_01_31_05,758,8,7,1,219347,1188443,1177635,236990,,,
1#AC1_7_0_2,40,8,7,1,139000,2040847,2033847,216000 1069M02_01_31_06,757,8,7,1,219347,1219398,1208590,236990,,,
1#AC1_7_0_3,41,8,7,1,139000,2070885,2063885,216000 1069M02_01_31_07,756,8,7,1,219347,1250186,1239378,236990,,,
1#AC1_7_0_4,42,8,7,1,139000,2101337,2094337,216000 1069M02_01_31_08,755,8,7,1,219347,1280611,1269803,236990,,,
1#AC1_7_0_5,43,8,7,1,139000,2131800,2124800,216000 1069M02_01_31_09,754,8,7,1,219347,1311064,1300256,236990,,,
1#AC1_7_0_6,44,8,7,1,139000,2162412,2155412,216000 1069M02_01_31_10,753,8,7,1,219347,1341992,1331184,236990,,,
1#AC1_8_0_1,45,8,7,1,139000,2223046,2216046,216000 1069M02_01_31_11,752,8,7,1,219347,1372295,1361487,236990,,,
1#AC1_8_0_2,46,8,7,1,139000,2253057,2246057,216000 1069M02_01_31_12,751,8,7,1,219347,1402484,1391676,236990,,,
1#AC1_8_0_3,47,8,7,1,164500,85635,76635,216000 1069M02_01_31_13,750,8,7,1,219347,1433486,1422678,236990,,,
1#AC1_8_0_4,48,8,7,1,164500,114988,105988,216000 1069M02_01_31_14,749,8,7,1,219347,1463404,1452596,236990,,,
1#AC1_8_0_5,49,8,7,1,164500,145635,136635,216000 1069M02_01_31_15,748,8,7,1,219347,1493926,1483118,236990,,,
1#AC1_8_0_6,50,8,7,1,164500,176235,167235,216000 1069M02_01_31_16,747,8,7,1,219347,1525099,1514291,236990,,,
1#AC1_9_0_1,51,8,7,1,164500,236867,227867,216000 1069M02_01_31_17,746,8,7,1,219347,1556210,1545402,236990,,,
1#AC1_9_0_2,52,8,7,1,164500,268094,259094,216000 1069M02_01_41_01,745,8,7,1,219347,1583889,1573081,236990,,,
1#AC1_9_0_3,53,8,7,1,164500,297486,288486,216000 1069M02_01_41_02,744,8,7,1,219347,1615371,1604563,236990,,,
1#AC1_9_0_4,54,8,7,1,164500,328116,319116,216000 1069M02_01_41_03,743,8,7,1,219347,1645844,1635036,236990,,,
1#AC1_9_0_5,55,8,7,1,164500,358117,349117,216000 1069M02_01_41_04,742,8,7,1,219347,1676317,1665509,236990,,,
1#AC1_9_0_6,56,8,7,1,164500,389346,380346,216000 1069M02_01_41_05,741,8,7,1,219347,1706928,1696120,236990,,,
1#AC1_10_0_1,57,8,7,1,164500,449990,440990,216000 1069M02_01_41_06,740,8,7,1,219347,1737328,1726520,236990,,,
1#AC1_10_0_2,58,8,7,1,164500,479971,470971,216000 1069M02_01_41_07,739,8,7,1,219347,1767633,1756825,236990,,,
1#AC1_10_0_3,59,8,7,1,164500,509965,500965,216000 1069M02_01_41_08,738,8,7,1,219347,1798085,1787277,236990,,,
1#AC1_10_0_4,60,8,7,1,164500,540585,531585,216000 1069M02_01_41_09,737,8,7,1,219347,1828813,1818005,236990,,,
1#AC1_10_0_5,61,8,7,1,164500,571209,562209,216000 1069M02_01_41_10,736,8,7,1,219347,1859612,1848804,236990,,,
1#AC1_10_0_6,62,8,7,1,164500,601848,592848,216000 1069M02_01_41_11,735,8,7,1,219347,1889603,1878795,236990,,,
1#AC1_11_0_1,63,8,7,1,164500,1250244,1241244,216000 1069M02_01_41_12,734,8,7,1,219347,1920211,1909403,236990,,,
1#AC1_11_0_2,64,8,7,1,164500,1281308,1272308,216000 1069M02_01_41_13,733,8,7,1,219347,1951392,1940584,236990,,,
1#AC1_11_0_3,65,8,7,1,164500,1311808,1302808,216000 1069M02_01_41_14,732,8,7,1,219347,1981711,1970903,236990,,,
1#AC1_11_0_4,66,8,7,1,164500,1342415,1333415,216000 1069M02_01_41_15,731,8,7,1,219347,2011997,2001189,236990,,,
1#AC1_11_0_5,67,8,7,1,164500,1372422,1363422,216000 1069M02_01_41_16,730,8,7,1,219347,2041246,2030438,236990,,,
1#AC1_11_0_6,68,8,7,1,164500,1403044,1394044,216000 1069M02_01_12_01,729,8,7,1,242048,31048,20240,236990,,,
1#AC1_12_0_1,69,8,7,1,164500,1464277,1455277,216000 1069M02_01_12_02,728,8,7,1,242048,60595,49787,236990,,,
1#AC1_12_0_2,70,8,7,1,164500,1494290,1485290,216000 1069M02_01_12_03,727,8,7,1,242048,91377,80569,236990,,,
1#AC1_12_0_3,71,8,7,1,164500,1524909,1515909,216000 1069M02_01_12_04,726,8,7,1,242048,121147,110339,236990,,,
1#AC1_12_0_4,72,8,7,1,164500,1554933,1545933,216000 1069M02_01_12_05,725,8,7,1,242048,151889,141081,236990,,,
1#AC1_12_0_5,73,8,7,1,164500,1586180,1577180,216000 1069M02_01_12_06,724,8,7,1,242048,182278,171470,236990,,,
1#AC1_12_0_6,74,8,7,1,164500,1614177,1607177,216000 1069M02_01_12_07,723,8,7,1,242048,212452,201644,236990,,,
1#AC1_13_0_1,75,8,7,1,164500,1675851,1668851,216000 1069M02_01_12_08,722,8,7,1,242048,242880,232072,236990,,,
1#AC1_13_0_2,76,8,7,1,164500,1705914,1698914,216000 1069M02_01_12_09,721,8,7,1,242048,273824,263016,236990,,,
1#AC1_13_0_3,77,8,7,1,164500,1735870,1728870,216000 1069M02_01_12_10,720,8,7,1,242048,303630,292822,236990,,,
1#AC1_13_0_4,78,8,7,1,164500,1766473,1759473,216000 1069M02_01_12_11,719,8,7,1,242048,334223,323415,236990,,,
1#AC1_13_0_5,79,8,7,1,164500,1797741,1790741,216000 1069M02_01_12_12,718,8,7,1,242048,365075,354267,236990,,,
1#AC1_13_0_6,80,8,7,1,164500,1827740,1820740,216000 1069M02_01_12_13,717,8,7,1,242048,396359,385551,236990,,,
1#AC1_14_0_1,81,8,7,1,164500,1888986,1881986,216000 1069M02_01_12_14,716,8,7,1,242048,426437,415629,236990,,,
1#AC1_14_0_2,82,8,7,1,164500,1919455,1912455,216000 1069M02_01_12_15,715,8,7,1,242048,456331,445523,236990,,,
1#AC1_14_0_3,83,8,7,1,164500,1949292,1942292,216000 1069M02_01_12_16,714,8,7,1,242048,488190,477382,236990,,,
1#AC1_14_0_4,84,8,7,1,164500,1979778,1972778,216000 1069M02_01_12_17,713,8,7,1,242048,517826,507018,236990,,,
1#AC1_14_0_5,85,8,7,1,164500,2009635,2002635,216000 1069M02_01_22_01,712,8,7,1,242048,548997,538189,236990,,,
1#AC1_14_0_6,86,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_02,711,8,7,1,242048,579010,568202,236990,,,
1#AC1_15_0_1,87,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_03,710,8,7,1,242048,609659,598851,236990,,,
1#AC1_15_0_2,88,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_04,709,8,7,1,242048,640419,629611,236990,,,
1#AC1_15_0_3,89,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_05,708,8,7,1,242048,671882,661074,236990,,,
1#AC1_15_0_4,90,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_06,707,8,7,1,242048,701758,690950,236990,,,
1#AC1_15_0_5,91,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_07,706,8,7,1,242048,732293,721485,236990,,,
1#AC1_15_0_6,92,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_08,705,8,7,1,242048,762346,751538,236990,,,
1#AC1_16_0_1,93,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_09,704,8,7,1,242048,794033,783225,236990,,,
1#AC1_16_0_2,94,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_10,703,8,7,1,242048,823405,812597,236990,,,
1#AC1_16_0_3,95,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_11,702,8,7,1,242048,853356,842548,236990,,,
1#AC1_16_0_4,96,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_12,701,8,7,1,242048,884553,873745,236990,,,
1#AC1_16_0_5,97,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_13,700,8,7,1,242048,914542,903734,236990,,,
1#AC1_16_0_6,98,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_14,699,8,7,1,242048,945451,934643,236990,,,
1#AC1_17_0_1,99,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_15,698,8,7,1,242048,975287,964479,236990,,,
1#AC1_17_0_2,100,8,7,1,164500,2040847,2033847,216000 1069M02_01_22_16,697,8,7,1,242048,1006056,995248,236990,,,
1069M02_01_22_17,696,8,7,1,242048,1036562,1025754,236990,,,
1069M02_01_32_01,695,8,7,1,242048,1067806,1056998,236990,,,
1069M02_01_32_02,694,8,7,1,242048,1097161,1086353,236990,,,
1069M02_01_32_03,693,8,7,1,242048,1128071,1117263,236990,,,
1069M02_01_32_04,692,8,7,1,242048,1158489,1147681,236990,,,
1069M02_01_32_05,691,8,7,1,242048,1188443,1177635,236990,,,
1069M02_01_32_06,690,8,7,1,242048,1219398,1208590,236990,,,
1069M02_01_32_07,689,8,7,1,242048,1250186,1239378,236990,,,
1069M02_01_32_08,688,8,7,1,242048,1280611,1269803,236990,,,
1069M02_01_32_09,687,8,7,1,242048,1311064,1300256,236990,,,
1069M02_01_32_10,686,8,7,1,242048,1341992,1331184,236990,,,
1069M02_01_32_11,685,8,7,1,242048,1372295,1361487,236990,,,
1069M02_01_32_12,684,8,7,1,242048,1402484,1391676,236990,,,
1069M02_01_32_13,683,8,7,1,242048,1433486,1422678,236990,,,
1069M02_01_32_14,682,8,7,1,242048,1463404,1452596,236990,,,
1069M02_01_32_15,681,8,7,1,242048,1493926,1483118,236990,,,
1069M02_01_32_16,680,8,7,1,242048,1525099,1514291,236990,,,
1069M02_01_32_17,679,8,7,1,242048,1556210,1545402,236990,,,
1069M02_01_42_01,678,8,7,1,242048,1583889,1573081,236990,,,
1069M02_01_42_02,677,8,7,1,242048,1615371,1604563,236990,,,
1069M02_01_42_03,676,8,7,1,242048,1645844,1635036,236990,,,
1069M02_01_42_04,675,8,7,1,242048,1676317,1665509,236990,,,
1069M02_01_42_05,674,8,7,1,242048,1706928,1696120,236990,,,
1069M02_01_42_06,673,8,7,1,242048,1737328,1726520,236990,,,
1069M02_01_42_07,672,8,7,1,242048,1767633,1756825,236990,,,
1069M02_01_42_08,671,8,7,1,242048,1798085,1787277,236990,,,
1069M02_01_42_09,670,8,7,1,242048,1828813,1818005,236990,,,
1069M02_01_42_10,669,8,7,1,242048,1859612,1848804,236990,,,
1069M02_01_42_11,668,8,7,1,242048,1889603,1878795,236990,,,
1069M02_01_42_12,667,8,7,1,242048,1920211,1909403,236990,,,
1069M02_01_42_13,666,8,7,1,242048,1951392,1940584,236990,,,
1069M02_01_42_14,665,8,7,1,242048,1981711,1970903,236990,,,
1069M02_01_42_15,664,8,7,1,242048,2011997,2001189,236990,,,
1069M02_01_42_16,663,8,7,1,242048,2041246,2030438,236990,,,
1069M02_02_11_01,662,8,7,1,266472,29412,18604,236990,,,
1069M02_02_11_02,661,8,7,1,266472,60089,49281,236990,,,
1069M02_02_11_03,660,8,7,1,266472,90502,79694,236990,,,
1069M02_02_11_04,659,8,7,1,266472,121421,110613,236990,,,
1069M02_02_11_05,658,8,7,1,266472,150984,140176,236990,,,
1069M02_02_11_06,657,8,7,1,266472,182299,171491,236990,,,
1069M02_02_11_07,656,8,7,1,266472,211626,200818,236990,,,
1069M02_02_11_08,655,8,7,1,266472,243176,232368,236990,,,
1069M02_02_11_09,654,8,7,1,266472,272810,262002,236990,,,
1069M02_02_11_10,653,8,7,1,266472,304047,293239,236990,,,
1069M02_02_11_11,652,8,7,1,266472,334171,323363,236990,,,
1069M02_02_11_12,651,8,7,1,266472,364598,353790,236990,,,
1069M02_02_11_13,650,8,7,1,266472,395966,385158,236990,,,
1069M02_02_11_14,649,8,7,1,266472,426225,415417,236990,,,
1069M02_02_11_15,648,8,7,1,266472,456806,445998,236990,,,
1069M02_02_11_16,647,8,7,1,266472,486935,476127,236990,,,
1069M02_02_11_17,646,8,7,1,266472,517901,507093,236990,,,
1069M02_02_21_01,645,8,7,1,266472,548212,537404,236990,,,
1069M02_02_21_02,644,8,7,1,266472,578535,567727,236990,,,
1069M02_02_21_03,643,8,7,1,266472,609181,598373,236990,,,
1069M02_02_21_04,642,8,7,1,266472,639797,628989,236990,,,
1069M02_02_21_05,641,8,7,1,266472,670830,660022,236990,,,
1069M02_02_21_06,640,8,7,1,266472,700482,689674,236990,,,
1069M02_02_21_07,639,8,7,1,266472,731209,720401,236990,,,
1069M02_02_21_08,638,8,7,1,266472,761235,750427,236990,,,
1069M02_02_21_09,637,8,7,1,266472,792932,782124,236990,,,
1069M02_02_21_10,636,8,7,1,266472,822789,811981,236990,,,
1069M02_02_21_11,635,8,7,1,266472,853455,842647,236990,,,
1069M02_02_21_12,634,8,7,1,266472,884758,873950,236990,,,
1069M02_02_21_13,633,8,7,1,266472,914255,903447,236990,,,
1069M02_02_21_14,632,8,7,1,266472,945267,934459,236990,,,
1069M02_02_21_15,631,8,7,1,266472,975145,964337,236990,,,
1069M02_02_21_16,630,8,7,1,266472,1005398,994590,236990,,,
1069M02_02_21_17,629,8,7,1,266472,1036262,1025454,236990,,,
1069M02_02_31_01,628,8,7,1,266472,1067501,1056693,236990,,,
1069M02_02_31_02,627,8,7,1,266472,1098671,1087863,236990,,,
1069M02_02_31_03,626,8,7,1,266472,1128943,1118135,236990,,,
1069M02_02_31_04,625,8,7,1,266472,1159727,1148919,236990,,,
1069M02_02_31_05,624,8,7,1,266472,1189654,1178846,236990,,,
1069M02_02_31_06,623,8,7,1,266472,1220585,1209777,236990,,,
1069M02_02_31_07,622,8,7,1,266472,1250968,1240160,236990,,,
1069M02_02_31_08,621,8,7,1,266472,1281772,1270964,236990,,,
1069M02_02_31_09,620,8,7,1,266472,1312111,1301303,236990,,,
1069M02_02_31_10,619,8,7,1,266472,1342123,1331315,236990,,,
1069M02_02_31_11,618,8,7,1,266472,1373376,1362568,236990,,,
1069M02_02_31_12,617,8,7,1,266472,1404022,1393214,236990,,,
1069M02_02_31_13,616,8,7,1,266472,1434300,1423492,236990,,,
1069M02_02_31_14,615,8,7,1,266472,1465179,1454371,236990,,,
1069M02_02_31_15,614,8,7,1,266472,1494848,1484040,236990,,,
1069M02_02_31_16,613,8,7,1,266472,1526087,1515279,236990,,,
1069M02_02_31_17,612,8,7,1,266472,1555648,1544840,236990,,,
1069M02_02_41_01,611,8,7,1,266472,1584210,1573402,236990,,,
1069M02_02_41_02,610,8,7,1,266472,1616842,1606034,236990,,,
1069M02_02_41_03,609,8,7,1,266472,1647737,1636929,236990,,,
1069M02_02_41_04,608,8,7,1,266472,1677945,1667137,236990,,,
1069M02_02_41_05,607,8,7,1,266472,1708256,1697448,236990,,,
1069M02_02_41_06,606,8,7,1,266472,1738689,1727881,236990,,,
1069M02_02_41_07,605,8,7,1,266472,1768628,1757820,236990,,,
1069M02_02_41_08,604,8,7,1,266472,1799325,1788517,236990,,,
1069M02_02_41_09,603,8,7,1,266472,1829498,1818690,236990,,,
1069M02_02_41_10,602,8,7,1,266472,1860163,1849355,236990,,,
1069M02_02_41_11,601,8,7,1,266472,1890438,1879630,236990,,,
1069M02_02_41_12,600,8,7,1,266472,1921075,1910267,236990,,,
1069M02_02_41_13,599,8,7,1,266472,1951060,1940252,236990,,,
1069M02_02_41_14,598,8,7,1,266472,1982399,1971591,236990,,,
1069M02_02_41_15,597,8,7,1,266472,2012330,2001522,236990,,,
1069M02_02_41_16,596,8,7,1,266472,2042193,2031385,236990,,,
1069M02_02_12_01,595,8,7,1,289159,29412,18604,236990,,,
1069M02_02_12_02,594,8,7,1,289159,60089,49281,236990,,,
1069M02_02_12_03,593,8,7,1,289159,90502,79694,236990,,,
1069M02_02_12_04,592,8,7,1,289159,121421,110613,236990,,,
1069M02_02_12_05,591,8,7,1,289159,150984,140176,236990,,,
1069M02_02_12_06,590,8,7,1,289159,182299,171491,236990,,,
1069M02_02_12_07,589,8,7,1,289159,211626,200818,236990,,,
1069M02_02_12_08,588,8,7,1,289159,243176,232368,236990,,,
1069M02_02_12_09,587,8,7,1,289159,272810,262002,236990,,,
1069M02_02_12_10,586,8,7,1,289159,304047,293239,236990,,,
1069M02_02_12_11,585,8,7,1,289159,334171,323363,236990,,,
1069M02_02_12_12,584,8,7,1,289159,364598,353790,236990,,,
1069M02_02_12_13,583,8,7,1,289159,395966,385158,236990,,,
1069M02_02_12_14,582,8,7,1,289159,426225,415417,236990,,,
1069M02_02_12_15,581,8,7,1,289159,456806,445998,236990,,,
1069M02_02_12_16,580,8,7,1,289159,486935,476127,236990,,,
1069M02_02_12_17,579,8,7,1,289159,517901,507093,236990,,,
1069M02_02_22_01,578,8,7,1,289159,548212,537404,236990,,,
1069M02_02_22_02,577,8,7,1,289159,578535,567727,236990,,,
1069M02_02_22_03,576,8,7,1,289159,609181,598373,236990,,,
1069M02_02_22_04,575,8,7,1,289159,639797,628989,236990,,,
1069M02_02_22_05,574,8,7,1,289159,670830,660022,236990,,,
1069M02_02_22_06,573,8,7,1,289159,700482,689674,236990,,,
1069M02_02_22_07,572,8,7,1,289159,731209,720401,236990,,,
1069M02_02_22_08,571,8,7,1,289159,761235,750427,236990,,,
1069M02_02_22_09,570,8,7,1,289159,792932,782124,236990,,,
1069M02_02_22_10,569,8,7,1,289159,822789,811981,236990,,,
1069M02_02_22_11,568,8,7,1,289159,853455,842647,236990,,,
1069M02_02_22_12,567,8,7,1,289159,884758,873950,236990,,,
1069M02_02_22_13,566,8,7,1,289159,914255,903447,236990,,,
1069M02_02_22_14,565,8,7,1,289159,945267,934459,236990,,,
1069M02_02_22_15,564,8,7,1,289159,975145,964337,236990,,,
1069M02_02_22_16,563,8,7,1,289159,1005398,994590,236990,,,
1069M02_02_22_17,562,8,7,1,289159,1036262,1025454,236990,,,
1069M02_02_32_01,561,8,7,1,289159,1067501,1056693,236990,,,
1069M02_02_32_02,560,8,7,1,289159,1098671,1087863,236990,,,
1069M02_02_32_03,559,8,7,1,289159,1128943,1118135,236990,,,
1069M02_02_32_04,558,8,7,1,289159,1159727,1148919,236990,,,
1069M02_02_32_05,557,8,7,1,289159,1189654,1178846,236990,,,
1069M02_02_32_06,556,8,7,1,289159,1220585,1209777,236990,,,
1069M02_02_32_07,555,8,7,1,289159,1250968,1240160,236990,,,
1069M02_02_32_08,554,8,7,1,289159,1281772,1270964,236990,,,
1069M02_02_32_09,553,8,7,1,289159,1312111,1301303,236990,,,
1069M02_02_32_10,552,8,7,1,289159,1342123,1331315,236990,,,
1069M02_02_32_11,551,8,7,1,289159,1373376,1362568,236990,,,
1069M02_02_32_12,550,8,7,1,289159,1404022,1393214,236990,,,
1069M02_02_32_13,549,8,7,1,289159,1434300,1423492,236990,,,
1069M02_02_32_14,548,8,7,1,289159,1465179,1454371,236990,,,
1069M02_02_32_15,547,8,7,1,289159,1494848,1484040,236990,,,
1069M02_02_32_16,546,8,7,1,289159,1526087,1515279,236990,,,
1069M02_02_32_17,545,8,7,1,289159,1555648,1544840,236990,,,
1069M02_02_42_01,544,8,7,1,289159,1584210,1573402,236990,,,
1069M02_02_42_02,543,8,7,1,289159,1616842,1606034,236990,,,
1069M02_02_42_03,542,8,7,1,289159,1647737,1636929,236990,,,
1069M02_02_42_04,541,8,7,1,289159,1677945,1667137,236990,,,
1069M02_02_42_05,540,8,7,1,289159,1708256,1697448,236990,,,
1069M02_02_42_06,539,8,7,1,289159,1738689,1727881,236990,,,
1069M02_02_42_07,538,8,7,1,289159,1768628,1757820,236990,,,
1069M02_02_42_08,537,8,7,1,289159,1799325,1788517,236990,,,
1069M02_02_42_09,536,8,7,1,289159,1829498,1818690,236990,,,
1069M02_02_42_10,535,8,7,1,289159,1860163,1849355,236990,,,
1069M02_02_42_11,534,8,7,1,289159,1890438,1879630,236990,,,
1069M02_02_42_12,533,8,7,1,289159,1921075,1910267,236990,,,
1069M02_02_42_13,532,8,7,1,289159,1951060,1940252,236990,,,
1069M02_02_42_14,531,8,7,1,289159,1982399,1971591,236990,,,
1069M02_02_42_15,530,8,7,1,289159,2012330,2001522,236990,,,
1069M02_02_42_16,529,8,7,1,289159,2042193,2031385,236990,,,
1069M02_03_11_01,528,8,7,1,313416,31228,20420,236990,,,
1069M02_03_11_02,527,8,7,1,313416,61946,51138,236990,,,
1069M02_03_11_03,526,8,7,1,313416,91727,80919,236990,,,
1069M02_03_11_04,525,8,7,1,313416,122512,111704,236990,,,
1069M02_03_11_05,524,8,7,1,313416,153169,142361,236990,,,
1069M02_03_11_06,523,8,7,1,313416,183571,172763,236990,,,
1069M02_03_11_07,522,8,7,1,313416,213902,203094,236990,,,
1069M02_03_11_08,521,8,7,1,313416,244310,233502,236990,,,
1069M02_03_11_09,520,8,7,1,313416,274868,264060,236990,,,
1069M02_03_11_10,519,8,7,1,313416,305465,294657,236990,,,
1069M02_03_11_11,518,8,7,1,313416,336084,325276,236990,,,
1069M02_03_11_12,517,8,7,1,313416,366318,355510,236990,,,
1069M02_03_11_13,516,8,7,1,313416,397175,386367,236990,,,
1069M02_03_11_14,515,8,7,1,313416,427718,416910,236990,,,
1069M02_03_11_15,514,8,7,1,313416,458119,447311,236990,,,
1069M02_03_11_16,513,8,7,1,313416,487997,477189,236990,,,
1069M02_03_11_17,512,8,7,1,313416,519421,508613,236990,,,
1069M02_03_21_01,511,8,7,1,313416,547956,537148,236990,,,
1069M02_03_21_02,510,8,7,1,313416,578950,568142,236990,,,
1069M02_03_21_03,509,8,7,1,313416,609267,598459,236990,,,
1069M02_03_21_04,508,8,7,1,313416,639833,629025,236990,,,
1069M02_03_21_05,507,8,7,1,313416,669837,659029,236990,,,
1069M02_03_21_06,506,8,7,1,313416,700548,689740,236990,,,
1069M02_03_21_07,505,8,7,1,313416,731548,720740,236990,,,
1069M02_03_21_08,504,8,7,1,313416,761706,750898,236990,,,
1069M02_03_21_09,503,8,7,1,313416,792233,781425,236990,,,
1069M02_03_21_10,502,8,7,1,313416,822418,811610,236990,,,
1069M02_03_21_11,501,8,7,1,313416,853210,842402,236990,,,
1069M02_03_21_12,500,8,7,1,313416,883642,872834,236990,,,
1069M02_03_21_13,499,8,7,1,313416,913824,903016,236990,,,
1069M02_03_21_14,498,8,7,1,313416,944410,933602,236990,,,
1069M02_03_21_15,497,8,7,1,313416,975670,964862,236990,,,
1069M02_03_21_16,496,8,7,1,313416,1005371,994563,236990,,,
1069M02_03_21_17,495,8,7,1,313416,1035990,1025182,236990,,,
1069M02_03_31_01,494,8,7,1,313416,1068012,1057204,236990,,,
1069M02_03_31_02,493,8,7,1,313416,1098281,1087473,236990,,,
1069M02_03_31_03,492,8,7,1,313416,1129612,1118804,236990,,,
1069M02_03_31_04,491,8,7,1,313416,1159719,1148911,236990,,,
1069M02_03_31_05,490,8,7,1,313416,1190376,1179568,236990,,,
1069M02_03_31_06,489,8,7,1,313416,1220856,1210048,236990,,,
1069M02_03_31_07,488,8,7,1,313416,1250868,1240060,236990,,,
1069M02_03_31_08,487,8,7,1,313416,1280676,1269868,236990,,,
1069M02_03_31_09,486,8,7,1,313416,1311143,1300335,236990,,,
1069M02_03_31_10,485,8,7,1,313416,1342024,1331216,236990,,,
1069M02_03_31_11,484,8,7,1,313416,1372805,1361997,236990,,,
1069M02_03_31_12,483,8,7,1,313416,1403269,1392461,236990,,,
1069M02_03_31_13,482,8,7,1,313416,1433742,1422934,236990,,,
1069M02_03_31_14,481,8,7,1,313416,1464688,1453880,236990,,,
1069M02_03_31_15,480,8,7,1,313416,1494320,1483512,236990,,,
1069M02_03_31_16,479,8,7,1,313416,1524408,1513600,236990,,,
1069M02_03_31_17,478,8,7,1,313416,1555379,1544571,236990,,,
1069M02_03_41_01,477,8,7,1,313416,1585838,1575030,236990,,,
1069M02_03_41_02,476,8,7,1,313416,1616213,1605405,236990,,,
1069M02_03_41_03,475,8,7,1,313416,1646712,1635904,236990,,,
1069M02_03_41_04,474,8,7,1,313416,1676360,1665552,236990,,,
1069M02_03_41_05,473,8,7,1,313416,1706533,1695725,236990,,,
1069M02_03_41_06,472,8,7,1,313416,1737279,1726471,236990,,,
1069M02_03_41_07,471,8,7,1,313416,1768095,1757287,236990,,,
1069M02_03_41_08,470,8,7,1,313416,1798331,1787523,236990,,,
1069M02_03_41_09,469,8,7,1,313416,1828573,1817765,236990,,,
1069M02_03_41_10,468,8,7,1,313416,1858922,1848114,236990,,,
1069M02_03_41_11,467,8,7,1,313416,1890121,1879313,236990,,,
1069M02_03_41_12,466,8,7,1,313416,1920204,1909396,236990,,,
1069M02_03_41_13,465,8,7,1,313416,1951279,1940471,236990,,,
1069M02_03_41_14,464,8,7,1,313416,1981641,1970833,236990,,,
1069M02_03_41_15,463,8,7,1,313416,2011521,2000713,236990,,,
1069M02_03_41_16,462,8,7,1,313416,2042310,2031502,236990,,,
1069M02_03_12_01,461,8,7,1,336078,31228,20420,236990,,,
1069M02_03_12_02,460,8,7,1,336078,61946,51138,236990,,,
1069M02_03_12_03,459,8,7,1,336078,91727,80919,236990,,,
1069M02_03_12_04,458,8,7,1,336078,122512,111704,236990,,,
1069M02_03_12_05,457,8,7,1,336078,153169,142361,236990,,,
1069M02_03_12_06,456,8,7,1,336078,183571,172763,236990,,,
1069M02_03_12_07,455,8,7,1,336078,213902,203094,236990,,,
1069M02_03_12_08,454,8,7,1,336078,244310,233502,236990,,,
1069M02_03_12_09,453,8,7,1,336078,274868,264060,236990,,,
1069M02_03_12_10,452,8,7,1,336078,305465,294657,236990,,,
1069M02_03_12_11,451,8,7,1,336078,336084,325276,236990,,,
1069M02_03_12_12,450,8,7,1,336078,366318,355510,236990,,,
1069M02_03_12_13,449,8,7,1,336078,397175,386367,236990,,,
1069M02_03_12_14,448,8,7,1,336078,427718,416910,236990,,,
1069M02_03_12_15,447,8,7,1,336078,458119,447311,236990,,,
1069M02_03_12_16,446,8,7,1,336078,487997,477189,236990,,,
1069M02_03_12_17,445,8,7,1,336078,519421,508613,236990,,,
1069M02_03_22_01,444,8,7,1,336078,547956,537148,236990,,,
1069M02_03_22_02,443,8,7,1,336078,578950,568142,236990,,,
1069M02_03_22_03,442,8,7,1,336078,609267,598459,236990,,,
1069M02_03_22_04,441,8,7,1,336078,639833,629025,236990,,,
1069M02_03_22_05,440,8,7,1,336078,669837,659029,236990,,,
1069M02_03_22_06,439,8,7,1,336078,700548,689740,236990,,,
1069M02_03_22_07,438,8,7,1,336078,731548,720740,236990,,,
1069M02_03_22_08,437,8,7,1,336078,761706,750898,236990,,,
1069M02_03_22_09,436,8,7,1,336078,792233,781425,236990,,,
1069M02_03_22_10,435,8,7,1,336078,822418,811610,236990,,,
1069M02_03_22_11,434,8,7,1,336078,853210,842402,236990,,,
1069M02_03_22_12,433,8,7,1,336078,883642,872834,236990,,,
1069M02_03_22_13,432,8,7,1,336078,913824,903016,236990,,,
1069M02_03_22_14,431,8,7,1,336078,944410,933602,236990,,,
1069M02_03_22_15,430,8,7,1,336078,975670,964862,236990,,,
1069M02_03_22_16,429,8,7,1,336078,1005371,994563,236990,,,
1069M02_03_22_17,428,8,7,1,336078,1035990,1025182,236990,,,
1069M02_03_32_01,427,8,7,1,336078,1068012,1057204,236990,,,
1069M02_03_32_02,426,8,7,1,336078,1098281,1087473,236990,,,
1069M02_03_32_03,425,8,7,1,336078,1129612,1118804,236990,,,
1069M02_03_32_04,424,8,7,1,336078,1159719,1148911,236990,,,
1069M02_03_32_05,423,8,7,1,336078,1190376,1179568,236990,,,
1069M02_03_32_06,422,8,7,1,336078,1220856,1210048,236990,,,
1069M02_03_32_07,421,8,7,1,336078,1250868,1240060,236990,,,
1069M02_03_32_08,420,8,7,1,336078,1280676,1269868,236990,,,
1069M02_03_32_09,419,8,7,1,336078,1311143,1300335,236990,,,
1069M02_03_32_10,418,8,7,1,336078,1342024,1331216,236990,,,
1069M02_03_32_11,417,8,7,1,336078,1372805,1361997,236990,,,
1069M02_03_32_12,416,8,7,1,336078,1403269,1392461,236990,,,
1069M02_03_32_13,415,8,7,1,336078,1433742,1422934,236990,,,
1069M02_03_32_14,414,8,7,1,336078,1464688,1453880,236990,,,
1069M02_03_32_15,413,8,7,1,336078,1494320,1483512,236990,,,
1069M02_03_32_16,412,8,7,1,336078,1524408,1513600,236990,,,
1069M02_03_32_17,411,8,7,1,336078,1555379,1544571,236990,,,
1069M02_03_42_01,410,8,7,1,336078,1585838,1575030,236990,,,
1069M02_03_42_02,409,8,7,1,336078,1616213,1605405,236990,,,
1069M02_03_42_03,408,8,7,1,336078,1646712,1635904,236990,,,
1069M02_03_42_04,407,8,7,1,336078,1676360,1665552,236990,,,
1069M02_03_42_05,406,8,7,1,336078,1706533,1695725,236990,,,
1069M02_03_42_06,405,8,7,1,336078,1737279,1726471,236990,,,
1069M02_03_42_07,404,8,7,1,336078,1768095,1757287,236990,,,
1069M02_03_42_08,403,8,7,1,336078,1798331,1787523,236990,,,
1069M02_03_42_09,402,8,7,1,336078,1828573,1817765,236990,,,
1069M02_03_42_10,401,8,7,1,336078,1858922,1848114,236990,,,
1069M02_03_42_11,400,8,7,1,336078,1890121,1879313,236990,,,
1069M02_03_42_12,399,8,7,1,336078,1920204,1909396,236990,,,
1069M02_03_42_13,398,8,7,1,336078,1951279,1940471,236990,,,
1069M02_03_42_14,397,8,7,1,336078,1981641,1970833,236990,,,
1069M02_03_42_15,396,8,7,1,336078,2011521,2000713,236990,,,
1069M02_03_42_16,395,8,7,1,336078,2042310,2031502,236990,,,
1069M02_04_11_01,394,8,7,1,476,30861,20053,236990,,,
1069M02_04_11_02,393,8,7,1,476,61424,50616,236990,,,
1069M02_04_11_03,392,8,7,1,476,92032,81224,236990,,,
1069M02_04_11_04,391,8,7,1,476,122982,112174,236990,,,
1069M02_04_11_05,390,8,7,1,476,152428,141620,236990,,,
1069M02_04_11_06,389,8,7,1,476,183282,172474,236990,,,
1069M02_04_11_07,388,8,7,1,476,214225,203417,236990,,,
1069M02_04_11_08,387,8,7,1,476,244689,233881,236990,,,
1069M02_04_11_09,386,8,7,1,476,274793,263985,236990,,,
1069M02_04_11_10,385,8,7,1,476,305581,294773,236990,,,
1069M02_04_11_11,384,8,7,1,476,336359,325551,236990,,,
1069M02_04_11_12,383,8,7,1,476,367463,356655,236990,,,
1069M02_04_11_13,382,8,7,1,476,397172,386364,236990,,,
1069M02_04_11_14,381,8,7,1,476,427788,416980,236990,,,
1069M02_04_11_15,380,8,7,1,476,457968,447160,236990,,,
1069M02_04_11_16,379,8,7,1,476,489517,478709,236990,,,
1069M02_04_11_17,378,8,7,1,476,519589,508781,236990,,,
1069M02_04_21_01,377,8,7,1,476,549110,538302,236990,,,
1069M02_04_21_02,376,8,7,1,476,579819,569011,236990,,,
1069M02_04_21_03,375,8,7,1,476,610361,599553,236990,,,
1069M02_04_21_04,374,8,7,1,476,641257,630449,236990,,,
1069M02_04_21_05,373,8,7,1,476,672594,661786,236990,,,
1069M02_04_21_06,372,8,7,1,476,703171,692363,236990,,,
1069M02_04_21_07,371,8,7,1,476,733791,722983,236990,,,
1069M02_04_21_08,370,8,7,1,476,763875,753067,236990,,,
1069M02_04_21_09,369,8,7,1,476,794350,783542,236990,,,
1069M02_04_21_10,368,8,7,1,476,823686,812878,236990,,,
1069M02_04_21_11,367,8,7,1,476,854883,844075,236990,,,
1069M02_04_21_12,366,8,7,1,476,885342,874534,236990,,,
1069M02_04_21_13,365,8,7,1,476,916677,905869,236990,,,
1069M02_04_21_14,364,8,7,1,476,946830,936022,236990,,,
1069M02_04_21_15,363,8,7,1,476,976549,965741,236990,,,
1069M02_04_21_16,362,8,7,1,476,1007505,996697,236990,,,
1069M02_04_21_17,361,8,7,1,476,1037678,1026870,236990,,,
1069M02_04_31_01,360,8,7,1,476,1068295,1057487,236990,,,
1069M02_04_31_02,359,8,7,1,476,1099077,1088269,236990,,,
1069M02_04_31_03,358,8,7,1,476,1130160,1119352,236990,,,
1069M02_04_31_04,357,8,7,1,476,1161277,1150469,236990,,,
1069M02_04_31_05,356,8,7,1,476,1191348,1180540,236990,,,
1069M02_04_31_06,355,8,7,1,476,1221680,1210872,236990,,,
1069M02_04_31_07,354,8,7,1,476,1252132,1241324,236990,,,
1069M02_04_31_08,353,8,7,1,476,1282926,1272118,236990,,,
1069M02_04_31_09,352,8,7,1,476,1313396,1302588,236990,,,
1069M02_04_31_10,351,8,7,1,476,1343782,1332974,236990,,,
1069M02_04_31_11,350,8,7,1,476,1374510,1363702,236990,,,
1069M02_04_31_12,349,8,7,1,476,1405043,1394235,236990,,,
1069M02_04_31_13,348,8,7,1,476,1435645,1424837,236990,,,
1069M02_04_31_14,347,8,7,1,476,1466104,1455296,236990,,,
1069M02_04_31_15,346,8,7,1,476,1495652,1484844,236990,,,
1069M02_04_31_16,345,8,7,1,476,1526166,1515358,236990,,,
1069M02_04_31_17,344,8,7,1,476,1555975,1545167,236990,,,
1069M02_04_41_01,343,8,7,1,476,1584077,1573269,236990,,,
1069M02_04_41_02,342,8,7,1,476,1615544,1604736,236990,,,
1069M02_04_41_03,341,8,7,1,476,1646166,1635358,236990,,,
1069M02_04_41_04,340,8,7,1,476,1676712,1665904,236990,,,
1069M02_04_41_05,339,8,7,1,476,1708050,1697242,236990,,,
1069M02_04_41_06,338,8,7,1,476,1738657,1727849,236990,,,
1069M02_04_41_07,337,8,7,1,476,1768554,1757746,236990,,,
1069M02_04_41_08,336,8,7,1,476,1798958,1788150,236990,,,
1069M02_04_41_09,335,8,7,1,476,1828931,1818123,236990,,,
1069M02_04_41_10,334,8,7,1,476,1860545,1849737,236990,,,
1069M02_04_41_11,333,8,7,1,476,1889618,1878810,236990,,,
1069M02_04_41_12,332,8,7,1,476,1921047,1910239,236990,,,
1069M02_04_41_13,331,8,7,1,476,1951449,1940641,236990,,,
1069M02_04_41_14,330,8,7,1,476,1981646,1970838,236990,,,
1069M02_04_41_15,329,8,7,1,476,2012009,2001201,236990,,,
1069M02_04_41_16,328,8,7,1,476,2042585,2031777,236990,,,
1069M02_04_12_01,327,8,7,1,23170,30861,20053,236990,,,
1069M02_04_12_02,326,8,7,1,23170,61424,50616,236990,,,
1069M02_04_12_03,325,8,7,1,23170,92032,81224,236990,,,
1069M02_04_12_04,324,8,7,1,23170,122982,112174,236990,,,
1069M02_04_12_05,323,8,7,1,23170,152428,141620,236990,,,
1069M02_04_12_06,322,8,7,1,23170,183282,172474,236990,,,
1069M02_04_12_07,321,8,7,1,23170,214225,203417,236990,,,
1069M02_04_12_08,320,8,7,1,23170,244689,233881,236990,,,
1069M02_04_12_09,319,8,7,1,23170,274793,263985,236990,,,
1069M02_04_12_10,318,8,7,1,23170,305581,294773,236990,,,
1069M02_04_12_11,317,8,7,1,23170,336359,325551,236990,,,
1069M02_04_12_12,316,8,7,1,23170,367463,356655,236990,,,
1069M02_04_12_13,315,8,7,1,23170,397172,386364,236990,,,
1069M02_04_12_14,314,8,7,1,23170,427788,416980,236990,,,
1069M02_04_12_15,313,8,7,1,23170,457968,447160,236990,,,
1069M02_04_12_16,312,8,7,1,23170,489517,478709,236990,,,
1069M02_04_12_17,311,8,7,1,23170,519589,508781,236990,,,
1069M02_04_22_01,310,8,7,1,23170,549110,538302,236990,,,
1069M02_04_22_02,309,8,7,1,23170,579819,569011,236990,,,
1069M02_04_22_03,308,8,7,1,23170,610361,599553,236990,,,
1069M02_04_22_04,307,8,7,1,23170,641257,630449,236990,,,
1069M02_04_22_05,306,8,7,1,23170,672594,661786,236990,,,
1069M02_04_22_06,305,8,7,1,23170,703171,692363,236990,,,
1069M02_04_22_07,304,8,7,1,23170,733791,722983,236990,,,
1069M02_04_22_08,303,8,7,1,23170,763875,753067,236990,,,
1069M02_04_22_09,302,8,7,1,23170,794350,783542,236990,,,
1069M02_04_22_10,301,8,7,1,23170,823686,812878,236990,,,
1069M02_04_22_11,300,8,7,1,23170,854883,844075,236990,,,
1069M02_04_22_12,299,8,7,1,23170,885342,874534,236990,,,
1069M02_04_22_13,298,8,7,1,23170,916677,905869,236990,,,
1069M02_04_22_14,297,8,7,1,23170,946830,936022,236990,,,
1069M02_04_22_15,296,8,7,1,23170,976549,965741,236990,,,
1069M02_04_22_16,295,8,7,1,23170,1007505,996697,236990,,,
1069M02_04_22_17,294,8,7,1,23170,1037678,1026870,236990,,,
1069M02_04_32_01,293,8,7,1,23170,1068295,1057487,236990,,,
1069M02_04_32_02,292,8,7,1,23170,1099077,1088269,236990,,,
1069M02_04_32_03,291,8,7,1,23170,1130160,1119352,236990,,,
1069M02_04_32_04,290,8,7,1,23170,1161277,1150469,236990,,,
1069M02_04_32_05,289,8,7,1,23170,1191348,1180540,236990,,,
1069M02_04_32_06,288,8,7,1,23170,1221680,1210872,236990,,,
1069M02_04_32_07,287,8,7,1,23170,1252132,1241324,236990,,,
1069M02_04_32_08,286,8,7,1,23170,1282926,1272118,236990,,,
1069M02_04_32_09,285,8,7,1,23170,1313396,1302588,236990,,,
1069M02_04_32_10,284,8,7,1,23170,1343782,1332974,236990,,,
1069M02_04_32_11,283,8,7,1,23170,1374510,1363702,236990,,,
1069M02_04_32_12,282,8,7,1,23170,1405043,1394235,236990,,,
1069M02_04_32_13,281,8,7,1,23170,1435645,1424837,236990,,,
1069M02_04_32_14,280,8,7,1,23170,1466104,1455296,236990,,,
1069M02_04_32_15,279,8,7,1,23170,1495652,1484844,236990,,,
1069M02_04_32_16,278,8,7,1,23170,1526166,1515358,236990,,,
1069M02_04_32_17,277,8,7,1,23170,1555975,1545167,236990,,,
1069M02_04_42_01,276,8,7,1,23170,1584077,1573269,236990,,,
1069M02_04_42_02,275,8,7,1,23170,1615544,1604736,236990,,,
1069M02_04_42_03,274,8,7,1,23170,1646166,1635358,236990,,,
1069M02_04_42_04,273,8,7,1,23170,1676712,1665904,236990,,,
1069M02_04_42_05,272,8,7,1,23170,1708050,1697242,236990,,,
1069M02_04_42_06,271,8,7,1,23170,1738657,1727849,236990,,,
1069M02_04_42_07,270,8,7,1,23170,1768554,1757746,236990,,,
1069M02_04_42_08,269,8,7,1,23170,1798958,1788150,236990,,,
1069M02_04_42_09,268,8,7,1,23170,1828931,1818123,236990,,,
1069M02_04_42_10,267,8,7,1,23170,1860545,1849737,236990,,,
1069M02_04_42_11,266,8,7,1,23170,1889618,1878810,236990,,,
1069M02_04_42_12,265,8,7,1,23170,1921047,1910239,236990,,,
1069M02_04_42_13,264,8,7,1,23170,1951449,1940641,236990,,,
1069M02_04_42_14,263,8,7,1,23170,1981646,1970838,236990,,,
1069M02_04_42_15,262,8,7,1,23170,2012009,2001201,236990,,,
1069M02_04_42_16,261,8,7,1,23170,2042585,2031777,236990,,,
1069M02_05_11_01,260,8,7,1,47435,30363,19555,236990,,,
1069M02_05_11_02,259,8,7,1,47435,60590,49782,236990,,,
1069M02_05_11_03,258,8,7,1,47435,91232,80424,236990,,,
1069M02_05_11_04,257,8,7,1,47435,121519,110711,236990,,,
1069M02_05_11_05,256,8,7,1,47435,152310,141502,236990,,,
1069M02_05_11_06,255,8,7,1,47435,182856,172048,236990,,,
1069M02_05_11_07,254,8,7,1,47435,213418,202610,236990,,,
1069M02_05_11_08,253,8,7,1,47435,244278,233470,236990,,,
1069M02_05_11_09,252,8,7,1,47435,274596,263788,236990,,,
1069M02_05_11_10,251,8,7,1,47435,304781,293973,236990,,,
1069M02_05_11_11,250,8,7,1,47435,336947,326139,236990,,,
1069M02_05_11_12,249,8,7,1,47435,365868,355060,236990,,,
1069M02_05_11_13,248,8,7,1,47435,396538,385730,236990,,,
1069M02_05_11_14,247,8,7,1,47435,428075,417267,236990,,,
1069M02_05_11_15,246,8,7,1,47435,457282,446474,236990,,,
1069M02_05_11_16,245,8,7,1,47435,487600,476792,236990,,,
1069M02_05_11_17,244,8,7,1,47435,518333,507525,236990,,,
1069M02_05_21_01,243,8,7,1,47435,549232,538424,236990,,,
1069M02_05_21_02,242,8,7,1,47435,580397,569589,236990,,,
1069M02_05_21_03,241,8,7,1,47435,611072,600264,236990,,,
1069M02_05_21_04,240,8,7,1,47435,641218,630410,236990,,,
1069M02_05_21_05,239,8,7,1,47435,672227,661419,236990,,,
1069M02_05_21_06,238,8,7,1,47435,702318,691510,236990,,,
1069M02_05_21_07,237,8,7,1,47435,732958,722150,236990,,,
1069M02_05_21_08,236,8,7,1,47435,764125,753317,236990,,,
1069M02_05_21_09,235,8,7,1,47435,794297,783489,236990,,,
1069M02_05_21_10,234,8,7,1,47435,824476,813668,236990,,,
1069M02_05_21_11,233,8,7,1,47435,855348,844540,236990,,,
1069M02_05_21_12,232,8,7,1,47435,885915,875107,236990,,,
1069M02_05_21_13,231,8,7,1,47435,916241,905433,236990,,,
1069M02_05_21_14,230,8,7,1,47435,946738,935930,236990,,,
1069M02_05_21_15,229,8,7,1,47435,977301,966493,236990,,,
1069M02_05_21_16,228,8,7,1,47435,1007768,996960,236990,,,
1069M02_05_21_17,227,8,7,1,47435,1037834,1027026,236990,,,
1069M02_05_31_01,226,8,7,1,47435,1068770,1057962,236990,,,
1069M02_05_31_02,225,8,7,1,47435,1099079,1088271,236990,,,
1069M02_05_31_03,224,8,7,1,47435,1128576,1117768,236990,,,
1069M02_05_31_04,223,8,7,1,47435,1159745,1148937,236990,,,
1069M02_05_31_05,222,8,7,1,47435,1189841,1179033,236990,,,
1069M02_05_31_06,221,8,7,1,47435,1220631,1209823,236990,,,
1069M02_05_31_07,220,8,7,1,47435,1250946,1240138,236990,,,
1069M02_05_31_08,219,8,7,1,47435,1281453,1270645,236990,,,
1069M02_05_31_09,218,8,7,1,47435,1312020,1301212,236990,,,
1069M02_05_31_10,217,8,7,1,47435,1342335,1331527,236990,,,
1069M02_05_31_11,216,8,7,1,47435,1372912,1362104,236990,,,
1069M02_05_31_12,215,8,7,1,47435,1403328,1392520,236990,,,
1069M02_05_31_13,214,8,7,1,47435,1434212,1423404,236990,,,
1069M02_05_31_14,213,8,7,1,47435,1464707,1453899,236990,,,
1069M02_05_31_15,212,8,7,1,47435,1495284,1484476,236990,,,
1069M02_05_31_16,211,8,7,1,47435,1525520,1514712,236990,,,
1069M02_05_31_17,210,8,7,1,47435,1555608,1544800,236990,,,
1069M02_05_41_01,209,8,7,1,47435,1585861,1575053,236990,,,
1069M02_05_41_02,208,8,7,1,47435,1616319,1605511,236990,,,
1069M02_05_41_03,207,8,7,1,47435,1646726,1635918,236990,,,
1069M02_05_41_04,206,8,7,1,47435,1677656,1666848,236990,,,
1069M02_05_41_05,205,8,7,1,47435,1708528,1697720,236990,,,
1069M02_05_41_06,204,8,7,1,47435,1738254,1727446,236990,,,
1069M02_05_41_07,203,8,7,1,47435,1769677,1758869,236990,,,
1069M02_05_41_08,202,8,7,1,47435,1800378,1789570,236990,,,
1069M02_05_41_09,201,8,7,1,47435,1829723,1818915,236990,,,
1069M02_05_41_10,200,8,7,1,47435,1860650,1849842,236990,,,
1069M02_05_41_11,199,8,7,1,47435,1890643,1879835,236990,,,
1069M02_05_41_12,198,8,7,1,47435,1921160,1910352,236990,,,
1069M02_05_41_13,197,8,7,1,47435,1952873,1942065,236990,,,
1069M02_05_41_14,196,8,7,1,47435,1983022,1972214,236990,,,
1069M02_05_41_15,195,8,7,1,47435,2013571,2002763,236990,,,
1069M02_05_41_16,194,8,7,1,47435,2043854,2033046,236990,,,
1069M02_05_12_01,193,8,7,1,70150,30363,19555,236990,,,
1069M02_05_12_02,192,8,7,1,70150,60590,49782,236990,,,
1069M02_05_12_03,191,8,7,1,70150,91232,80424,236990,,,
1069M02_05_12_04,190,8,7,1,70150,121519,110711,236990,,,
1069M02_05_12_05,189,8,7,1,70150,152310,141502,236990,,,
1069M02_05_12_06,188,8,7,1,70150,182856,172048,236990,,,
1069M02_05_12_07,187,8,7,1,70150,213418,202610,236990,,,
1069M02_05_12_08,186,8,7,1,70150,244278,233470,236990,,,
1069M02_05_12_09,185,8,7,1,70150,274596,263788,236990,,,
1069M02_05_12_10,184,8,7,1,70150,304781,293973,236990,,,
1069M02_05_12_11,183,8,7,1,70150,336947,326139,236990,,,
1069M02_05_12_12,182,8,7,1,70150,365868,355060,236990,,,
1069M02_05_12_13,181,8,7,1,70150,396538,385730,236990,,,
1069M02_05_12_14,180,8,7,1,70150,428075,417267,236990,,,
1069M02_05_12_15,179,8,7,1,70150,457282,446474,236990,,,
1069M02_05_12_16,178,8,7,1,70150,487600,476792,236990,,,
1069M02_05_12_17,177,8,7,1,70150,518333,507525,236990,,,
1069M02_05_22_01,176,8,7,1,70150,549232,538424,236990,,,
1069M02_05_22_02,175,8,7,1,70150,580397,569589,236990,,,
1069M02_05_22_03,174,8,7,1,70150,611072,600264,236990,,,
1069M02_05_22_04,173,8,7,1,70150,641218,630410,236990,,,
1069M02_05_22_05,172,8,7,1,70150,672227,661419,236990,,,
1069M02_05_22_06,171,8,7,1,70150,702318,691510,236990,,,
1069M02_05_22_07,170,8,7,1,70150,732958,722150,236990,,,
1069M02_05_22_08,169,8,7,1,70150,764125,753317,236990,,,
1069M02_05_22_09,168,8,7,1,70150,794297,783489,236990,,,
1069M02_05_22_10,167,8,7,1,70150,824476,813668,236990,,,
1069M02_05_22_11,166,8,7,1,70150,855348,844540,236990,,,
1069M02_05_22_12,165,8,7,1,70150,885915,875107,236990,,,
1069M02_05_22_13,164,8,7,1,70150,916241,905433,236990,,,
1069M02_05_22_14,163,8,7,1,70150,946738,935930,236990,,,
1069M02_05_22_15,162,8,7,1,70150,977301,966493,236990,,,
1069M02_05_22_16,161,8,7,1,70150,1007768,996960,236990,,,
1069M02_05_22_17,160,8,7,1,70150,1037834,1027026,236990,,,
1069M02_05_32_01,159,8,7,1,70150,1068770,1057962,236990,,,
1069M02_05_32_02,158,8,7,1,70150,1099079,1088271,236990,,,
1069M02_05_32_03,157,8,7,1,70150,1128576,1117768,236990,,,
1069M02_05_32_04,156,8,7,1,70150,1159745,1148937,236990,,,
1069M02_05_32_05,155,8,7,1,70150,1189841,1179033,236990,,,
1069M02_05_32_06,154,8,7,1,70150,1220631,1209823,236990,,,
1069M02_05_32_07,153,8,7,1,70150,1250946,1240138,236990,,,
1069M02_05_32_08,152,8,7,1,70150,1281453,1270645,236990,,,
1069M02_05_32_09,151,8,7,1,70150,1312020,1301212,236990,,,
1069M02_05_32_10,150,8,7,1,70150,1342335,1331527,236990,,,
1069M02_05_32_11,149,8,7,1,70150,1372912,1362104,236990,,,
1069M02_05_32_12,148,8,7,1,70150,1403328,1392520,236990,,,
1069M02_05_32_13,147,8,7,1,70150,1434212,1423404,236990,,,
1069M02_05_32_14,146,8,7,1,70150,1464707,1453899,236990,,,
1069M02_05_32_15,145,8,7,1,70150,1495284,1484476,236990,,,
1069M02_05_32_16,144,8,7,1,70150,1525520,1514712,236990,,,
1069M02_05_32_17,143,8,7,1,70150,1555608,1544800,236990,,,
1069M02_05_42_01,142,8,7,1,70150,1585861,1575053,236990,,,
1069M02_05_42_02,141,8,7,1,70150,1616319,1605511,236990,,,
1069M02_05_42_03,140,8,7,1,70150,1646726,1635918,236990,,,
1069M02_05_42_04,139,8,7,1,70150,1677656,1666848,236990,,,
1069M02_05_42_05,138,8,7,1,70150,1708528,1697720,236990,,,
1069M02_05_42_06,137,8,7,1,70150,1738254,1727446,236990,,,
1069M02_05_42_07,136,8,7,1,70150,1769677,1758869,236990,,,
1069M02_05_42_08,135,8,7,1,70150,1800378,1789570,236990,,,
1069M02_05_42_09,134,8,7,1,70150,1829723,1818915,236990,,,
1069M02_05_42_10,133,8,7,1,70150,1860650,1849842,236990,,,
1069M02_05_42_11,132,8,7,1,70150,1890643,1879835,236990,,,
1069M02_05_42_12,131,8,7,1,70150,1921160,1910352,236990,,,
1069M02_05_42_13,130,8,7,1,70150,1952873,1942065,236990,,,
1069M02_05_42_14,129,8,7,1,70150,1983022,1972214,236990,,,
1069M02_05_42_15,128,8,7,1,70150,2013571,2002763,236990,,,
1069M02_05_42_16,127,8,7,1,70150,2043854,2033046,236990,,,
1069M02_06_11_01,126,8,7,1,94430,153574,142766,236990,,,
1069M02_06_11_02,125,8,7,1,94430,182339,171531,236990,,,
1069M02_06_11_03,124,8,7,1,94430,212171,201363,236990,,,
1069M02_06_11_04,123,8,7,1,94430,242932,232124,236990,,,
1069M02_06_11_05,122,8,7,1,94430,274799,263991,236990,,,
1069M02_06_11_06,121,8,7,1,94430,303702,292894,236990,,,
1069M02_06_11_07,120,8,7,1,94430,334433,323625,236990,,,
1069M02_06_11_08,119,8,7,1,94430,365834,355026,236990,,,
1069M02_06_11_09,118,8,7,1,94430,395850,385042,236990,,,
1069M02_06_11_10,117,8,7,1,94430,427034,416226,236990,,,
1069M02_06_11_11,116,8,7,1,94430,456828,446020,236990,,,
1069M02_06_11_12,115,8,7,1,94430,488288,477480,236990,,,
1069M02_06_11_13,114,8,7,1,94430,517998,507190,236990,,,
1069M02_06_11_14,113,8,7,1,94430,547774,536966,236990,,,
1069M02_06_11_15,112,8,7,1,94430,579381,568573,236990,,,
1069M02_06_11_16,111,8,7,1,94430,609167,598359,236990,,,
1069M02_06_11_17,110,8,7,1,94430,639815,629007,236990,,,
1069M02_06_21_01,109,8,7,1,94430,672192,661384,236990,,,
1069M02_06_21_02,108,8,7,1,94430,701755,690947,236990,,,
1069M02_06_21_03,107,8,7,1,94430,732351,721543,236990,,,
1069M02_06_21_04,106,8,7,1,94430,763819,753011,236990,,,
1069M02_06_21_05,105,8,7,1,94430,794682,783874,236990,,,
1069M02_06_21_06,104,8,7,1,94430,824993,814185,236990,,,
1069M02_06_21_07,103,8,7,1,94430,855250,844442,236990,,,
1069M02_06_21_08,102,8,7,1,94430,885724,874916,236990,,,
1069M02_06_21_09,101,8,7,1,94430,915877,905069,236990,,,
1069M02_06_21_10,100,8,7,1,94430,946782,935974,236990,,,
1069M02_06_21_11,99,8,7,1,94430,976732,965924,236990,,,
1069M02_06_21_12,98,8,7,1,94430,1008281,997473,236990,,,
1069M02_06_21_13,97,8,7,1,94430,1037913,1027105,236990,,,
1069M02_06_21_14,96,8,7,1,94430,1068275,1057467,236990,,,
1069M02_06_21_15,95,8,7,1,94430,1099186,1088378,236990,,,
1069M02_06_21_16,94,8,7,1,94430,1129492,1118684,236990,,,
1069M02_06_21_17,93,8,7,1,94430,1160392,1149584,236990,,,
1069M02_06_31_01,92,8,7,1,94430,1188511,1177703,236990,,,
1069M02_06_31_02,91,8,7,1,94430,1219234,1208426,236990,,,
1069M02_06_31_03,90,8,7,1,94430,1249884,1239076,236990,,,
1069M02_06_31_04,89,8,7,1,94430,1280185,1269377,236990,,,
1069M02_06_31_05,88,8,7,1,94430,1312057,1301249,236990,,,
1069M02_06_31_06,87,8,7,1,94430,1341141,1330333,236990,,,
1069M02_06_31_07,86,8,7,1,94430,1372418,1361610,236990,,,
1069M02_06_31_08,85,8,7,1,94430,1402659,1391851,236990,,,
1069M02_06_31_09,84,8,7,1,94430,1432996,1422188,236990,,,
1069M02_06_31_10,83,8,7,1,94430,1463495,1452687,236990,,,
1069M02_06_31_11,82,8,7,1,94430,1494056,1483248,236990,,,
1069M02_06_31_12,81,8,7,1,94430,1524750,1513942,236990,,,
1069M02_06_31_13,80,8,7,1,94430,1554932,1544124,236990,,,
1069M02_06_31_14,79,8,7,1,94430,1585436,1574628,236990,,,
1069M02_06_31_15,78,8,7,1,94430,1616038,1605230,236990,,,
1069M02_06_31_16,77,8,7,1,94430,1645742,1634934,236990,,,
1069M02_06_31_17,76,8,7,1,94430,1676404,1665596,236990,,,
1069M02_06_41_01,75,8,7,1,94430,1708696,1697888,236990,,,
1069M02_06_41_02,74,8,7,1,94430,1739298,1728490,236990,,,
1069M02_06_41_03,73,8,7,1,94430,1769087,1758279,236990,,,
1069M02_06_41_04,72,8,7,1,94430,1800426,1789618,236990,,,
1069M02_06_41_05,71,8,7,1,94430,1830977,1820169,236990,,,
1069M02_06_41_06,70,8,7,1,94430,1860820,1850012,236990,,,
1069M02_06_41_07,69,8,7,1,94430,1891849,1881041,236990,,,
1069M02_06_41_08,68,8,7,1,94430,1922263,1911455,236990,,,
1069M02_06_41_09,67,8,7,1,94430,1952640,1941832,236990,,,
1069M02_06_41_10,66,8,7,1,94430,1983293,1972485,236990,,,
1069M02_06_41_11,65,8,7,1,94430,2013163,2002355,236990,,,
1069M02_06_41_12,64,8,7,1,94430,2043781,2032973,236990,,,
1069M02_06_12_01,63,8,7,1,117107,153574,142766,236990,,,
1069M02_06_12_02,62,8,7,1,117107,182339,171531,236990,,,
1069M02_06_12_03,61,8,7,1,117107,212171,201363,236990,,,
1069M02_06_12_04,60,8,7,1,117107,242932,232124,236990,,,
1069M02_06_12_05,59,8,7,1,117107,274799,263991,236990,,,
1069M02_06_12_06,58,8,7,1,117107,303702,292894,236990,,,
1069M02_06_12_07,57,8,7,1,117107,334433,323625,236990,,,
1069M02_06_12_08,56,8,7,1,117107,365834,355026,236990,,,
1069M02_06_12_09,55,8,7,1,117107,395850,385042,236990,,,
1069M02_06_12_10,54,8,7,1,117107,427034,416226,236990,,,
1069M02_06_12_11,53,8,7,1,117107,456828,446020,236990,,,
1069M02_06_12_12,52,8,7,1,117107,488288,477480,236990,,,
1069M02_06_12_13,51,8,7,1,117107,517998,507190,236990,,,
1069M02_06_12_14,50,8,7,1,117107,547774,536966,236990,,,
1069M02_06_12_15,49,8,7,1,117107,579381,568573,236990,,,
1069M02_06_12_16,48,8,7,1,117107,609167,598359,236990,,,
1069M02_06_12_17,47,8,7,1,117107,639815,629007,236990,,,
1069M02_06_22_01,46,8,7,1,117107,672192,661384,236990,,,
1069M02_06_22_02,45,8,7,1,117107,701755,690947,236990,,,
1069M02_06_22_03,44,8,7,1,117107,732351,721543,236990,,,
1069M02_06_22_04,43,8,7,1,117107,763819,753011,236990,,,
1069M02_06_22_05,42,8,7,1,117107,794682,783874,236990,,,
1069M02_06_22_06,41,8,7,1,117107,824993,814185,236990,,,
1069M02_06_22_07,40,8,7,1,117107,855250,844442,236990,,,
1069M02_06_22_08,39,8,7,1,117107,885724,874916,236990,,,
1069M02_06_22_09,38,8,7,1,117107,915877,905069,236990,,,
1069M02_06_22_10,37,8,7,1,117107,946782,935974,236990,,,
1069M02_06_22_11,36,8,7,1,117107,976732,965924,236990,,,
1069M02_06_22_12,35,8,7,1,117107,1008281,997473,236990,,,
1069M02_06_22_13,34,8,7,1,117107,1037913,1027105,236990,,,
1069M02_06_22_14,33,8,7,1,117107,1068275,1057467,236990,,,
1069M02_06_22_15,32,8,7,1,117107,1099186,1088378,236990,,,
1069M02_06_22_16,31,8,7,1,117107,1129492,1118684,236990,,,
1069M02_06_22_17,30,8,7,1,117107,1160392,1149584,236990,,,
1069M02_06_32_01,29,8,7,1,117107,1188511,1177703,236990,,,
1069M02_06_32_02,28,8,7,1,117107,1219234,1208426,236990,,,
1069M02_06_32_03,27,8,7,1,117107,1249884,1239076,236990,,,
1069M02_06_32_04,26,8,7,1,117107,1280185,1269377,236990,,,
1069M02_06_32_05,25,8,7,1,117107,1312057,1301249,236990,,,
1069M02_06_32_06,24,8,7,1,117107,1341141,1330333,236990,,,
1069M02_06_32_07,23,8,7,1,117107,1372418,1361610,236990,,,
1069M02_06_32_08,22,8,7,1,117107,1402659,1391851,236990,,,
1069M02_06_32_09,21,8,7,1,117107,1432996,1422188,236990,,,
1069M02_06_32_10,20,8,7,1,117107,1463495,1452687,236990,,,
1069M02_06_32_11,19,8,7,1,117107,1494056,1483248,236990,,,
1069M02_06_32_12,18,8,7,1,117107,1524750,1513942,236990,,,
1069M02_06_32_13,17,8,7,1,117107,1554932,1544124,236990,,,
1069M02_06_32_14,16,8,7,1,117107,1585436,1574628,236990,,,
1069M02_06_32_15,15,8,7,1,117107,1616038,1605230,236990,,,
1069M02_06_32_16,14,8,7,1,117107,1645742,1634934,236990,,,
1069M02_06_32_17,13,8,7,1,117107,1676404,1665596,236990,,,
1069M02_06_42_01,12,8,7,1,117107,1708696,1697888,236990,,,
1069M02_06_42_02,11,8,7,1,117107,1739298,1728490,236990,,,
1069M02_06_42_03,10,8,7,1,117107,1769087,1758279,236990,,,
1069M02_06_42_04,9,8,7,1,117107,1800426,1789618,236990,,,
1069M02_06_42_05,8,8,7,1,117107,1830977,1820169,236990,,,
1069M02_06_42_06,7,8,7,1,117107,1860820,1850012,236990,,,
1069M02_06_42_07,6,8,7,1,117107,1891849,1881041,236990,,,
1069M02_06_42_08,5,8,7,1,117107,1922263,1911455,236990,,,
1069M02_06_42_09,4,8,7,1,117107,1952640,1941832,236990,,,
1069M02_06_42_10,3,8,7,1,117107,1983293,1972485,236990,,,
1069M02_06_42_11,2,8,7,1,117107,2013163,2002355,236990,,,
1069M02_06_42_12,1,8,7,1,117107,2043781,2032973,236990,,,
DeviceLibrary/theMachine/BoxTransport.cs
...@@ -15,6 +15,7 @@ namespace DeviceLibrary ...@@ -15,6 +15,7 @@ namespace DeviceLibrary
Robot_Config Config; Robot_Config Config;
BoxStorePosition From; BoxStorePosition From;
BoxStorePosition To; BoxStorePosition To;
BoxStorePosition Fix;
MainMachine mainMachine; MainMachine mainMachine;
//using static mainMachine; //using static mainMachine;
AxisBean Middle_Axis; AxisBean Middle_Axis;
...@@ -76,10 +77,15 @@ namespace DeviceLibrary ...@@ -76,10 +77,15 @@ namespace DeviceLibrary
plateH = from.Reel.PlateH; plateH = from.Reel.PlateH;
From = from.clone(); From = from.clone();
To = to.clone(); To = to.clone();
MoveInfo.NewMove(MoveStep.StoreTS01); MoveInfo.NewMove(MoveStep.StoreTS01);
MoveInfo.log($"{storeMoveType}:开始运输料盘,从:{from.posid},到:{to.posid}"); MoveInfo.log($"{storeMoveType}:开始运输料盘,从:{from.posid},到:{to.posid}");
MoveInfo.MoveParam.PosID = $"{From.posid}=>{To.posid}"; MoveInfo.MoveParam.PosID = $"{From.posid}=>{To.posid}";
} }
if (To.posid == BoxStorePosition.strings)
{
Fix = BoxStorePosition.GetFixPos(Config, To.Reel);
}
MoveInfo.MoveParam.WareCode = WareCode; MoveInfo.MoveParam.WareCode = WareCode;
ErrMsgTxt = ""; ErrMsgTxt = "";
...@@ -170,11 +176,46 @@ namespace DeviceLibrary ...@@ -170,11 +176,46 @@ namespace DeviceLibrary
else else
{ {
IgnoreX09 = false; IgnoreX09 = false;
MoveInfo.NextMoveStep(MoveStep.StoreTS10); if (To.posid== BoxStorePosition.strings && ConfigHelper.Config.Get("Device_Use_Fixpos",false) && Fix!=null)
MoveInfo.NextMoveStep(MoveStep.StoreFIX01);
else
MoveInfo.NextMoveStep(MoveStep.StoreTS10);
MoveInfo.log($"{storeMoveType}:X30取到料"); MoveInfo.log($"{storeMoveType}:X30取到料");
InOutEndProcess(StoreMoveType.OutStore, From.posid); InOutEndProcess(StoreMoveType.OutStore, From.posid);
} }
break; break;
case MoveStep.StoreFIX01:
MoveInfo.NextMoveStep(MoveStep.StoreFIX02);
Middle_Axis.AbsMove(MoveInfo, Fix.Middle_P2, Config.Middle_P2_speed);
MoveInfo.log($"{storeMoveType}:行走机构到达目的地:{Fix.Middle_P2}");
UpDown_Axis.AbsMove(MoveInfo, Fix.UpDown_PH, Config.UpDown_P1_speed);
MoveInfo.log($"{storeMoveType}:上下轴到达目的地高点:{Fix.UpDown_PH}");
break;
case MoveStep.StoreFIX02:
MoveInfo.NextMoveStep(MoveStep.StoreFIX03);
MoveInfo.log($"{storeMoveType}:进出轴到达目的地");
InOut_Axis.AbsMove(MoveInfo, Fix.InOut_P2, Config.InOut_P2_speed);
break;
case MoveStep.StoreFIX03:
RobotManage.CameraA.CameraGrabOne(RobotManage.CameraA.GetFixtureStateFilename(To.posid, WareCode, storeMoveType, FixtureState.ToFix));
MoveInfo.NextMoveStep(MoveStep.StoreFIX04);
Comp_Axis.AbsMove(MoveInfo, Fix.Comp_PH, Config.Comp_P2_speed);
UpDown_Axis.AbsMove(MoveInfo, Fix.UpDown_PL, Config.UpDown_P3_speed);
MoveInfo.log($"{storeMoveType}:压紧轴高点:{Fix.Comp_PH}");
MoveInfo.log($"{storeMoveType}:上下轴到达目的地低点:{Fix.UpDown_PL}");
break;
case MoveStep.StoreFIX04:
MoveInfo.NextMoveStep(MoveStep.StoreFIX05);
Comp_Axis.AbsMove(MoveInfo, Fix.Comp_PL, Config.Comp_P2_speed);
UpDown_Axis.AbsMove(MoveInfo, Fix.UpDown_PH, Config.UpDown_P3_speed);
MoveInfo.log($"{storeMoveType}:压紧轴压紧点:{Fix.Comp_PL}");
MoveInfo.log($"{storeMoveType}:上下轴到达目的高点:{Fix.UpDown_PH}");
break;
case MoveStep.StoreFIX05:
MoveInfo.NextMoveStep(MoveStep.StoreTS10);
InOut_Axis.AbsMove(MoveInfo, Config.InOut_P1, Config.InOut_P1_speed);
MoveInfo.log($"{storeMoveType}:进出轴到达待机点");
break;
case MoveStep.StoreTS10: case MoveStep.StoreTS10:
MoveInfo.NextMoveStep(MoveStep.StoreTS11); MoveInfo.NextMoveStep(MoveStep.StoreTS11);
Middle_Axis.AbsMove(MoveInfo, To.Middle_P2, Config.Middle_P2_speed); Middle_Axis.AbsMove(MoveInfo, To.Middle_P2, Config.Middle_P2_speed);
......
DeviceLibrary/theMachine/LabelParam.cs
...@@ -169,7 +169,8 @@ namespace DeviceLibrary ...@@ -169,7 +169,8 @@ namespace DeviceLibrary
UpDown_PL = Config.UpDown_P3; UpDown_PL = Config.UpDown_P3;
posid = ngdoor; posid = ngdoor;
} }
else { else if (storeSide == StoreSide.String)
{
Middle_P2 = Config.Middle_P1; Middle_P2 = Config.Middle_P1;
InOut_P2 = Config.InOut_P3; InOut_P2 = Config.InOut_P3;
UpDown_PH = Config.UpDown_P4; UpDown_PH = Config.UpDown_P4;
...@@ -183,6 +184,16 @@ namespace DeviceLibrary ...@@ -183,6 +184,16 @@ namespace DeviceLibrary
Reel = reel.clone(); Reel = reel.clone();
LogUtil.info($"BSP:{posid},Comp_PL:{Comp_PL}={reel.PlateH},Comp_PL_MM:{Config.Comp_PL_MM},{JsonHelper.SerializeObject(this)}"); LogUtil.info($"BSP:{posid},Comp_PL:{Comp_PL}={reel.PlateH},Comp_PL_MM:{Config.Comp_PL_MM},{JsonHelper.SerializeObject(this)}");
} }
public static BoxStorePosition GetFixPos(Robot_Config Config, ReelParam reel) {
var fixpos = "fix#" + reel.PlateW.ToString();
var ac = CSVPositionReader<ACStorePosition>.GetPositon(fixpos);
if (ac == null)
return null;
var p = new BoxStorePosition(Config, ac, reel);
return p;
}
public BoxStorePosition clone() public BoxStorePosition clone()
{ {
BoxStorePosition dstobject; BoxStorePosition dstobject;
...@@ -200,6 +211,7 @@ namespace DeviceLibrary ...@@ -200,6 +211,7 @@ namespace DeviceLibrary
public enum StoreSide public enum StoreSide
{ {
NGDoor, NGDoor,
String String,
Fix
} }
} }
DeviceLibrary/theMachine/MainMachine.cs
...@@ -285,9 +285,20 @@ namespace DeviceLibrary ...@@ -285,9 +285,20 @@ namespace DeviceLibrary
switch (ResetMoveInfo.MoveStep) switch (ResetMoveInfo.MoveStep)
{ {
case MoveStep.H01_HomeReset: case MoveStep.H01_HomeReset:
ResetMoveInfo.NextMoveStep(MoveStep.H02_HomeReset_01);
ServerCM.storeStatus = StoreStatus.ResetMove;
if (IOValue(IO_Type.StringBack_Check) == IOValue(IO_Type.StringFront_Check)
|| IOValue(IO_Type.StringFront_Check).Equals(IO_VALUE.HIGH)) {
Msg.add(crc.GetString(L.string_not_onposition, "回原时X09,X10信号异常,料串可能不在正确位置,请检查."), MsgLevel.alarm);//0429
RobotManage.UserPause("回原时X09,X10信号异常,料串可能不在正确位置,请检查");
return;
}
if (!ConfigHelper.Config.Get("Device_Disable_StringDoor", false))
CylinderMove(StringMoveInfo, IO_Type.StringDoor_Close, IO_Type.StringDoor_Open, IO_VALUE.LOW);
break;
case MoveStep.H02_HomeReset_01:
ResetMoveInfo.NextMoveStep(MoveStep.H02_HomeReset); ResetMoveInfo.NextMoveStep(MoveStep.H02_HomeReset);
ResetMoveInfo.log("进出轴,批量轴回原,料串检测杆退回避让端"); ResetMoveInfo.log("进出轴,批量轴回原,料串检测杆退回避让端");
ServerCM.storeStatus = StoreStatus.ResetMove;
InOut_Axis.HomeMove(ResetMoveInfo, forceHome); InOut_Axis.HomeMove(ResetMoveInfo, forceHome);
Batch_Axis.HomeMove(ResetMoveInfo, forceHome); Batch_Axis.HomeMove(ResetMoveInfo, forceHome);
CylinderMove(ResetMoveInfo, IO_Type.StringPosChecker_Home, IO_Type.StringPosChecker_Work, IO_VALUE.LOW); CylinderMove(ResetMoveInfo, IO_Type.StringPosChecker_Home, IO_Type.StringPosChecker_Work, IO_VALUE.LOW);
...@@ -310,8 +321,7 @@ namespace DeviceLibrary ...@@ -310,8 +321,7 @@ namespace DeviceLibrary
break; break;
case MoveStep.H04_HomeReset: case MoveStep.H04_HomeReset:
ResetMoveInfo.NextMoveStep(MoveStep.H05_HomeReset); ResetMoveInfo.NextMoveStep(MoveStep.H05_HomeReset);
if (!ConfigHelper.Config.Get("Device_Disable_StringDoor",false)) ResetMoveInfo.log("夹爪轴,P1待机点");
CylinderMove(StringMoveInfo, IO_Type.StringDoor_Close, IO_Type.StringDoor_Open, IO_VALUE.LOW);
Clamp_Axis.AbsMove(ResetMoveInfo, Config.Clamp_P1, Config.Clamp_P1_speed); Clamp_Axis.AbsMove(ResetMoveInfo, Config.Clamp_P1, Config.Clamp_P1_speed);
ResetMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); ResetMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
break; break;
......
DeviceLibrary/theMachine/MainMachine_Clamp.cs
...@@ -32,10 +32,13 @@ namespace DeviceLibrary ...@@ -32,10 +32,13 @@ namespace DeviceLibrary
{ {
ClampMoveInfo.NextMoveStep(MoveStep.ReelTaked); ClampMoveInfo.NextMoveStep(MoveStep.ReelTaked);
} }
void NGPuted(string msg) public void NGPuted(string msg)
{ {
ClampMoveInfo.NextMoveStep(MoveStep.NGOUT_01); ClampMoveInfo.NextMoveStep(MoveStep.NGOUT_01);
ClampMoveInfo.MoveParam.NgMsg = msg; if (!string.IsNullOrEmpty(msg))
{
ClampMoveInfo.MoveParam.NgMsg = msg;
}
ClampMoveInfo.MoveParam.IsNg = true; ClampMoveInfo.MoveParam.IsNg = true;
} }
/// <summary> /// <summary>
...@@ -238,10 +241,10 @@ namespace DeviceLibrary ...@@ -238,10 +241,10 @@ namespace DeviceLibrary
} }
break; break;
case MoveStep.NGOUT_03: case MoveStep.NGOUT_03:
Msg.add(ClampMoveInfo.MoveParam.NgMsg, MsgLevel.warning);
if (IOValue(IO_Type.NGDoor_Tray_Check).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.NGDoor_Tray_Check).Equals(IO_VALUE.HIGH))
{ {
Msg.add(crc.GetString(L.please_take_ngdoor_reel, "等待取走单口料盘"), MsgLevel.alarm); Msg.add(crc.GetString(L.please_take_ngdoor_reel, "等待取走单口料盘"), MsgLevel.alarm);
Msg.add(ClampMoveInfo.MoveParam.NgMsg, MsgLevel.warning);
RobotManage.UserPause("等待取走单口料盘"); RobotManage.UserPause("等待取走单口料盘");
} }
else else
......
DeviceLibrary/theMachine/MainMachine_Store.cs
...@@ -117,9 +117,13 @@ namespace DeviceLibrary ...@@ -117,9 +117,13 @@ namespace DeviceLibrary
break; break;
case MoveStep.StoreOut10: case MoveStep.StoreOut10:
StoreMoveInfo.NextMoveStep(MoveStep.StoreOut11); StoreMoveInfo.NextMoveStep(MoveStep.StoreOut11);
var outac = CSVPositionReader<ACStorePosition>.GetPositon(StoreMoveInfo.MoveParam.PosID); var outFrom = CSVPositionReader<ACStorePosition>.GetPositon(StoreMoveInfo.MoveParam.PosID);
var outTo = new BoxStorePosition(Config, StoreMoveInfo.MoveParam.IsNg ? StoreSide.NGDoor: StoreSide.String, StoreMoveInfo.MoveParam); BoxStorePosition outTo;
boxTransport.Start(outac==null?null:new BoxStorePosition(Config, outac, StoreMoveInfo.MoveParam), outTo, StoreMoveType.OutStore); if (StoreMoveInfo.MoveParam.IsNg)
outTo = new BoxStorePosition(Config, StoreSide.NGDoor, StoreMoveInfo.MoveParam);
else
outTo = new BoxStorePosition(Config, StoreSide.String, StoreMoveInfo.MoveParam);
boxTransport.Start(outFrom==null?null:new BoxStorePosition(Config, outFrom, StoreMoveInfo.MoveParam), outTo, StoreMoveType.OutStore);
StoreMoveInfo.log($"开始转运料盘{(StoreMoveInfo.MoveParam.IsNg?"单料口":"料串")}"); StoreMoveInfo.log($"开始转运料盘{(StoreMoveInfo.MoveParam.IsNg?"单料口":"料串")}");
ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.OutStoreExecute); ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.OutStoreExecute);
break; break;
...@@ -143,6 +147,7 @@ namespace DeviceLibrary ...@@ -143,6 +147,7 @@ namespace DeviceLibrary
ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.OutStoreEnd); ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.OutStoreEnd);
if (StoreMoveInfo.MoveParam.IsNg) if (StoreMoveInfo.MoveParam.IsNg)
{ {
NGPuted(StoreMoveInfo.MoveParam.NgMsg); NGPuted(StoreMoveInfo.MoveParam.NgMsg);
OutSingleJobList.ClearLastPosid(StoreMoveInfo.MoveParam.PosID); OutSingleJobList.ClearLastPosid(StoreMoveInfo.MoveParam.PosID);
} }
......
DeviceLibrary/theMachine/MoveStep.cs
...@@ -13,6 +13,7 @@ namespace DeviceLibrary ...@@ -13,6 +13,7 @@ namespace DeviceLibrary
WaitErr, WaitErr,
//回原流程 //回原流程
H01_HomeReset, H01_HomeReset,
H02_HomeReset_01,
H02_HomeReset, H02_HomeReset,
H03_HomeReset, H03_HomeReset,
H04_HomeReset, H04_HomeReset,
...@@ -126,6 +127,11 @@ namespace DeviceLibrary ...@@ -126,6 +127,11 @@ namespace DeviceLibrary
StoreTS07, StoreTS07,
StoreTS08, StoreTS08,
StoreTS09, StoreTS09,
StoreFIX01,
StoreFIX02,
StoreFIX03,
StoreFIX04,
StoreFIX05,
StoreTS10, StoreTS10,
StoreTS11, StoreTS11,
StoreTS12, StoreTS12,
...@@ -135,6 +141,7 @@ namespace DeviceLibrary ...@@ -135,6 +141,7 @@ namespace DeviceLibrary
StoreTS16, StoreTS16,
StoreTS17, StoreTS17,
StoreTS18, StoreTS18,
} }
......
DeviceLibrary/theMachine/RobotManage.cs
...@@ -29,7 +29,14 @@ namespace DeviceLibrary ...@@ -29,7 +29,14 @@ namespace DeviceLibrary
public static event EventHandler<bool> UserPauseSet; public static event EventHandler<bool> UserPauseSet;
public static bool isRunning = false; public static bool isRunning = false;
public static Dictionary<string, ACStorePosition> allPositionMap { get => CSVPositionReader<ACStorePosition>.allPositionMap; } public static Dictionary<string, ACStorePosition> allPositionMap { get => CSVPositionReader<ACStorePosition>.allPositionMap; }
public static List<string> PositionNumList { get => CSVPositionReader<ACStorePosition>.allPositionMap.Keys.ToList(); }
static List<string> _positionNumList=null;
public static List<string> PositionNumList { get {
if (_positionNumList == null)
_positionNumList = CSVPositionReader<ACStorePosition>.allPositionMap.Keys.ToList();
return _positionNumList;
}
}
static string baseDir = Application.StartupPath; static string baseDir = Application.StartupPath;
static Thread mainThread; static Thread mainThread;
...@@ -49,13 +56,18 @@ namespace DeviceLibrary ...@@ -49,13 +56,18 @@ namespace DeviceLibrary
if (File.Exists(positionConfigFile)) if (File.Exists(positionConfigFile))
{ {
LogUtil.info("加载位置文件：" + positionConfigFile); LogUtil.info("加载位置文件：" + positionConfigFile);
CSVPositionReader<ACStorePosition>.ReloadCSVFile(positionConfigFile); CSVPositionReader<ACStorePosition>.AddCSVFile(positionConfigFile);
} }
else { else {
IsLoadOk = false; IsLoadOk = false;
msg += crc.GetString(L.cant_find_storeposfile, "找不到库位配置文件")+ "\n"; msg += crc.GetString(L.cant_find_storeposfile, "找不到库位配置文件")+ "\n";
} }
string fixpositionConfigFile = Path.Combine(baseDir, "StoreConfig\\fixPositions.csv");
if (File.Exists(fixpositionConfigFile))
{
LogUtil.info("加载校准库位文件：" + fixpositionConfigFile);
CSVPositionReader<ACStorePosition>.AddCSVFile(fixpositionConfigFile);
}
CodeManager.LoadConfig(); CodeManager.LoadConfig();
mainMachine = new MainMachine(RobotManage.Config); mainMachine = new MainMachine(RobotManage.Config);
......
DeviceLibrary/userControl/AxisMoveControl.cs
...@@ -170,7 +170,7 @@ namespace DeviceLibrary ...@@ -170,7 +170,7 @@ namespace DeviceLibrary
{ {
btnDelMove.BackColor = System.Drawing.SystemColors.Control; btnDelMove.BackColor = System.Drawing.SystemColors.Control;
} }
btnReadPosition_Click(null, null); // btnReadPosition_Click(null, null);
} }
private void btnComAlarmClear_Click(object sender, EventArgs e) private void btnComAlarmClear_Click(object sender, EventArgs e)
...@@ -305,7 +305,7 @@ namespace DeviceLibrary ...@@ -305,7 +305,7 @@ namespace DeviceLibrary
{ {
btnAddMove.BackColor = Color.White; btnAddMove.BackColor = Color.White;
AxisManager.SuddenStop(PortName, SlvAddr); AxisManager.SuddenStop(PortName, SlvAddr);
btnReadPosition_Click(null, null); //btnReadPosition_Click(null, null);
} }
} }
...@@ -334,7 +334,7 @@ namespace DeviceLibrary ...@@ -334,7 +334,7 @@ namespace DeviceLibrary
{ {
btnDelMove.BackColor = Color.White; btnDelMove.BackColor = Color.White;
AxisManager.SuddenStop(PortName, SlvAddr); AxisManager.SuddenStop(PortName, SlvAddr);
btnReadPosition_Click(null, null); //btnReadPosition_Click(null, null);
} }
} }
...@@ -406,6 +406,7 @@ namespace DeviceLibrary ...@@ -406,6 +406,7 @@ namespace DeviceLibrary
short value = HCBoardManager.GetHomeStatus(axisNo); short value = HCBoardManager.GetHomeStatus(axisNo);
string homesstr = HCBoardManager.AxisHomeSts(value); string homesstr = HCBoardManager.AxisHomeSts(value);
lblhomeSts.Text = homesstr; lblhomeSts.Text = homesstr;
btnReadPosition_Click(null, null);
} }
private void ShowlbSts(Label lbl, int value,bool isAlarm=false ) private void ShowlbSts(Label lbl, int value,bool isAlarm=false )
{ {
......
TheMachine/AxisControl.Designer.cs
...@@ -59,7 +59,7 @@ namespace TheMachine ...@@ -59,7 +59,7 @@ namespace TheMachine
this.configControl1.Config = null; this.configControl1.Config = null;
this.configControl1.Location = new System.Drawing.Point(568, 3); this.configControl1.Location = new System.Drawing.Point(568, 3);
this.configControl1.Name = "configControl1"; this.configControl1.Name = "configControl1";
this.configControl1.Size = new System.Drawing.Size(647, 559); this.configControl1.Size = new System.Drawing.Size(647, 553);
this.configControl1.TabIndex = 1; this.configControl1.TabIndex = 1;
this.configControl1.Tag = "not"; this.configControl1.Tag = "not";
// //
......
TheMachine/Form1.Designer.cs
...@@ -177,10 +177,10 @@ namespace TheMachine ...@@ -177,10 +177,10 @@ namespace TheMachine
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tabc.Controls.Add(this.tabP1); this.tabc.Controls.Add(this.tabP1);
this.tabc.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tabc.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabc.Location = new System.Drawing.Point(0, 116); this.tabc.Location = new System.Drawing.Point(0, 119);
this.tabc.Name = "tabc"; this.tabc.Name = "tabc";
this.tabc.SelectedIndex = 0; this.tabc.SelectedIndex = 0;
this.tabc.Size = new System.Drawing.Size(1008, 613); this.tabc.Size = new System.Drawing.Size(1008, 610);
this.tabc.TabIndex = 1; this.tabc.TabIndex = 1;
// //
// tabP1 // tabP1
...@@ -188,7 +188,7 @@ namespace TheMachine ...@@ -188,7 +188,7 @@ namespace TheMachine
this.tabP1.Controls.Add(this.pnl); this.tabP1.Controls.Add(this.pnl);
this.tabP1.Location = new System.Drawing.Point(4, 30); this.tabP1.Location = new System.Drawing.Point(4, 30);
this.tabP1.Name = "tabP1"; this.tabP1.Name = "tabP1";
this.tabP1.Size = new System.Drawing.Size(1000, 579); this.tabP1.Size = new System.Drawing.Size(1000, 576);
this.tabP1.TabIndex = 0; this.tabP1.TabIndex = 0;
this.tabP1.Text = "信息"; this.tabP1.Text = "信息";
this.tabP1.UseVisualStyleBackColor = true; this.tabP1.UseVisualStyleBackColor = true;
...@@ -207,7 +207,7 @@ namespace TheMachine ...@@ -207,7 +207,7 @@ namespace TheMachine
this.pnl.Dock = System.Windows.Forms.DockStyle.Fill; this.pnl.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnl.Location = new System.Drawing.Point(0, 0); this.pnl.Location = new System.Drawing.Point(0, 0);
this.pnl.Name = "pnl"; this.pnl.Name = "pnl";
this.pnl.Size = new System.Drawing.Size(1000, 579); this.pnl.Size = new System.Drawing.Size(1000, 576);
this.pnl.TabIndex = 273; this.pnl.TabIndex = 273;
// //
// groupBox1 // groupBox1
...@@ -260,7 +260,7 @@ namespace TheMachine ...@@ -260,7 +260,7 @@ namespace TheMachine
this.pictureBox2.BackColor = System.Drawing.Color.Gainsboro; this.pictureBox2.BackColor = System.Drawing.Color.Gainsboro;
this.pictureBox2.Location = new System.Drawing.Point(472, 302); this.pictureBox2.Location = new System.Drawing.Point(472, 302);
this.pictureBox2.Name = "pictureBox2"; this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(463, 283); this.pictureBox2.Size = new System.Drawing.Size(436, 271);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox2.TabIndex = 270; this.pictureBox2.TabIndex = 270;
this.pictureBox2.TabStop = false; this.pictureBox2.TabStop = false;
...@@ -284,7 +284,7 @@ namespace TheMachine ...@@ -284,7 +284,7 @@ namespace TheMachine
this.pictureBox1.BackColor = System.Drawing.Color.Gainsboro; this.pictureBox1.BackColor = System.Drawing.Color.Gainsboro;
this.pictureBox1.Location = new System.Drawing.Point(3, 302); this.pictureBox1.Location = new System.Drawing.Point(3, 302);
this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(463, 283); this.pictureBox1.Size = new System.Drawing.Size(451, 271);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 271; this.pictureBox1.TabIndex = 271;
this.pictureBox1.TabStop = false; this.pictureBox1.TabStop = false;
...@@ -371,10 +371,10 @@ namespace TheMachine ...@@ -371,10 +371,10 @@ namespace TheMachine
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1008, 729); this.ClientSize = new System.Drawing.Size(1008, 729);
this.Controls.Add(this.tabc);
this.Controls.Add(this.listView1); this.Controls.Add(this.listView1);
this.Controls.Add(this.btn_stop); this.Controls.Add(this.btn_stop);
this.Controls.Add(this.btn_run); this.Controls.Add(this.btn_run);
this.Controls.Add(this.tabc);
this.Controls.Add(this.menuStrip1); this.Controls.Add(this.menuStrip1);
this.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.MainMenuStrip = this.menuStrip1; this.MainMenuStrip = this.menuStrip1;
......
TheMachine/Form1.cs
...@@ -42,6 +42,7 @@ namespace TheMachine ...@@ -42,6 +42,7 @@ namespace TheMachine
if (tabc.TabCount > tabpagecount) if (tabc.TabCount > tabpagecount)
addTablePage(); addTablePage();
LanguageProcess(); LanguageProcess();
} }
...@@ -68,6 +69,9 @@ namespace TheMachine ...@@ -68,6 +69,9 @@ namespace TheMachine
readonly System.Windows.Forms.Timer t1 = new System.Windows.Forms.Timer(); readonly System.Windows.Forms.Timer t1 = new System.Windows.Forms.Timer();
private void Form1_Load(object sender, EventArgs e) private void Form1_Load(object sender, EventArgs e)
{ {
this.Width = Screen.PrimaryScreen.WorkingArea.Width;//获取主显⽰设备的桌⾯宽度
this.Height = Screen.PrimaryScreen.WorkingArea.Height;//获取主显⽰设备的桌⾯⾼度
List<CodeInfo> codeInfos = new List<CodeInfo>(); List<CodeInfo> codeInfos = new List<CodeInfo>();
//codeInfos.Add(new CodeInfo("", 528, 406)); //codeInfos.Add(new CodeInfo("", 528, 406));
codeInfos.Add(new CodeInfo("", 925, 520)); codeInfos.Add(new CodeInfo("", 925, 520));
......
TheMachine/IOControls.Designer.cs
...@@ -174,6 +174,7 @@ namespace TheMachine ...@@ -174,6 +174,7 @@ namespace TheMachine
// //
// ioControl1 // ioControl1
// //
this.ioControl1.BackColor = System.Drawing.Color.White;
this.ioControl1.Config = null; this.ioControl1.Config = null;
this.ioControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.ioControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ioControl1.Location = new System.Drawing.Point(0, 0); this.ioControl1.Location = new System.Drawing.Point(0, 0);
......
TheMachine/SettingControl.Designer.cs
...@@ -37,6 +37,7 @@ namespace TheMachine ...@@ -37,6 +37,7 @@ namespace TheMachine
this.lbl_hmdstate = new System.Windows.Forms.Label(); this.lbl_hmdstate = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.tp = new System.Windows.Forms.TableLayoutPanel(); this.tp = new System.Windows.Forms.TableLayoutPanel();
this.cb_usefixpos = new System.Windows.Forms.CheckBox();
this.tp.SuspendLayout(); this.tp.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -44,7 +45,7 @@ namespace TheMachine ...@@ -44,7 +45,7 @@ namespace TheMachine
// //
this.chbAutoRun.AutoSize = true; this.chbAutoRun.AutoSize = true;
this.tp.SetColumnSpan(this.chbAutoRun, 2); this.tp.SetColumnSpan(this.chbAutoRun, 2);
this.chbAutoRun.Location = new System.Drawing.Point(10, 130); this.chbAutoRun.Location = new System.Drawing.Point(10, 166);
this.chbAutoRun.Margin = new System.Windows.Forms.Padding(10); this.chbAutoRun.Margin = new System.Windows.Forms.Padding(10);
this.chbAutoRun.Name = "chbAutoRun"; this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(84, 16); this.chbAutoRun.Size = new System.Drawing.Size(84, 16);
...@@ -113,12 +114,13 @@ namespace TheMachine ...@@ -113,12 +114,13 @@ namespace TheMachine
this.tp.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tp.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tp.Controls.Add(this.label_tempsensor, 0, 0); this.tp.Controls.Add(this.label_tempsensor, 0, 0);
this.tp.Controls.Add(this.cb_tempsensorport, 1, 0); this.tp.Controls.Add(this.cb_tempsensorport, 1, 0);
this.tp.Controls.Add(this.chbAutoRun, 0, 6);
this.tp.Controls.Add(this.button_positiontool, 0, 5); this.tp.Controls.Add(this.button_positiontool, 0, 5);
this.tp.Controls.Add(this.lbl_hmdstate, 0, 4); this.tp.Controls.Add(this.lbl_hmdstate, 0, 4);
this.tp.Controls.Add(this.cb_usefixpos, 0, 6);
this.tp.Controls.Add(this.chbAutoRun, 0, 7);
this.tp.Location = new System.Drawing.Point(3, 3); this.tp.Location = new System.Drawing.Point(3, 3);
this.tp.Name = "tp"; this.tp.Name = "tp";
this.tp.RowCount = 7; this.tp.RowCount = 9;
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
...@@ -126,9 +128,23 @@ namespace TheMachine ...@@ -126,9 +128,23 @@ namespace TheMachine
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.Size = new System.Drawing.Size(266, 156); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.Size = new System.Drawing.Size(266, 192);
this.tp.TabIndex = 6; this.tp.TabIndex = 6;
// //
// cb_usefixpos
//
this.cb_usefixpos.AutoSize = true;
this.tp.SetColumnSpan(this.cb_usefixpos, 2);
this.cb_usefixpos.Location = new System.Drawing.Point(10, 130);
this.cb_usefixpos.Margin = new System.Windows.Forms.Padding(10);
this.cb_usefixpos.Name = "cb_usefixpos";
this.cb_usefixpos.Size = new System.Drawing.Size(96, 16);
this.cb_usefixpos.TabIndex = 6;
this.cb_usefixpos.Text = "启用校准库位";
this.cb_usefixpos.UseVisualStyleBackColor = true;
//
// SettingControl // SettingControl
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
...@@ -151,5 +167,6 @@ namespace TheMachine ...@@ -151,5 +167,6 @@ namespace TheMachine
private System.Windows.Forms.Label lbl_hmdstate; private System.Windows.Forms.Label lbl_hmdstate;
private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.TableLayoutPanel tp; private System.Windows.Forms.TableLayoutPanel tp;
private System.Windows.Forms.CheckBox cb_usefixpos;
} }
} }
TheMachine/SettingControl.cs
...@@ -48,6 +48,7 @@ namespace TheMachine ...@@ -48,6 +48,7 @@ namespace TheMachine
Config.PropertyBind("Device_Humiture_Port", cb_tempsensorport, "SelectedItem", "SelectedIndexChanged"); Config.PropertyBind("Device_Humiture_Port", cb_tempsensorport, "SelectedItem", "SelectedIndexChanged");
Config.PropertyBind("Device_Use_Fixpos", cb_usefixpos, "Checked", "CheckedChanged");
} }
......
TheMachine/UC/ConfigControl.cs
...@@ -26,6 +26,7 @@ namespace TheMachine ...@@ -26,6 +26,7 @@ namespace TheMachine
if (value == null) if (value == null)
return; return;
_Config = value; _Config = value;
LoadPosList(); LoadPosList();
} }
} }
...@@ -38,12 +39,35 @@ namespace TheMachine ...@@ -38,12 +39,35 @@ namespace TheMachine
private void Crc_LanguageChangeEvent(object sender, EventArgs e) private void Crc_LanguageChangeEvent(object sender, EventArgs e)
{ {
if (Config!=null) if (Config == null)
LoadPosList(); return;
LoadPosList();
} }
void LoadPosList() void LoadPosList()
{ {
if (!this.Created)
return;
if (this.InvokeRequired)
{
this.Invoke((EventHandler)delegate
{
try
{
LoadPosList();
}
catch (Exception ee)
{
MessageBox.Show("LoadPosList:" + ee.ToString());
}
});
return;
}
tableLayoutPanel1.SuspendLayout();
int maxrow = tableLayoutPanel1.Height / 34; int maxrow = tableLayoutPanel1.Height / 34;
tableLayoutPanel1.Controls.Clear(); tableLayoutPanel1.Controls.Clear();
this.tableLayoutPanel1.RowStyles.Clear(); this.tableLayoutPanel1.RowStyles.Clear();
...@@ -146,6 +170,7 @@ namespace TheMachine ...@@ -146,6 +170,7 @@ namespace TheMachine
Label button1 = new Label(); Label button1 = new Label();
tableLayoutPanel1.Controls.Add(button1, c, r++); tableLayoutPanel1.Controls.Add(button1, c, r++);
} }
tableLayoutPanel1.ResumeLayout(true);
} }
private void TextBox_TextChanged(object sender, EventArgs e) private void TextBox_TextChanged(object sender, EventArgs e)
......
TheMachine/UC/IOControl.cs
...@@ -26,7 +26,14 @@ namespace TheMachine ...@@ -26,7 +26,14 @@ namespace TheMachine
if (value == null) if (value == null)
return; return;
_Config = value; _Config = value;
LoadIOList(); try
{
LoadIOList();
}
catch (Exception ee)
{
MessageBox.Show("Config LoadIOList:" + ee.ToString());
}
} }
} }
readonly Timer t1 = new Timer(); readonly Timer t1 = new Timer();
...@@ -59,12 +66,19 @@ namespace TheMachine ...@@ -59,12 +66,19 @@ namespace TheMachine
if (DesignMode) if (DesignMode)
return; return;
OnlineStore.CodeResourceControl.LanguageProcess(this); OnlineStore.CodeResourceControl.LanguageProcess(this);
LoadIOList();
}
private void RobotManage_LoadFinishEvent(bool state, string msg) this.Invoke((EventHandler)delegate
{ {
if (state) { LoadIOList(); } try
{
LoadIOList();
}
catch (Exception ee)
{
MessageBox.Show("CodeResourceControl_LanguageChange LoadIOList:" + ee.ToString());
}
});
} }
private void T1_Tick(object sender, EventArgs e) private void T1_Tick(object sender, EventArgs e)
...@@ -77,6 +91,7 @@ namespace TheMachine ...@@ -77,6 +91,7 @@ namespace TheMachine
private void LoadIOList() private void LoadIOList()
{ {
t1.Stop();
this.SuspendLayout(); this.SuspendLayout();
DIControlList.Clear(); DIControlList.Clear();
DOControlList.Clear(); DOControlList.Clear();
......
TheMachine/UC/StorePosControl.cs
...@@ -39,7 +39,23 @@ namespace TheMachine ...@@ -39,7 +39,23 @@ namespace TheMachine
private void Crc_LanguageChangeEvent(object sender, EventArgs e) private void Crc_LanguageChangeEvent(object sender, EventArgs e)
{ {
LoadPos(_aCStorePosition); if (!this.Created)
return;
this.Invoke((EventHandler)delegate
{
try
{
LoadPos(_aCStorePosition);
}
catch (Exception ee)
{
MessageBox.Show("Crc_LanguageChangeEvent LoadPos:" + ee.ToString());
}
});
} }
private ACStorePosition _aCStorePosition; private ACStorePosition _aCStorePosition;
public void LoadPos(ACStorePosition aCStorePosition) public void LoadPos(ACStorePosition aCStorePosition)
......
TheMachine/UC/uc_boxdebug.Designer.cs
...@@ -40,6 +40,7 @@ namespace TheMachine ...@@ -40,6 +40,7 @@ namespace TheMachine
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.label_verify = new System.Windows.Forms.Label(); this.label_verify = new System.Windows.Forms.Label();
this.cb_fixpos = new System.Windows.Forms.ComboBox();
this.storePosControl1 = new TheMachine.StorePosControl(); this.storePosControl1 = new TheMachine.StorePosControl();
this.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
...@@ -169,6 +170,17 @@ namespace TheMachine ...@@ -169,6 +170,17 @@ namespace TheMachine
this.label_verify.Tag = "not"; this.label_verify.Tag = "not";
this.label_verify.TextAlign = System.Drawing.ContentAlignment.TopRight; this.label_verify.TextAlign = System.Drawing.ContentAlignment.TopRight;
// //
// cb_fixpos
//
this.cb_fixpos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_fixpos.FormattingEnabled = true;
this.cb_fixpos.Location = new System.Drawing.Point(266, 489);
this.cb_fixpos.Name = "cb_fixpos";
this.cb_fixpos.Size = new System.Drawing.Size(121, 20);
this.cb_fixpos.TabIndex = 226;
this.cb_fixpos.Tag = "not";
this.cb_fixpos.SelectedIndexChanged += new System.EventHandler(this.cb_fixpos_SelectedIndexChanged);
//
// storePosControl1 // storePosControl1
// //
this.storePosControl1.Config = null; this.storePosControl1.Config = null;
...@@ -184,6 +196,7 @@ namespace TheMachine ...@@ -184,6 +196,7 @@ namespace TheMachine
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.cb_fixpos);
this.Controls.Add(this.label_verify); this.Controls.Add(this.label_verify);
this.Controls.Add(this.cmbPosition); this.Controls.Add(this.cmbPosition);
this.Controls.Add(this.label_size); this.Controls.Add(this.label_size);
...@@ -213,5 +226,6 @@ namespace TheMachine ...@@ -213,5 +226,6 @@ namespace TheMachine
private System.Windows.Forms.CheckBox cb_inoutdebugmode; private System.Windows.Forms.CheckBox cb_inoutdebugmode;
private System.Windows.Forms.Button btn_autoinout; private System.Windows.Forms.Button btn_autoinout;
private System.Windows.Forms.Label label_verify; private System.Windows.Forms.Label label_verify;
private System.Windows.Forms.ComboBox cb_fixpos;
} }
} }
TheMachine/UC/uc_boxdebug.cs
...@@ -122,6 +122,7 @@ namespace TheMachine ...@@ -122,6 +122,7 @@ namespace TheMachine
return -1; return -1;
if (b.StartsWith("fix")) if (b.StartsWith("fix"))
return 1; return 1;
string[] pa = a.Split('_'); string[] pa = a.Split('_');
string[] pb = b.Split('_'); string[] pb = b.Split('_');
...@@ -217,7 +218,7 @@ namespace TheMachine ...@@ -217,7 +218,7 @@ namespace TheMachine
LoadPosCheck(); LoadPosCheck();
Comparison<string> comparison = new Comparison<string>(PosCompare); Comparison<string> comparison = new Comparison<string>(PosCompare);
RobotManage.PositionNumList.Sort(comparison); RobotManage.PositionNumList.Sort(comparison);
//store.PositionNumList.Reverse();
string[] posstr = RobotManage.PositionNumList[RobotManage.PositionNumList.Count-1].Split('_'); string[] posstr = RobotManage.PositionNumList[RobotManage.PositionNumList.Count-1].Split('_');
int colcount = 0; int colcount = 0;
...@@ -239,13 +240,17 @@ namespace TheMachine ...@@ -239,13 +240,17 @@ namespace TheMachine
int currentRowIndex = 0; int currentRowIndex = 0;
int lastcol = -1; int lastcol = -1;
string lastAB = ""; string lastAB = "";
cb_fixpos.Items.Clear();
for (int i = 0; i < RobotManage.PositionNumList.Count; i++) for (int i = 0; i < RobotManage.PositionNumList.Count; i++)
{ {
int ci = RobotManage.PositionNumList.Count-1 - i; int ci = RobotManage.PositionNumList.Count-1 - i;
string posname = RobotManage.PositionNumList[ci]; string posname = RobotManage.PositionNumList[ci];
if (posname.StartsWith("fix")) if (posname.StartsWith("fix"))
{
cb_fixpos.Items.Add(posname);
continue; continue;
}
string[] _posstr = posname.Split('_'); string[] _posstr = posname.Split('_');
int col = 0; int col = 0;
if (!int.TryParse(_posstr[1], out col)) if (!int.TryParse(_posstr[1], out col))
...@@ -304,6 +309,7 @@ namespace TheMachine ...@@ -304,6 +309,7 @@ namespace TheMachine
else else
setData(RobotManage.PositionNumList.Last()); setData(RobotManage.PositionNumList.Last());
checkVerify(); checkVerify();
} }
void setData(string posid) { void setData(string posid) {
ACStorePosition ktkPosition = CSVPositionReader<ACStorePosition>.GetPositon(posid); ACStorePosition ktkPosition = CSVPositionReader<ACStorePosition>.GetPositon(posid);
...@@ -448,5 +454,11 @@ namespace TheMachine ...@@ -448,5 +454,11 @@ namespace TheMachine
//RobotManage.DisableUpdownProtect = cb_disableupdownprotect.Checked; //RobotManage.DisableUpdownProtect = cb_disableupdownprotect.Checked;
//LogUtil.info("手动点击屏蔽升降轴旋转轴安全检测:"+ cb_disableupdownprotect.Checked.ToString()); //LogUtil.info("手动点击屏蔽升降轴旋转轴安全检测:"+ cb_disableupdownprotect.Checked.ToString());
} }
private void cb_fixpos_SelectedIndexChanged(object sender, EventArgs e)
{
if (cb_fixpos.SelectedItem!=null)
setData(cb_fixpos.SelectedItem.ToString());
}
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!