Skip to content

刘韬 / 1053_DualSISO

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

1

1 个父辈 2768259f
内嵌 并排
正在显示 31 个修改的文件 包含 1036 行增加 和 1008 行删除
Common/util/HumitureController.cs

using OnlineStore;
using log4net;
using System;
using System.Collections.Generic;
......@@ -38,7 +39,7 @@ namespace OnlineStore.Common
{
Release();
}
LogName = "温湿度传感器[" + port + "]";
LogName = crc.GetString("Res0115","温湿度传感器")+ "[" + port + "]";
if (sb == null)
{
......@@ -325,4 +326,4 @@ namespace OnlineStore.Common
}
}
}
}
\ No newline at end of file
Common/util/TcpServer.cs
using System;
using OnlineStore;
using System;
using System.Text;
using System.Windows.Forms;
......@@ -33,7 +34,7 @@ namespace OnlineStore.Common
private void logLocalIp()
{
string[] addresses = GetLocalAddresses();
string iplist = "本机IP:[";
string iplist = crc.GetString("Res0116","本机IP:")+"[";
if (addresses.Length > 0)
{
for (int i = 0; i < addresses.Length; i++)
......@@ -263,4 +264,4 @@ namespace OnlineStore.Common
}
}
}
}
\ No newline at end of file
Common/util/UdpServer.cs

using OnlineStore;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -26,7 +27,7 @@ namespace OnlineStore.Common
private void logLocalIp()
{
string[] addresses = GetLocalAddresses();
string iplist = "本机IP:[";
string iplist = crc.GetString("Res0116","本机IP:")+ "[";
if (addresses.Length > 0)
{
for (int i = 0; i < addresses.Length; i++)
......@@ -156,4 +157,4 @@ namespace OnlineStore.Common
return retval;
}
}
}
}
\ No newline at end of file
DeviceLibrary/DeviceLibrary/AxisBean.cs
......@@ -115,7 +115,7 @@ namespace DeviceLibrary
/// <summary>
/// 松下伺服电机运动
/// </summary>
public void AbsMove(MoveInfo MoveInfo, int targetPosition, int targetSpeed)
public void AbsMove(MoveInfo MoveInfo, int targetPosition, int targetSpeed, string proname="")
{
if (IsInPosition(targetPosition))
{
......@@ -137,10 +137,21 @@ namespace DeviceLibrary
}
else
{
MoveInfo.WaitList.Add(WaitResultInfo.WaitAxis(Config, targetPosition, targetSpeed));
Config.TargetPosition = targetPosition;
var AddSpeed = Config.AddSpeed > 0 ? Config.AddSpeed : targetSpeed * 4;
var DelSpeed = Config.DelSpeed > 0 ? Config.DelSpeed : targetSpeed * 4;
//if (!string.IsNullOrEmpty(proname)) {
// var storeMachine = (machineSide == MachineSideE.Left) ? RobotManage.leftMachine : RobotManage.rightMachine;
// var c = storeMachine.Config.configList.Find(x => x.ProName == proname);
// if (c != null) {
// AddSpeed = AddSpeed*c.AddSpeed;
// }
//}
AxisManager.AbsMove(Config.DeviceName, Config.GetAxisValue(), targetPosition, targetSpeed, AddSpeed, DelSpeed);// Config.AddSpeed, Config.DelSpeed);
}
}
......
DeviceLibrary/DeviceLibrary/Camera.cs
using Asa.Camera;
using Asa.Camera;
using DeviceLibrary;
using OnlineStore;
using OnlineStore.Common;
......@@ -40,7 +40,7 @@ public class HIKCamera
string path = $".\\Config\\{CameraID}.json";
if (!File.Exists(path))
{
msg = Name + "找不到监控相机配置文件";
msg = Name + crc.GetString("Res0117","找不到监控相机配置文件");
LogUtil.error(Name + "找不到监控相机配置文件" + path);
return false;
}
......@@ -59,7 +59,7 @@ public class HIKCamera
}
catch (Exception e)
{
msg = Name + "加载监控相机配置文件失败:" + e.ToString();
msg = Name + crc.GetString("Res0118","加载监控相机配置文件失败:") + e.ToString();
LogUtil.error(Name + "加载监控相机配置文件失败:" + e.ToString());
return false;
}
......@@ -67,7 +67,7 @@ public class HIKCamera
Bitmap bmp = camera.GetImage(DeviceName);
if (bmp == null)
{
msg = Name + "监控相机打开失败";
msg = Name + crc.GetString("Res0119","监控相机打开失败");
LogUtil.error(Name + $"监控相机打开失败");
return false;
}
......@@ -182,4 +182,4 @@ public enum FixtureState
ToInSide,
ToOutSide,
ToFix,
}
}
\ No newline at end of file
DeviceLibrary/DeviceLibrary/LiftMonitor.cs
using OnlineStore.Common;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
......@@ -44,7 +45,7 @@ namespace DeviceLibrary
public void LiftUp(MoveInfo moveInfo) {
if (moveInfo == null)
moveInfo = new MoveInfo("界面",false);
moveInfo = new MoveInfo(crc.GetString("Res0120","界面"),false);
if (IOManager.IOValue(up.ToString()).Equals(IO_VALUE.HIGH)) {
moveInfo.log($"{axisBean.AxisName},已在位置,无需上升");
return;
......@@ -83,7 +84,7 @@ namespace DeviceLibrary
public void LiftDown(MoveInfo moveInfo)
{
if (moveInfo == null)
moveInfo = new MoveInfo("界面", false);
moveInfo = new MoveInfo(crc.GetString("Res0120","界面"), false);
if (IOManager.IOValue(down.ToString()).Equals(IO_VALUE.HIGH))
{
moveInfo.log($"{axisBean.AxisName},已在位置,无需下降");
......@@ -124,4 +125,4 @@ namespace DeviceLibrary
return false;
}
}
}
}
\ No newline at end of file
DeviceLibrary/DeviceLibrary/ServerCommunication.cs
using OnlineStore;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
......@@ -208,7 +208,7 @@ namespace DeviceLibrary
sendmsg = string.Join(",", new string[] { WarnMsg });
}
else if (Machine.runStatus== RunStatus.Stop){
sendmsg = "设备未启动";
sendmsg = crc.GetString("Res0121","设备未启动");
}
lineOperation.msg = sendmsg;
......@@ -360,7 +360,7 @@ namespace DeviceLibrary
{
//出入库没有找到服务器发送的库位，需要打印日志方便查询原因
//SetWarnMsg(ResourceControl.InStoreNoPosition, message, posId);
WarnMsg = "入库未找到库位：" + posId;//0505
WarnMsg = crc.GetString("Res0122","入库未找到库位：") + posId;//0505
LogUtil.info("收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】");
return;
}
......@@ -605,4 +605,4 @@ namespace DeviceLibrary
InStoreError = 14,
}
}
}
\ No newline at end of file
DeviceLibrary/StoreConfig/Right/linePositions.csv
位置,优先级,高度,宽度,料仓ID,旋转轴位置P2,升降轴库位入料高点P3,升降轴库位入料低点P4,进出轴库位点取料点P3,,,
1069M02_01_11_01,796,8,7,1,219347,31048,20240,236990,,,
1069M02_01_11_02,795,8,7,1,219347,60595,49787,236990,,,18296
1069M02_01_11_03,794,8,7,1,219347,91377,80569,236990,,,
1069M02_01_11_04,793,8,7,1,219347,121147,110339,236990,,,4920
1069M02_01_11_05,792,8,7,1,219347,151889,141081,236990,,,
1069M02_01_11_06,791,8,7,1,219347,182278,171470,236990,,,
1069M02_01_11_07,790,8,7,1,219347,212452,201644,236990,,16926,
1069M02_01_11_08,789,8,7,1,219347,242880,232072,236990,,16926,
1069M02_01_11_09,788,8,7,1,219347,273824,263016,236990,,6118,
1069M02_01_11_10,787,8,7,1,219347,303630,292822,236990,,,
1069M02_01_11_11,786,8,7,1,219347,334223,323415,236990,,,
1069M02_01_11_12,785,8,7,1,219347,365075,354267,236990,,,
1069M02_01_11_13,784,8,7,1,219347,396359,385551,236990,,,
1069M02_01_11_14,783,8,7,1,219347,426437,415629,236990,,,
1069M02_01_11_15,782,8,7,1,219347,456331,445523,236990,,,
1069M02_01_11_16,781,8,7,1,219347,488190,477382,236990,,,
1069M02_01_11_17,780,8,7,1,219347,517826,507018,236990,,,
1069M02_01_21_01,779,8,7,1,219347,548997,538189,236990,,,
1069M02_01_21_02,778,8,7,1,219347,579010,568202,236990,,,
1069M02_01_21_03,777,8,7,1,219347,609659,598851,236990,,,
1069M02_01_21_04,776,8,7,1,219347,640419,629611,236990,,,
1069M02_01_21_05,775,8,7,1,219347,671882,661074,236990,,,
1069M02_01_21_06,774,8,7,1,219347,701758,690950,236990,,,
1069M02_01_21_07,773,8,7,1,219347,732293,721485,236990,,,
1069M02_01_21_08,772,8,7,1,219347,762346,751538,236990,,,
1069M02_01_21_09,771,8,7,1,219347,794033,783225,236990,,,
1069M02_01_21_10,770,8,7,1,219347,823405,812597,236990,,,
1069M02_01_21_11,769,8,7,1,219347,853356,842548,236990,,,
1069M02_01_21_12,768,8,7,1,219347,884553,873745,236990,,,
1069M02_01_21_13,767,8,7,1,219347,914542,903734,236990,,,
1069M02_01_21_14,766,8,7,1,219347,945451,934643,236990,,,
1069M02_01_21_15,765,8,7,1,219347,975287,964479,236990,,,
1069M02_01_21_16,764,8,7,1,219347,1006056,995248,236990,,,
1069M02_01_21_17,763,8,7,1,219347,1036562,1025754,236990,,,
1069M02_01_31_01,762,8,7,1,219347,1067806,1056998,236990,,,
1069M02_01_31_02,761,8,7,1,219347,1097161,1086353,236990,,,
1069M02_01_31_03,760,8,7,1,219347,1128071,1117263,236990,,,
1069M02_01_31_04,759,8,7,1,219347,1158489,1147681,236990,,,
1069M02_01_31_05,758,8,7,1,219347,1188443,1177635,236990,,,
1069M02_01_31_06,757,8,7,1,219347,1219398,1208590,236990,,,
1069M02_01_31_07,756,8,7,1,219347,1250186,1239378,236990,,,
1069M02_01_31_08,755,8,7,1,219347,1280611,1269803,236990,,,
1069M02_01_31_09,754,8,7,1,219347,1311064,1300256,236990,,,
1069M02_01_31_10,753,8,7,1,219347,1341992,1331184,236990,,,
1069M02_01_31_11,752,8,7,1,219347,1372295,1361487,236990,,,
1069M02_01_31_12,751,8,7,1,219347,1402484,1391676,236990,,,
1069M02_01_31_13,750,8,7,1,219347,1433486,1422678,236990,,,
1069M02_01_31_14,749,8,7,1,219347,1463404,1452596,236990,,,
1069M02_01_31_15,748,8,7,1,219347,1493926,1483118,236990,,,
1069M02_01_31_16,747,8,7,1,219347,1525099,1514291,236990,,,
1069M02_01_31_17,746,8,7,1,219347,1556210,1545402,236990,,,
1069M02_01_41_01,745,8,7,1,219347,1583889,1573081,236990,,,
1069M02_01_41_02,744,8,7,1,219347,1615371,1604563,236990,,,
1069M02_01_41_03,743,8,7,1,219347,1645844,1635036,236990,,,
1069M02_01_41_04,742,8,7,1,219347,1676317,1665509,236990,,,
1069M02_01_41_05,741,8,7,1,219347,1706928,1696120,236990,,,
1069M02_01_41_06,740,8,7,1,219347,1737328,1726520,236990,,,
1069M02_01_41_07,739,8,7,1,219347,1767633,1756825,236990,,,
1069M02_01_41_08,738,8,7,1,219347,1798085,1787277,236990,,,
1069M02_01_41_09,737,8,7,1,219347,1828813,1818005,236990,,,
1069M02_01_41_10,736,8,7,1,219347,1859612,1848804,236990,,,
1069M02_01_41_11,735,8,7,1,219347,1889603,1878795,236990,,,
1069M02_01_41_12,734,8,7,1,219347,1920211,1909403,236990,,,
1069M02_01_41_13,733,8,7,1,219347,1951392,1940584,236990,,,
1069M02_01_41_14,732,8,7,1,219347,1981711,1970903,236990,,,
1069M02_01_41_15,731,8,7,1,219347,2011997,2001189,236990,,,
1069M02_01_41_16,730,8,7,1,219347,2041246,2030438,236990,,,
1069M02_01_12_01,729,8,7,1,242048,31048,20240,236990,,,
1069M02_01_12_02,728,8,7,1,242048,60595,49787,236990,,,
1069M02_01_12_03,727,8,7,1,242048,91377,80569,236990,,,
1069M02_01_12_04,726,8,7,1,242048,121147,110339,236990,,,
1069M02_01_12_05,725,8,7,1,242048,151889,141081,236990,,,
1069M02_01_12_06,724,8,7,1,242048,182278,171470,236990,,,
1069M02_01_12_07,723,8,7,1,242048,212452,201644,236990,,,
1069M02_01_12_08,722,8,7,1,242048,242880,232072,236990,,,
1069M02_01_12_09,721,8,7,1,242048,273824,263016,236990,,,
1069M02_01_12_10,720,8,7,1,242048,303630,292822,236990,,,
1069M02_01_12_11,719,8,7,1,242048,334223,323415,236990,,,
1069M02_01_12_12,718,8,7,1,242048,365075,354267,236990,,,
1069M02_01_12_13,717,8,7,1,242048,396359,385551,236990,,,
1069M02_01_12_14,716,8,7,1,242048,426437,415629,236990,,,
1069M02_01_12_15,715,8,7,1,242048,456331,445523,236990,,,
1069M02_01_12_16,714,8,7,1,242048,488190,477382,236990,,,
1069M02_01_12_17,713,8,7,1,242048,517826,507018,236990,,,
1069M02_01_22_01,712,8,7,1,242048,548997,538189,236990,,,
1069M02_01_22_02,711,8,7,1,242048,579010,568202,236990,,,
1069M02_01_22_03,710,8,7,1,242048,609659,598851,236990,,,
1069M02_01_22_04,709,8,7,1,242048,640419,629611,236990,,,
1069M02_01_22_05,708,8,7,1,242048,671882,661074,236990,,,
1069M02_01_22_06,707,8,7,1,242048,701758,690950,236990,,,
1069M02_01_22_07,706,8,7,1,242048,732293,721485,236990,,,
1069M02_01_22_08,705,8,7,1,242048,762346,751538,236990,,,
1069M02_01_22_09,704,8,7,1,242048,794033,783225,236990,,,
1069M02_01_22_10,703,8,7,1,242048,823405,812597,236990,,,
1069M02_01_22_11,702,8,7,1,242048,853356,842548,236990,,,
1069M02_01_22_12,701,8,7,1,242048,884553,873745,236990,,,
1069M02_01_22_13,700,8,7,1,242048,914542,903734,236990,,,
1069M02_01_22_14,699,8,7,1,242048,945451,934643,236990,,,
1069M02_01_22_15,698,8,7,1,242048,975287,964479,236990,,,
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,,,
位置,优先级,高度,宽度,料仓ID,旋转轴位置P2,升降轴库位入料高点P3,升降轴库位入料低点P4,进出轴库位点取料点P3
1069M02_01_11_01,796,8,7,1,219347,31048,20240,236990
1069M02_01_11_02,795,8,7,1,219347,60595,49787,236990
1069M02_01_11_03,794,8,7,1,219347,91377,80569,236990
1069M02_01_11_04,793,8,7,1,219347,121147,110339,236990
1069M02_01_11_05,792,8,7,1,219347,151889,141081,236990
1069M02_01_11_06,791,8,7,1,219347,182278,171470,236990
1069M02_01_11_07,790,8,7,1,219347,212452,201644,236990
1069M02_01_11_08,789,8,7,1,219347,242880,232072,236990
1069M02_01_11_09,788,8,7,1,219347,273824,263016,236990
1069M02_01_11_10,787,8,7,1,219347,303630,292822,236990
1069M02_01_11_11,786,8,7,1,219347,334223,323415,236990
1069M02_01_11_12,785,8,7,1,219347,365075,354267,236990
1069M02_01_11_13,784,8,7,1,219347,396359,385551,236990
1069M02_01_11_14,783,8,7,1,219347,426437,415629,236990
1069M02_01_11_15,782,8,7,1,219347,456331,445523,236990
1069M02_01_11_16,781,8,7,1,219347,488190,477382,236990
1069M02_01_11_17,780,8,7,1,219347,517826,507018,236990
1069M02_01_21_01,779,8,7,1,219347,548997,538189,236990
1069M02_01_21_02,778,8,7,1,219347,579010,568202,236990
1069M02_01_21_03,777,8,7,1,219347,609659,598851,236990
1069M02_01_21_04,776,8,7,1,219347,640419,629611,236990
1069M02_01_21_05,775,8,7,1,219347,671882,661074,236990
1069M02_01_21_06,774,8,7,1,219347,701758,690950,236990
1069M02_01_21_07,773,8,7,1,219347,732293,721485,236990
1069M02_01_21_08,772,8,7,1,219347,762346,751538,236990
1069M02_01_21_09,771,8,7,1,219347,794033,783225,236990
1069M02_01_21_10,770,8,7,1,219347,823405,812597,236990
1069M02_01_21_11,769,8,7,1,219347,853356,842548,236990
1069M02_01_21_12,768,8,7,1,219347,884553,873745,236990
1069M02_01_21_13,767,8,7,1,219347,914542,903734,236990
1069M02_01_21_14,766,8,7,1,219347,945451,934643,236990
1069M02_01_21_15,765,8,7,1,219347,975287,964479,236990
1069M02_01_21_16,764,8,7,1,219347,1006056,995248,236990
1069M02_01_21_17,763,8,7,1,219347,1036562,1025754,236990
1069M02_01_31_01,762,8,7,1,219347,1067806,1056998,236990
1069M02_01_31_02,761,8,7,1,219347,1097161,1086353,236990
1069M02_01_31_03,760,8,7,1,219347,1128071,1117263,236990
1069M02_01_31_04,759,8,7,1,219347,1158489,1147681,236990
1069M02_01_31_05,758,8,7,1,219347,1188443,1177635,236990
1069M02_01_31_06,757,8,7,1,219347,1219398,1208590,236990
1069M02_01_31_07,756,8,7,1,219347,1250186,1239378,236990
1069M02_01_31_08,755,8,7,1,219347,1280611,1269803,236990
1069M02_01_31_09,754,8,7,1,219347,1311064,1300256,236990
1069M02_01_31_10,753,8,7,1,219347,1341992,1331184,236990
1069M02_01_31_11,752,8,7,1,219347,1372295,1361487,236990
1069M02_01_31_12,751,8,7,1,219347,1402484,1391676,236990
1069M02_01_31_13,750,8,7,1,219347,1433486,1422678,236990
1069M02_01_31_14,749,8,7,1,219347,1463404,1452596,236990
1069M02_01_31_15,748,8,7,1,219347,1493926,1483118,236990
1069M02_01_31_16,747,8,7,1,219347,1525099,1514291,236990
1069M02_01_31_17,746,8,7,1,219347,1556210,1545402,236990
1069M02_01_41_01,745,8,7,1,219347,1583889,1573081,236990
1069M02_01_41_02,744,8,7,1,219347,1615371,1604563,236990
1069M02_01_41_03,743,8,7,1,219347,1645844,1635036,236990
1069M02_01_41_04,742,8,7,1,219347,1676317,1665509,236990
1069M02_01_41_05,741,8,7,1,219347,1706928,1696120,236990
1069M02_01_41_06,740,8,7,1,219347,1737328,1726520,236990
1069M02_01_41_07,739,8,7,1,219347,1767633,1756825,236990
1069M02_01_41_08,738,8,7,1,219347,1798085,1787277,236990
1069M02_01_41_09,737,8,7,1,219347,1828813,1818005,236990
1069M02_01_41_10,736,8,7,1,219347,1859612,1848804,236990
1069M02_01_41_11,735,8,7,1,219347,1889603,1878795,236990
1069M02_01_41_12,734,8,7,1,219347,1920211,1909403,236990
1069M02_01_41_13,733,8,7,1,219347,1951392,1940584,236990
1069M02_01_41_14,732,8,7,1,219347,1981711,1970903,236990
1069M02_01_41_15,731,8,7,1,219347,2011997,2001189,236990
1069M02_01_41_16,730,8,7,1,219347,2041246,2030438,236990
1069M02_01_12_01,729,8,7,1,242048,31048,20240,236990
1069M02_01_12_02,728,8,7,1,242048,60595,49787,236990
1069M02_01_12_03,727,8,7,1,242048,91377,80569,236990
1069M02_01_12_04,726,8,7,1,242048,121147,110339,236990
1069M02_01_12_05,725,8,7,1,242048,151889,141081,236990
1069M02_01_12_06,724,8,7,1,242048,182278,171470,236990
1069M02_01_12_07,723,8,7,1,242048,212452,201644,236990
1069M02_01_12_08,722,8,7,1,242048,242880,232072,236990
1069M02_01_12_09,721,8,7,1,242048,273824,263016,236990
1069M02_01_12_10,720,8,7,1,242048,303630,292822,236990
1069M02_01_12_11,719,8,7,1,242048,334223,323415,236990
1069M02_01_12_12,718,8,7,1,242048,365075,354267,236990
1069M02_01_12_13,717,8,7,1,242048,396359,385551,236990
1069M02_01_12_14,716,8,7,1,242048,426437,415629,236990
1069M02_01_12_15,715,8,7,1,242048,456331,445523,236990
1069M02_01_12_16,714,8,7,1,242048,488190,477382,236990
1069M02_01_12_17,713,8,7,1,242048,517826,507018,236990
1069M02_01_22_01,712,8,7,1,242048,548997,538189,236990
1069M02_01_22_02,711,8,7,1,242048,579010,568202,236990
1069M02_01_22_03,710,8,7,1,242048,609659,598851,236990
1069M02_01_22_04,709,8,7,1,242048,640419,629611,236990
1069M02_01_22_05,708,8,7,1,242048,671882,661074,236990
1069M02_01_22_06,707,8,7,1,242048,701758,690950,236990
1069M02_01_22_07,706,8,7,1,242048,732293,721485,236990
1069M02_01_22_08,705,8,7,1,242048,762346,751538,236990
1069M02_01_22_09,704,8,7,1,242048,794033,783225,236990
1069M02_01_22_10,703,8,7,1,242048,823405,812597,236990
1069M02_01_22_11,702,8,7,1,242048,853356,842548,236990
1069M02_01_22_12,701,8,7,1,242048,884553,873745,236990
1069M02_01_22_13,700,8,7,1,242048,914542,903734,236990
1069M02_01_22_14,699,8,7,1,242048,945451,934643,236990
1069M02_01_22_15,698,8,7,1,242048,975287,964479,236990
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
using OnlineStore;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
......@@ -40,7 +40,7 @@ namespace DeviceLibrary
Config = _Config;
mainMachine = _mainMachine;
Msg = MsgService.MSList[mainMachine.MachineSide];
MoveInfo = new MoveInfo("出入库机构", _mainMachine.MachineSide, false);
MoveInfo = new MoveInfo(crc.GetString("Res0123","出入库机构"), _mainMachine.MachineSide, false);
To = null;
From = null;
#region 初始化伺服轴
......@@ -131,7 +131,7 @@ namespace DeviceLibrary
if (!IgnoreX09 && !MoveInfo.MoveParam.ReelOnFixture && IOManager.IOValue(SIO_Type.TrayCheck_Fixture,Config).Equals(IO_VALUE.HIGH))
{
if (!IgnoreX09 && IOMonitor.IODebound(SIO_Type.TrayCheck_Fixture, Config, IO_VALUE.HIGH, 5000))
Msg.add(string.Format("出入库时料叉{0}检测到有物料无法继续,请检查.",Config.DIList[SIO_Type.TrayCheck_Fixture].ElectricalDefinition), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
Msg.add(string.Format(crc.GetString("Res0124","出入库时料叉{0}检测到有物料无法继续,请检查."),Config.DIList[SIO_Type.TrayCheck_Fixture].ElectricalDefinition), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
}
else
{
......@@ -196,7 +196,7 @@ namespace DeviceLibrary
DoorControl.Invoke(false);
if (!IgnoreX09 && IOManager.IOValue(SIO_Type.TrayCheck_Fixture,Config).Equals(IO_VALUE.LOW))
{
Msg.add(string.Format("出库时料叉{0}没有检测到物料无法继续,请检查.", Config.DIList[SIO_Type.TrayCheck_Fixture].ElectricalDefinition), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
Msg.add(string.Format(crc.GetString("Res0125","出库时料叉{0}没有检测到物料无法继续,请检查."), Config.DIList[SIO_Type.TrayCheck_Fixture].ElectricalDefinition), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
}
else
{
......@@ -253,13 +253,13 @@ namespace DeviceLibrary
case MoveStep.StoreTS11:
if (To.posid==BoxStorePosition.ngdoor) {
if (IOManager.IOValue(SIO_Type.Door_Tray_Check, Config).Equals(IO_VALUE.HIGH)) {
Msg.add("单料门口有料无法放料.", MsgLevel.info);
Msg.add(crc.GetString("Res0126","单料门口有料无法放料."), MsgLevel.info);
MoveInfo.log($"单料门口有料无法放料");
return false;
}
if (!DoorControl.Invoke(true))
{
Msg.add("等待单料口门开启.", MsgLevel.info);
Msg.add(crc.GetString("Res0127","等待单料口门开启."), MsgLevel.info);
MoveInfo.log($"等待单料口门开启");
return false;
}
......@@ -288,7 +288,7 @@ namespace DeviceLibrary
RobotManage.CameraA.CameraGrabOne(RobotManage.CameraA.GetFixtureStateFilename(To.posid, WareCode, storeMoveType, FixtureState.ToOut));
if (!IgnoreX09 && IOManager.IOValue(SIO_Type.TrayCheck_Fixture,Config).Equals(IO_VALUE.HIGH))
{
Msg.add(string.Format("入库后料叉{0}上任然检测到物料,请检查.", Config.DIList[SIO_Type.TrayCheck_Fixture].ElectricalDefinition), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
Msg.add(string.Format(crc.GetString("Res0128","入库后料叉{0}上任然检测到物料,请检查."), Config.DIList[SIO_Type.TrayCheck_Fixture].ElectricalDefinition), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
}
else
{
......@@ -351,4 +351,4 @@ namespace DeviceLibrary
return RobotManage.CameraA;
}
}
}
}
\ No newline at end of file
DeviceLibrary/theMachine/LabelParam.cs
using CodeLibrary;
using CodeLibrary;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
......@@ -98,12 +98,12 @@ namespace DeviceLibrary
{
if (IsNg)
{
return "入库NG"+ $":{NgMsg}[{WareCode}]";
return crc.GetString("Res0129","入库NG")+ $":{NgMsg}[{WareCode}]";
}
else
{
return "库位号" + $":[{PosID}][{WareCode}] ";
return crc.GetString("Res0130","库位号") + $":[{PosID}][{WareCode}] ";
}
}
......@@ -217,4 +217,4 @@ namespace DeviceLibrary
{
NGDoor
}
}
}
\ No newline at end of file
DeviceLibrary/theMachine/MainMachine _BtnProcess.cs
using CodeLibrary;
using CodeLibrary;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
......@@ -22,16 +22,16 @@ namespace DeviceLibrary
{
if (IOValue(IO_Type.SuddenStop_BTN, Config).Equals(IO_VALUE.HIGH))
{
MsgService.Add("按下复位按钮.", MsgLevel.info, ErrInfo.ResetBtn);
MsgService.Add(crc.GetString("Res0131","按下复位按钮."), MsgLevel.info, ErrInfo.ResetBtn);
if (!RobotManage.isRunning)
RobotManage.Start(MachineSideE.Left | MachineSideE.Right);
}
else
{
MsgService.Add("急停未解除,按下复位按钮尝试复位安全继电器.", MsgLevel.info, ErrInfo.SuddenStop);
MsgService.Add(crc.GetString("Res0132","急停未解除,按下复位按钮尝试复位安全继电器."), MsgLevel.info, ErrInfo.SuddenStop);
}
LogUtil.info("按下复位按钮");
}
}
}
}
\ No newline at end of file
DeviceLibrary/theMachine/MainMachine _LedProcess.cs
using CodeLibrary;
using OnlineStore;
using CodeLibrary;
using Newtonsoft.Json;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
......@@ -67,19 +68,19 @@ namespace DeviceLibrary
{
MachineLedState.Clear();
//系统报警并停止,红亮
MachineLedStateName[MachineLedStateE.AlarmStop] = "停机报警";
MachineLedStateName[MachineLedStateE.AlarmStop] = crc.GetString("ledstate_AlarmStop","停机报警");
MachineLedState.Add(MachineLedStateE.AlarmStop, nls(LedState.on, LedState.off, LedState.off));
//系统运行时报警, 绿亮,红闪
MachineLedStateName[MachineLedStateE.Alarm] = "报警";
MachineLedStateName[MachineLedStateE.Alarm] = crc.GetString("ledstate_Alarm","报警");
MachineLedState.Add(MachineLedStateE.Alarm, nls(LedState.blink, LedState.off, LedState.on));
//系统复位中 绿闪
MachineLedStateName[MachineLedStateE.HomeReset] = "复位";
MachineLedStateName[MachineLedStateE.HomeReset] = crc.GetString("ledstate_HomeReset","复位");
MachineLedState.Add(MachineLedStateE.HomeReset, nls(LedState.off, LedState.off, LedState.blink));
//系统正常运行
MachineLedStateName[MachineLedStateE.Running] = "运行";
MachineLedStateName[MachineLedStateE.Running] = crc.GetString("ledstate_Running","运行");
MachineLedState.Add(MachineLedStateE.Running, nls(LedState.none, LedState.none, LedState.on));
//系统暂停, 绿闪,红闪
MachineLedStateName[MachineLedStateE.SystemPause] = "暂停";
MachineLedStateName[MachineLedStateE.SystemPause] = crc.GetString("ledstate_SystemPause","暂停");
MachineLedState.Add(MachineLedStateE.SystemPause, nls(LedState.blink, LedState.off, LedState.blink));
//温湿度超限30分钟. 红闪,黄闪
//MachineLedStateName[MachineLedStateE.THoutRangeOver30m] = "温湿度超限30分钟";
......@@ -88,7 +89,7 @@ namespace DeviceLibrary
// MachineLedStateName[MachineLedStateE.THoutRange] = "温湿度超限";
//MachineLedState.Add(MachineLedStateE.THoutRange, nls(LedState.none, LedState.blink, LedState.blink));
//进出库, 绿亮,黄闪
MachineLedStateName[MachineLedStateE.InOut] = "出入库中";
MachineLedStateName[MachineLedStateE.InOut] = crc.GetString("ledstate_InOut","出入库中");
MachineLedState.Add(MachineLedStateE.InOut, nls(LedState.none, LedState.blink, LedState.on));
}
Dictionary<LedColor, LedState> nls(LedState AlarmLedstate, LedState StandbyLedstate, LedState RunningLedstate) {
......@@ -218,4 +219,4 @@ namespace DeviceLibrary
THoutRange,
InOut,
}
}
}
\ No newline at end of file
DeviceLibrary/theMachine/MainMachine.cs
using OnlineStore;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
......@@ -141,7 +141,7 @@ namespace DeviceLibrary
isInSuddenDown = IOValue(IO_Type.SuddenStop_BTN, Config).Equals(IO_VALUE.LOW);
if (UserPause)
{
MsgService.Add("系统暂停", MsgLevel.warning);
MsgService.Add(crc.GetString("Res0133","系统暂停"), MsgLevel.warning);
DeviceSuddenStop();
lastSafeCheckStatus = false;
ok = false;
......@@ -149,7 +149,7 @@ namespace DeviceLibrary
}
else if (isInSuddenDown)
{
MsgService.Add("急停中", MsgLevel.alarm);
MsgService.Add(crc.GetString("Res0134","急停中"), MsgLevel.alarm);
ok = false;
}
......@@ -182,4 +182,4 @@ namespace DeviceLibrary
}
}
}
}
}
\ No newline at end of file
DeviceLibrary/theMachine/RobotManage.cs
using OnlineStore;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
......@@ -76,7 +76,7 @@ namespace DeviceLibrary
if (!IOManager.ConnectionIOList(new List<string>()))
{
IsLoadOk = false;
msg += "IO板卡初始化失败"+ "\n";
msg += crc.GetString("Res0135","IO板卡初始化失败")+ "\n";
}
//if (!CameraA.LoadCameraConfig("CameraA", out string errmsg))
//{
......@@ -85,7 +85,7 @@ namespace DeviceLibrary
//}
if (!HumitureController.Init(Setting_Init.Device_Humiture_Port)) {
IsLoadOk = false;
msg += "温湿度传感器初始化失败,端口:"+ Setting_Init.Device_Humiture_Port+"\n";
msg += crc.GetString("Res0136","温湿度传感器初始化失败,端口:")+ Setting_Init.Device_Humiture_Port+"\n";
}
IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH,Config);
......@@ -97,7 +97,7 @@ namespace DeviceLibrary
LoadFinishEvent?.Invoke(IsConfigMode ? IsConfigMode : IsLoadOk, msg);
}
public static void LoadDebug() {
LoadFinishEvent?.Invoke(true, "打开调试模式");
LoadFinishEvent?.Invoke(true, crc.GetString("Res0137","打开调试模式"));
}
public static void Start(MachineSideE machineSide) {
//Init();
......@@ -205,4 +205,4 @@ namespace DeviceLibrary
public enum StoreType {
TypeA,TypeB
}
}
}
\ No newline at end of file
DeviceLibrary/theMachine/Store/MainMachine _IOMonitor.cs
using CodeLibrary;
using CodeLibrary;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
......@@ -23,11 +23,11 @@ namespace DeviceLibrary
{
if (IOValue(IO_Type.SuddenStop_BTN, Config).Equals(IO_VALUE.HIGH))
{
MsgService.Add("按下复位按钮.", MsgLevel.info, ErrInfo.ResetBtn);
MsgService.Add(crc.GetString("Res0131","按下复位按钮."), MsgLevel.info, ErrInfo.ResetBtn);
}
else
{
MsgService.Add("急停未解除,按下复位按钮尝试复位安全继电器.", MsgLevel.info, ErrInfo.SuddenStop);
MsgService.Add(crc.GetString("Res0132","急停未解除,按下复位按钮尝试复位安全继电器."), MsgLevel.info, ErrInfo.SuddenStop);
}
LogUtil.info("按下复位按钮");
......@@ -40,4 +40,4 @@ namespace DeviceLibrary
}
}
}
}
}
\ No newline at end of file
DeviceLibrary/theMachine/Store/StoreMachine.cs
using OnlineStore;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.DeviceLibrary;
using OnlineStore.LoadCSVLibrary;
......@@ -109,10 +109,10 @@ namespace DeviceLibrary
Msg = new MsgService(MachineSide);
Name = machineSide.ToString() + "-SISO";
crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
StoreMoveInfo = new MoveInfo("进出库调度",machineSide);
StoreMoveInfo = new MoveInfo(crc.GetString("Res0138","进出库调度"),machineSide);
StoreMoveInfo.SetStateDelegate(StoreState);
ResetMoveInfo = new MoveInfo("重置", machineSide);
AIOTMoveInfo = new MoveInfo("出入库测试", machineSide);
ResetMoveInfo = new MoveInfo(crc.GetString("Res0139","重置"), machineSide);
AIOTMoveInfo = new MoveInfo(crc.GetString("Res0140","出入库测试"), machineSide);
ServerCM = new ServerCommunication(this);
ServerCM.InStoreEvent += ServerCM_InStoreEvent1;
ServerCM.OutStoreEvent += ServerCM_OutStoreEvent;
......@@ -146,7 +146,7 @@ namespace DeviceLibrary
}
else
{
msg += Name+ "找不到库位配置文件" + "\n";
msg += Name+ crc.GetString("Res0141","找不到库位配置文件") + "\n";
}
string fixpositionConfigFile = Path.Combine(baseDir, "StoreConfig\\" + machineSide.ToString() + "\\fixPositions.csv");
if (File.Exists(fixpositionConfigFile))
......@@ -215,9 +215,9 @@ namespace DeviceLibrary
}
private void Crc_LanguageChangeEvent(object sender, EventArgs e)
{
StoreMoveInfo.Name = "进出库调度";
ResetMoveInfo.Name = "重置";
AIOTMoveInfo.Name = "出入库测试";
StoreMoveInfo.Name = crc.GetString("Res0138","进出库调度");
ResetMoveInfo.Name = crc.GetString("Res0139","重置");
AIOTMoveInfo.Name = crc.GetString("Res0140","出入库测试");
}
private (bool, string) InOut_Axis_interference(int from, int to)
{
......@@ -231,7 +231,7 @@ namespace DeviceLibrary
return (false, "");
}
else
return (true, "单料门没有打开进出轴无法伸出");
return (true, crc.GetString("Res0142","单料门没有打开进出轴无法伸出"));
return (false, "");
}
private (bool, string) Middle_Axis_interference(int from, int to)
......@@ -242,7 +242,7 @@ namespace DeviceLibrary
if (InOut_Axis.IsInPosition(Config.InOut_P1))
return (false, "");
return (true, "进出轴不在待机点时无法移动旋转轴");
return (true, crc.GetString("Res0143","进出轴不在待机点时无法移动旋转轴"));
}
private (bool, string) UpDown_Axis_interference(int from, int to)
......@@ -253,7 +253,7 @@ namespace DeviceLibrary
if (InOut_Axis.IsInPosition(Config.InOut_P1))
return (false, "");
return (true, "进出轴不在待机点时无法移动升降轴");
return (true, crc.GetString("Res0144","进出轴不在待机点时无法移动升降轴"));
}
public volatile bool hasAlarm = false;
/// <summary>
......@@ -416,7 +416,7 @@ namespace DeviceLibrary
case MoveStep.H07_HomeReset:
if (IOValue(SIO_Type.Door_Tray_Check, Config).Equals(IO_VALUE.HIGH))
{
Msg.add("回原时舱门口有料无法继续", MsgLevel.alarm);
Msg.add(crc.GetString("Res0145","回原时舱门口有料无法继续"), MsgLevel.alarm);
}
else {
ResetMoveInfo.NextMoveStep(MoveStep.H08_HomeReset);
......@@ -438,7 +438,7 @@ namespace DeviceLibrary
ResetMoveInfo.NextMoveStep(MoveStep.H11_HomeReset);
if (IOValue(SIO_Type.Door_Tray_Check, Config).Equals(IO_VALUE.HIGH))
{
Msg.add("回原时舱门口有料无法继续", MsgLevel.alarm);
Msg.add(crc.GetString("Res0145","回原时舱门口有料无法继续"), MsgLevel.alarm);
}
else
{
......@@ -486,7 +486,7 @@ namespace DeviceLibrary
bool lastSafeCheckStatus = true;
bool SafeCheck() {
bool ok = true;
var ignorestring = "[" + "已忽略" + "]";
var ignorestring = "[" + crc.GetString("Res0146","已忽略") + "]";
if (IOValue(IO_Type.BackDoor_Check,MainConfig).Equals(IO_VALUE.LOW))
{
if (!IgnoreSafecheck)// && IOValue(IO_Type.NGDoor_Open).Equals(IO_VALUE.HIGH))
......@@ -494,7 +494,7 @@ namespace DeviceLibrary
ok = false;
UserPause = true;
}
Msg.add("后维护被打开" + (ok ? ignorestring : ""), MsgLevel.warning);
Msg.add(crc.GetString("Res0147","后维护被打开") + (ok ? ignorestring : ""), MsgLevel.warning);
}
if (!lastSafeCheckStatus && ok)
{
......@@ -528,7 +528,7 @@ namespace DeviceLibrary
isInSuddenDown = IOValue(IO_Type.SuddenStop_BTN,RobotManage.Config).Equals(IO_VALUE.LOW);
if (UserPause)
{
Msg.add("系统暂停", MsgLevel.warning);
Msg.add(crc.GetString("Res0133","系统暂停"), MsgLevel.warning);
DeviceSuddenStop();
lastSafeCheckStatus = false;
ok = false;
......@@ -537,18 +537,18 @@ namespace DeviceLibrary
else if (isInSuddenDown)
{
Alarm(AlarmType.SuddenStop);
Msg.add("急停中", MsgLevel.alarm);
Msg.add(crc.GetString("Res0134","急停中"), MsgLevel.alarm);
ok = false;
}
else if (alarmType != AlarmType.None) {
{
Msg.add("系统需要重置", MsgLevel.alarm,ErrInfo.SuddenStop);
Msg.add(crc.GetString("Res0148","系统需要重置"), MsgLevel.alarm,ErrInfo.SuddenStop);
ok = false;
}
}
if (AutoInOutTestMode)
{
Msg.add("进出库调试模式", MsgLevel.info);
Msg.add(crc.GetString("Res0149","进出库调试模式"), MsgLevel.info);
//ok = false;
}
......@@ -563,7 +563,7 @@ namespace DeviceLibrary
if (AxisManager.GetAlarmStatus(configMoveAxis.DeviceName, configMoveAxis.GetAxisValue()) == 1)
{
Msg.add(crc.GetString(configMoveAxis.ProName, configMoveAxis.Explain) + $"[{configMoveAxis.GetAxisValue()}]:"
+ "运动报警", MsgLevel.alarm, ErrInfo.SuddenStop);
+ crc.GetString("Res0150","运动报警"), MsgLevel.alarm, ErrInfo.SuddenStop);
ok = false;
}
}
......@@ -577,4 +577,4 @@ namespace DeviceLibrary
LogUtil.info("按下X09忽略");
}
}
}
}
\ No newline at end of file
DeviceLibrary/theMachine/Store/StoreMachine_AutoInOutTest.cs
using CodeLibrary;
using CodeLibrary;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
......@@ -18,7 +18,7 @@ namespace DeviceLibrary
errmsg = "";
if (!boxTransport.IsComplateOrFree)
{
errmsg = "料仓忙碌中,无法启动";
errmsg = crc.GetString("Res0151","料仓忙碌中,无法启动");
return false;
}
AutoInOutTest = true;
......@@ -35,11 +35,11 @@ namespace DeviceLibrary
{
if (!boxTransport.IgnoreX09 && IOMonitor.IODebound(SIO_Type.TrayCheck_Fixture, Config, IO_VALUE.HIGH, 5000))
{
errmsg = "收到出库任务,但料叉上有料,无法启动,请检查";
errmsg = crc.GetString("Res0152","收到出库任务,但料叉上有料,无法启动,请检查");
}
else
errmsg = "收到出库任务,但料叉上有料,无法启动,请检查";
errmsg = crc.GetString("Res0152","收到出库任务,但料叉上有料,无法启动,请检查");
return false;
}
else
......@@ -51,7 +51,7 @@ namespace DeviceLibrary
}
else {
errmsg = "料仓正在出入库中,无法出库";
errmsg = crc.GetString("Res0153","料仓正在出入库中,无法出库");
}
return true;
......@@ -110,7 +110,7 @@ namespace DeviceLibrary
}
else
{
Msg.add("单料口等待料盘离开.", MsgLevel.info);
Msg.add(crc.GetString("Res0154","单料口等待料盘离开."), MsgLevel.info);
}
break;
case MoveStep.StoreIn03:
......@@ -120,7 +120,7 @@ namespace DeviceLibrary
AIOTMoveInfo.log($"入库料盘已准备好");
}
else {
Msg.add("请放入第二盘料.", MsgLevel.warning);
Msg.add(crc.GetString("Res0155","请放入第二盘料."), MsgLevel.warning);
}
break;
case MoveStep.StoreIn04:
......@@ -154,7 +154,7 @@ namespace DeviceLibrary
}
else
{
Msg.add("单料口等待料盘离开.", MsgLevel.info);
Msg.add(crc.GetString("Res0154","单料口等待料盘离开."), MsgLevel.info);
}
break;
case MoveStep.StoreIn06:
......@@ -279,4 +279,4 @@ namespace DeviceLibrary
}
}
}
}
}
\ No newline at end of file
DeviceLibrary/theMachine/Store/StoreMachine_Store.cs
using CodeLibrary;
using CodeLibrary;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
......@@ -38,11 +38,10 @@ namespace DeviceLibrary
{
if (!boxTransport.IgnoreX09 && IOMonitor.IODebound(SIO_Type.TrayCheck_Fixture, Config, IO_VALUE.HIGH, 5000))
{
Msg.add("收到出库任务,但料叉上有料,无法启动,请检查", MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
Msg.add(crc.GetString("Res0152","收到出库任务,但料叉上有料,无法启动,请检查"), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
}
else
Msg.add("收到出库任务,但料叉上有料,无法启动,请检查", MsgLevel.warning);
Msg.add(crc.GetString("Res0152","收到出库任务,但料叉上有料,无法启动,请检查"), MsgLevel.warning);
return;
}
else
......@@ -74,7 +73,7 @@ namespace DeviceLibrary
case MoveStep.StoreIn01:
if (!ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.InStoreExecute))
{
Msg.add("服务器连接异常", MsgLevel.warning);
Msg.add(crc.GetString("Res0156","服务器连接异常"), MsgLevel.warning);
return;
}
StoreMoveInfo.NextMoveStep(MoveStep.StoreIn02);
......@@ -92,7 +91,7 @@ namespace DeviceLibrary
}
else
{
Msg.add("单料口等待料盘离开.", MsgLevel.info);
Msg.add(crc.GetString("Res0154","单料口等待料盘离开."), MsgLevel.info);
}
break;
case MoveStep.StoreIn04:
......@@ -100,7 +99,7 @@ namespace DeviceLibrary
{
if (!ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.InStoreEnd))
{
Msg.add("服务器连接异常", MsgLevel.warning);
Msg.add(crc.GetString("Res0156","服务器连接异常"), MsgLevel.warning);
return;
}
StoreMoveInfo.log($"料盘已到达目的地");
......@@ -108,7 +107,7 @@ namespace DeviceLibrary
}
else
{
Msg.add("等待料盘送到指定位置.", MsgLevel.info);
Msg.add(crc.GetString("Res0157","等待料盘送到指定位置."), MsgLevel.info);
}
break;
case MoveStep.StoreIn05:
......@@ -121,7 +120,7 @@ namespace DeviceLibrary
case MoveStep.StoreOut10:
if (!ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.OutStoreExecute))
{
Msg.add("服务器连接异常", MsgLevel.warning);
Msg.add(crc.GetString("Res0156","服务器连接异常"), MsgLevel.warning);
return;
}
StoreMoveInfo.NextMoveStep(MoveStep.StoreOut11);
......@@ -137,7 +136,7 @@ namespace DeviceLibrary
boxTransport.Pause();
if (!ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.OutStoreBoxEnd))
{
Msg.add("服务器连接异常", MsgLevel.warning);
Msg.add(crc.GetString("Res0156","服务器连接异常"), MsgLevel.warning);
return;
}
StoreMoveInfo.NextMoveStep(MoveStep.StoreOut12);
......@@ -145,7 +144,7 @@ namespace DeviceLibrary
}
else
{
Msg.add("等待料盘到达.", MsgLevel.info);
Msg.add(crc.GetString("Res0158","等待料盘到达."), MsgLevel.info);
}
break;
case MoveStep.StoreOut12:
......@@ -154,13 +153,13 @@ namespace DeviceLibrary
{
if (IOValue(SIO_Type.Door_Tray_Check, Config).Equals(IO_VALUE.LOW))
{
Msg.add("单料门口没有检测到出库料盘" + "," + "出库库位号:" + StoreMoveInfo.MoveParam.PosID, MsgLevel.alarm);
Msg.add(crc.GetString("Res0159","单料门口没有检测到出库料盘") + "," + crc.GetString("Res0160","出库库位号:") + StoreMoveInfo.MoveParam.PosID, MsgLevel.alarm);
UserPause = true;
return;
}
if (!ServerCM.SendStoreState(StoreMoveInfo.MoveParam.PosID, StoreStatus.OutStoreEnd))
{
Msg.add("服务器连接异常", MsgLevel.warning);
Msg.add(crc.GetString("Res0156","服务器连接异常"), MsgLevel.warning);
return;
}
StoreMoveInfo.NextMoveStep(MoveStep.StoreOut13);
......@@ -176,10 +175,10 @@ namespace DeviceLibrary
}
else if (StoreMoveInfo.IsTimeOut(30))
{
Msg.add("等聊单料门料盘被取走", MsgLevel.alarm);
Msg.add(crc.GetString("Res0161","等聊单料门料盘被取走"), MsgLevel.alarm);
}
else
Msg.add("等聊单料门料盘被取走", MsgLevel.info);
Msg.add(crc.GetString("Res0161","等聊单料门料盘被取走"), MsgLevel.info);
break;
default:
StoreMoveInfo.log($"未找到对应步骤:{StoreMoveInfo.MoveStep}");
......@@ -187,17 +186,17 @@ namespace DeviceLibrary
}
}
string StoreState() {
string state = "空闲中";
string state = crc.GetString("Res0162","空闲中");
if (StoreMoveInfo.MoveStep >= MoveStep.StoreOut10)
{
state = "出库中"+":"+StoreMoveInfo.MoveParam.PosID;
state = crc.GetString("Res0163","出库中")+":"+StoreMoveInfo.MoveParam.PosID;
}
else if (StoreMoveInfo.MoveStep >= MoveStep.StoreIn01)
{
state = "入库中"+":"+StoreMoveInfo.MoveParam.PosID;
state = crc.GetString("Res0164","入库中")+":"+StoreMoveInfo.MoveParam.PosID;
}
return state;
}
}
}
}
\ No newline at end of file
DeviceLibrary/userControl/AxisMoveControl.cs
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
......@@ -78,7 +78,7 @@ namespace DeviceLibrary
{
if (axis == null)
{
MessageBox.Show("请先选择运动轴", "警告 ", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show(crc.GetString("Res0165","请先选择运动轴"), crc.GetString("Res0166","警告 "), MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
......@@ -291,7 +291,7 @@ namespace DeviceLibrary
int speed = Convert.ToInt32(comjSpeed.Text);
if (speed <= 0)
{
MessageBox.Show("提示", "请先输入正确的速度");
MessageBox.Show(crc.GetString("Res0167","提示"), crc.GetString("Res0168","请先输入正确的速度"));
return;
}
btnAddMove.BackColor = Color.Green;
......@@ -320,7 +320,7 @@ namespace DeviceLibrary
int speed = Convert.ToInt32(comjSpeed.Text);
if (speed <= 0)
{
MessageBox.Show("提示", "请先输入正确的速度");
MessageBox.Show(crc.GetString("Res0167","提示"), crc.GetString("Res0168","请先输入正确的速度"));
return;
}
btnDelMove.BackColor = Color.Green;
......@@ -353,7 +353,7 @@ namespace DeviceLibrary
}
private void ReadAxisStatus()
{
groupBox2.Text = cmbAxis.Text + "-"+"状态监控";
groupBox2.Text = cmbAxis.Text + "-"+crc.GetString("Res0169","状态监控");
//【1】更新轴号
short axisNo = SlvAddr;
if (axisNo < 0)
......@@ -424,7 +424,7 @@ namespace DeviceLibrary
lbl.BackColor = Color.Red ;
lblAlarmcode.Visible = true;
lblAlarmcode.ForeColor = Color.Red;
lblAlarmcode.Text = "错误码：" + HCBoardManager.GetAxErrCode(SlvAddr);
lblAlarmcode.Text = crc.GetString("Res0170","错误码：") + HCBoardManager.GetAxErrCode(SlvAddr);
}
else
{
......@@ -445,4 +445,4 @@ namespace DeviceLibrary
}
}
}
}
}
\ No newline at end of file
DeviceLibrary/userControl/AxisTipControl.cs
using DeviceLibrary;
using DeviceLibrary;
using HuichuanLibrary;
using OnlineStore;
using OnlineStore.Common;
......@@ -75,11 +75,11 @@ public partial class AxisTipControl : Form
AxisSts sts = HCBoardManager.GetAxisSts(SlvAddr);
if (sts.ServoOn < 0)
{
showToolTip("伺服尚未使能",c);
showToolTip(crc.GetString("Res0171","伺服尚未使能"),c);
return;
}
if (sts.ALM != 0 || sts.WARN != 0 || sts.EMG != 0) {
showToolTip("伺服警报状态中",c);
showToolTip(crc.GetString("Res0172","伺服警报状态中"),c);
return;
}
readPosition();
......@@ -137,7 +137,7 @@ public partial class AxisTipControl : Form
void showToolTip(string txt,Control control) {
var m_ToolTip = new ToolTip();
m_ToolTip.ToolTipIcon = ToolTipIcon.Warning;
m_ToolTip.ToolTipTitle = "无法操作";
m_ToolTip.ToolTipTitle = crc.GetString("Res0173","无法操作");
m_ToolTip.AutoPopDelay = 0;
m_ToolTip.AutomaticDelay = 0;
m_ToolTip.InitialDelay = 0;
......@@ -167,7 +167,7 @@ public partial class AxisTipControl : Form
int speed = Convert.ToInt32(comjSpeed.Text);
if (speed <= 0)
{
MessageBox.Show("提示", "请先输入正确的速度");
MessageBox.Show(crc.GetString("Res0167","提示"), crc.GetString("Res0168","请先输入正确的速度"));
return;
}
btnAddMove.BackColor = Color.Green;
......@@ -200,7 +200,7 @@ public partial class AxisTipControl : Form
int speed = Convert.ToInt32(comjSpeed.Text);
if (speed <= 0)
{
MessageBox.Show("提示", "请先输入正确的速度");
MessageBox.Show(crc.GetString("Res0167","提示"), crc.GetString("Res0168","请先输入正确的速度"));
return;
}
btnDelMove.BackColor = Color.Green;
......@@ -222,12 +222,12 @@ public partial class AxisTipControl : Form
AxisSts sts = HCBoardManager.GetAxisSts(SlvAddr);
if (sts.ServoOn < 0)
{
showToolTip("伺服尚未使能", (Control)sender);
showToolTip(crc.GetString("Res0171","伺服尚未使能"), (Control)sender);
return false;
}
if (sts.ALM != 0 || sts.WARN != 0 || sts.EMG != 0)
{
showToolTip("伺服警报状态中", (Control)sender);
showToolTip(crc.GetString("Res0172","伺服警报状态中"), (Control)sender);
return false;
}
return true;
......@@ -257,4 +257,3 @@ public partial class AxisTipControl : Form
SetRelList((int)comjSpeed.SelectedItem);
}
}
DeviceLibrary/userControl/FixtureSizeConfigControl.cs
using Newtonsoft.Json;
using OnlineStore;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
......@@ -37,7 +38,7 @@ namespace DeviceLibrary
if (string.IsNullOrWhiteSpace(textBox_startcode.Text))
{
MessageBox.Show("条码首字母不能为空");
MessageBox.Show(crc.GetString("Res0174","条码首字母不能为空"));
return;
}
FixtureConfig fixtureConfig = new FixtureConfig();
......@@ -75,8 +76,9 @@ namespace DeviceLibrary
public override string ToString()
{
return $"[{StartCode}]={Width}x{Height}"+ (UseActualHeight?$", "+"物理厚度"+$":{ActualHeight}":"") + (AbandonCode? ", "+"自动弃用" : "");
return $"[{StartCode}]={Width}x{Height}"+ (UseActualHeight?$", "+crc.GetString("Res0175","物理厚度")+$":{ActualHeight}":"") + (AbandonCode? ", "+crc.GetString("Res0176","自动弃用") : "");
}
public static bool GetFixtureHeight(int poswidth,int posheight, out int FixtureHeight) {
FixtureHeight = 0;
var fcc = FixtureConfigList.Find(fc => fc.Width == poswidth && fc.Height == posheight);
......@@ -99,7 +101,8 @@ namespace DeviceLibrary
} catch { }
}
public static void Add(FixtureConfig fixtureConfig) {
public static void Add(FixtureConfig fixtureConfig)
{
var fcc = FixtureConfigList.FindIndex(fc => fc.StartCode == fixtureConfig.StartCode);
if (fcc <0)
......@@ -123,4 +126,4 @@ namespace DeviceLibrary
}
}
}
}
\ No newline at end of file
LoadCVSLibrary/Program.cs
......@@ -15,9 +15,9 @@ namespace OnlineStore.LoadCSVLibrary
string configFile = Path.Combine(baseDir, "config\\Config.csv");
var Config = new Robot_Config(0, "", configFile);
Config = (Robot_Config)CSVConfigReader.LoadConfig<IO_Type>(Config);
var RConfig = new R_Config(0, "", Path.Combine(baseDir, "config\\Config_Right.csv"));
var RConfig = new R_Config(0, "", Path.Combine(baseDir, "config\\Right\\Config.csv"));
RConfig = (R_Config)CSVConfigReader.LoadConfig<SIO_Type>(RConfig);
var LConfig = new L_Config(0, "", Path.Combine(baseDir, "config\\Config_Left.csv"));
var LConfig = new L_Config(0, "", Path.Combine(baseDir, "config\\Left\\Config.csv"));
LConfig = (L_Config)CSVConfigReader.LoadConfig<SIO_Type>(LConfig);
Store_ConfigBase device = LConfig;
......
LoadCVSLibrary/storeConfig/ConfigItemBase.cs
......@@ -42,7 +42,16 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
[CSVAttribute("目标速度")]
public int TargetSpeed { get; set; }
/// <summary>
/// 目标速度
/// </summary>
[CSVAttribute("加速时间")]
public int AddSpeed { get; set; }
/// <summary>
/// 目标速度
/// </summary>
[CSVAttribute("减速时间")]
public int DelSpeed { get; set; }
public string ConfigStr { get; set; }
public override string ToString()
......@@ -80,12 +89,6 @@ namespace OnlineStore.LoadCSVLibrary
[CSVAttribute("目标速度")]
public new int TargetSpeed { get; set; }
[CSVAttribute("加速时间")]
public int AddSpeed { get; set; }
[CSVAttribute("减速时间")]
public int DelSpeed { get; set; }
[CSVAttribute("原点低速度")]
public int HomeLowSpeed { get; set; }
......
TheMachine/Form1.cs
using CodeLibrary;
using CodeLibrary;
using ConfigHelper;
using DeviceLibrary;
using OnlineStore;
......@@ -99,7 +99,7 @@ namespace TheMachine
AlarmBuzzer.BuzzerStateChange += AlarmBuzzer_BuzzerStateChange;
RobotManage.LoadFinishEvent += RobotManage_LoadFinishEvent;
if (!Setting_Init.Device_DisableLogWindow)
AddForm("tab_log", "日志", lc);
AddForm("tab_log", crc.GetString("Res0177","日志"), lc);
RobotManage.CameraA.camera_event += CameraA_camera_event;
......@@ -121,7 +121,7 @@ namespace TheMachine
});
}));
ListViewItem lvi = new ListViewItem(new string[] { "", DateTime.Now.ToString("HH:mm:ss"), "设备加载中,请稍后..." });
ListViewItem lvi = new ListViewItem(new string[] { "", DateTime.Now.ToString("HH:mm:ss"), crc.GetString("Res0178","设备加载中,请稍后...") });
lvi.ForeColor = Color.DarkGreen;
listViewL.Items.Add(lvi);
//while (!loadtask.IsCompleted) {
......@@ -170,10 +170,10 @@ namespace TheMachine
const int tabpagecount = 4;
void addTablePage() {
AddForm("tab_io","IO调试", ioc);
AddForm("tab_leftMachine", "左侧料仓", leftMachine);
AddForm("tab_rightMachine", "右侧料仓", rightMachine);
AddForm("tab_sc","通用设置", sc);
AddForm("tab_io",crc.GetString("Form1_tabc_tab_io_Text","IO调试"), ioc);
AddForm("tab_leftMachine", crc.GetString("Form1_tabc_tabP1_pnl_gb_left_Text","左侧料仓"), leftMachine);
AddForm("tab_rightMachine", crc.GetString("Form1_tabc_tabP1_pnl_gb_right_Text","右侧料仓"), rightMachine);
AddForm("tab_sc",crc.GetString("Form1_tabc_tab_sc_Text","通用设置"), sc);
crc.LanguageProcess(this);
}
......@@ -186,7 +186,7 @@ namespace TheMachine
RobotManage.Stores.ForEach(s=> {
if (Config.Get<bool>($"Device_{s.MachineSide}_Disable")) {
MsgService.MSList[s.MachineSide].add("料仓已被禁用", MsgLevel.warning);
MsgService.MSList[s.MachineSide].add(crc.GetString("Res0179","料仓已被禁用"), MsgLevel.warning);
MainMachine_ProcessMsgEvent(MsgService.MSList[s.MachineSide].get());
}
});
......@@ -244,7 +244,7 @@ namespace TheMachine
{
RobotManage.IsConfigMode = RobotManage.IsConfigMode ? false : true;
(sender as ToolStripMenuItem).Text = !RobotManage.IsConfigMode ? "启用配置模式" : "停用配置模式";
(sender as ToolStripMenuItem).Text = !RobotManage.IsConfigMode ? crc.GetString("Res0180","启用配置模式") : crc.GetString("Res0181","停用配置模式");
if (RobotManage.IsConfigMode)
......@@ -376,7 +376,7 @@ namespace TheMachine
{
if (RobotManage.mainMachine.IOValue(IO_Type.SuddenStop_BTN,RobotManage.Config).Equals(IO_VALUE.LOW))
{
MsgService.Add("急停中,无法启动", MsgLevel.warning);
MsgService.Add(crc.GetString("Res0182","急停中,无法启动"), MsgLevel.warning);
MainMachine_ProcessMsgEvent(MsgService.Get());
return;
}
......@@ -408,7 +408,7 @@ namespace TheMachine
private void 退出ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (RobotManage.isRunning) {
MessageBox.Show("机器尚在运行,不能退出,请先停止运行.");
MessageBox.Show(crc.GetString("Res0183","机器尚在运行,不能退出,请先停止运行."));
} else {
RobotManage.Stop();
RobotManage.ShutDown();
......@@ -507,14 +507,14 @@ namespace TheMachine
crc.LanguageProcess(this, this.GetType().Name);
crc.ProcessListItem(menuStrip1.Items, "menuStrip1");
listViewL.Columns[1].Text = "时间";
listViewL.Columns[2].Text = "信息";
listViewL.Columns[1].Text = crc.GetString("Res0184","时间");
listViewL.Columns[2].Text = crc.GetString("Form1_tabc_tabP1_Text","信息");
stateViewL.Columns[1].Text = "模块";
stateViewL.Columns[2].Text = "步骤";
stateViewL.Columns[3].Text = "信息";
stateViewL.Columns[1].Text = crc.GetString("Res0185","模块");
stateViewL.Columns[2].Text = crc.GetString("Res0186","步骤");
stateViewL.Columns[3].Text = crc.GetString("Form1_tabc_tabP1_Text","信息");
启用调试模式ToolStripMenuItem.Text = !RobotManage.IsConfigMode ? "启用配置模式" : "停用配置模式";
启用调试模式ToolStripMenuItem.Text = !RobotManage.IsConfigMode ? crc.GetString("Res0180","启用配置模式") : crc.GetString("Res0181","停用配置模式");
}
......@@ -536,4 +536,4 @@ namespace TheMachine
crc.LanguageChange();
}
}
}
}
\ No newline at end of file
TheMachine/SettingControl.cs
using CodeLibrary;
using CodeLibrary;
using ConfigHelper;
using DeviceLibrary;
using OnlineStore;
......@@ -87,15 +87,15 @@ namespace TheMachine
if (!Visible)
return;
lbl_hmdstate.Text = "当前状态:";
lbl_hmdstate.Text = crc.GetString("Res0187","当前状态:");
if (!HumitureController.IsRun)
{
lbl_hmdstate.Text += "未成功连接";
lbl_hmdstate.Text += crc.GetString("Res0188","未成功连接");
return;
}
var t = HumitureController.LastData;
lbl_hmdstate.Text += "温度"+$"{t.Temperate}℃, "+"湿度"+$"{t.Humidity}%";
lbl_hmdstate.Text += crc.GetString("Res0189","温度")+$"{t.Temperate}℃, "+crc.GetString("Res0190","湿度")+$"{t.Humidity}%";
}
}
}
}
\ No newline at end of file
TheMachine/StoreSettingControl.cs
using CodeLibrary;
using CodeLibrary;
using ConfigHelper;
using DeviceLibrary;
using OnlineStore;
......@@ -49,7 +49,7 @@ namespace TheMachine
{
if (RobotManage.isRunning)
{
MessageBox.Show("运行库位校准程序前,需要先停止料仓的运行");
MessageBox.Show(crc.GetString("Res0191","运行库位校准程序前,需要先停止料仓的运行"));
}
else
{
......@@ -65,4 +65,4 @@ namespace TheMachine
}
}
}
}
\ No newline at end of file
TheMachine/UC/ConfigControl.cs
using DeviceLibrary;
using OnlineStore;
using DeviceLibrary;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
......@@ -215,7 +216,7 @@ namespace TheMachine
{
if (!Setting_Init.Device_Axis_Manual_Control_AtRunning && Machine.isRunning)
{
MessageBox.Show("系统正在运行,不能手动控制伺服");
MessageBox.Show(crc.GetString("Res0210","系统正在运行,不能手动控制伺服"));
return;
}
var cc = tableLayoutPanel1.Controls.Find(((Button)sender).Name, false);
......@@ -293,4 +294,4 @@ namespace TheMachine
Config = (Store_ConfigBase)CSVConfigReader.LoadConfig<SIO_Type>(Config);
}
}
}
}
\ No newline at end of file
TheMachine/UC/UC_LedConfig.cs
using DeviceLibrary;
using OnlineStore;
using DeviceLibrary;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
......@@ -71,28 +72,28 @@ namespace TheMachine.UC
Label label_s = new Label()
{
Size = new Size(200, 34),
Text = "状态,优先级从大到小",
Text = crc.GetString("Res0220","状态,优先级从大到小"),
TextAlign = ContentAlignment.MiddleLeft
};
tableLayoutPanel1.Controls.Add(label_s, 0, 0);
Label label_g = new Label()
{
Size = new Size(120, 34),
Text = "绿灯",
Text = crc.GetString("Res0221","绿灯"),
TextAlign = ContentAlignment.MiddleCenter
};
tableLayoutPanel1.Controls.Add(label_g, 1, 0);
Label label_y = new Label()
{
Size = new Size(120, 34),
Text = "黄灯",
Text = crc.GetString("Res0222","黄灯"),
TextAlign = ContentAlignment.MiddleCenter
};
tableLayoutPanel1.Controls.Add(label_y, 2, 0);
Label label_r = new Label()
{
Size = new Size(120, 34),
Text = "红灯",
Text = crc.GetString("Res0223","红灯"),
TextAlign = ContentAlignment.MiddleCenter
};
tableLayoutPanel1.Controls.Add(label_r, 3, 0);
......@@ -114,10 +115,10 @@ namespace TheMachine.UC
foreach (var led in Led.LedColors.Keys)
{
List<lightitem> lightitems = new List<lightitem>();
lightitems.Add(new lightitem("无动作", LedState.none));
lightitems.Add(new lightitem("关", LedState.off));
lightitems.Add(new lightitem("开", LedState.on));
lightitems.Add(new lightitem("闪烁", LedState.blink));
lightitems.Add(new lightitem(crc.GetString("Res0224","无动作"), LedState.none));
lightitems.Add(new lightitem(crc.GetString("Res0225","关"), LedState.off));
lightitems.Add(new lightitem(crc.GetString("Res0226","开"), LedState.on));
lightitems.Add(new lightitem(crc.GetString("Res0227","闪烁"), LedState.blink));
var selit = lightitems.FindIndex(x => x.value == RobotManage.mainMachine.MachineLedState[key][led]);
ComboBox comboBox = new ComboBox();
......@@ -171,9 +172,9 @@ namespace TheMachine.UC
}
if (RobotManage.mainMachine.SaveLedCfg())
MessageBox.Show("保存成功!");
MessageBox.Show(crc.GetString("Res0228","保存成功!"));
else
MessageBox.Show("保存失败!");
MessageBox.Show(crc.GetString("Res0229","保存失败!"));
}
}
}
}
\ No newline at end of file
TheMachine/UC/uc_boxdebug.cs
using DeviceLibrary;
using DeviceLibrary;
using log4net;
using OnlineStore;
using OnlineStore.Common;
......@@ -66,7 +66,7 @@ namespace TheMachine
timer1.Enabled = true;
}
catch(Exception ex) {
MessageBox.Show("库位表解析错误");
MessageBox.Show(crc.GetString("Res0211","库位表解析错误"));
LogUtil.error(Name + " " + ex.ToString());
}
......@@ -347,14 +347,14 @@ namespace TheMachine
ACStorePosition ktkPosition = Machine.StorePosition[selectPositionNum];
JobInfo jobInfo = new JobInfo("IN_TEST", selectPositionNum, ktkPosition.BagWidth, ktkPosition.BagHigh);
if (!Machine.StartInStore(jobInfo,Machine.AIOTMoveInfo)) {
MessageBox.Show("料盘没有到位,无法手动入库");
MessageBox.Show(crc.GetString("Res0212","料盘没有到位,无法手动入库"));
return;
}
LogUtil.info($"手动入库:{selectPositionNum}");
}
else
{
MessageBox.Show("请先启动料仓！");
MessageBox.Show(crc.GetString("Res0213","请先启动料仓！"));
}
}
......@@ -377,7 +377,7 @@ namespace TheMachine
}
else
{
MessageBox.Show("请先启动料仓！");
MessageBox.Show(crc.GetString("Res0213","请先启动料仓！"));
}
}
......@@ -406,13 +406,13 @@ namespace TheMachine
{
btnOutStore.Enabled = false;
btnInStore.Enabled = false;
btn_autoinout.Text = "停止自动库位测试";
btn_autoinout.Text = crc.GetString("Res0214","停止自动库位测试");
}
else
{
btnOutStore.Enabled = true;
btnInStore.Enabled = true;
btn_autoinout.Text = "自动库位测试";
btn_autoinout.Text = crc.GetString("Res0215","自动库位测试");
}
}
private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
......@@ -447,7 +447,7 @@ namespace TheMachine
if (Machine.AutoInOutTest)
{
Machine.StopAutoInOutTest();
MessageBox.Show("自动出入库过程会再料盘送至出口后自动停止.");
MessageBox.Show(crc.GetString("Res0216","自动出入库过程会再料盘送至出口后自动停止."));
return;
}
......@@ -456,11 +456,11 @@ namespace TheMachine
if (!Machine.IOValue(SIO_Type.Door_Tray_Check, Config).Equals(IO_VALUE.HIGH))
{
MessageBox.Show("入库料盘没有准备好,请先点击[上料准备],无法启动");
MessageBox.Show(crc.GetString("Res0217","入库料盘没有准备好,请先点击[上料准备],无法启动"));
return;
}
DialogResult res = MessageBox.Show("确定开始自动库位测试？\n请确保料仓库位全部为空.", "提示", MessageBoxButtons.YesNo);
DialogResult res = MessageBox.Show(crc.GetString("Res0218","确定开始自动库位测试？\n请确保料仓库位全部为空."), crc.GetString("Res0167","提示"), MessageBoxButtons.YesNo);
if (res == DialogResult.No)
return;
int posindex = Machine.PositionNumList.IndexOf(cmbPosition.Text);
......@@ -470,11 +470,11 @@ namespace TheMachine
MessageBox.Show(errmsg);
return;
}
(sender as Button).Text = "停止自动库位测试！";
(sender as Button).Text = crc.GetString("Res0219","停止自动库位测试！");
}
else
{
MessageBox.Show("请先启动料仓！");
MessageBox.Show(crc.GetString("Res0213","请先启动料仓！"));
}
}
......@@ -491,4 +491,4 @@ namespace TheMachine
}
}
}
}
\ No newline at end of file
TheMachine/UCStoreMachine.cs
using ConfigHelper;
using ConfigHelper;
using DeviceLibrary;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
......@@ -37,8 +38,12 @@ namespace TheMachine
bd.Config = Machine.Config;
sio.Config = Machine.Config;
Common.AlertListViewSet(listView);
this.Tag = "not";
crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
}
private void Crc_LanguageChangeEvent(object sender, EventArgs e)
{
}
private void Machine_ProcessMsgEvent(List<Msg> msg)
{
if (msg == null)
......@@ -116,10 +121,10 @@ namespace TheMachine
private void UCStoreMachine_Load(object sender, EventArgs e)
{
Config.PropertyBind($"Device_{Machine.MachineSide}_Disable", checkBox_disable, "Checked", "CheckedChanged");
AddForm("tab_sio", "IO调试", sio);
AddForm("tab_axis","伺服调试", ac);
AddForm("tab_store", "库位调试", bd);
AddForm("tab_setting", "相关设置", sc);
AddForm("tab_sio", crc.GetString("Form1_tabc_tab_io_Text","IO调试"), sio);
AddForm("tab_axis",crc.GetString("Res0192","伺服调试"), ac);
AddForm("tab_store", crc.GetString("Res0193","库位调试"), bd);
AddForm("tab_setting", crc.GetString("Res0194","相关设置"), sc);
}
private void AddForm(string id, string text, UserControl form)
......@@ -160,7 +165,7 @@ namespace TheMachine
if (!Machine.isRunning) {
btn_stop.Enabled = false;
btn_run.Text = "启动";
btn_run.Text = crc.GetString("Res0195","启动");
btn_run.BackColor = Color.Transparent;
return;
}
......@@ -168,13 +173,13 @@ namespace TheMachine
if (e)
{
//Machine.UserPause = true;
(btn_run as Button).Text = "恢复运行";
(btn_run as Button).Text = crc.GetString("Res0196","恢复运行");
(btn_run as Button).BackColor = Color.LightGreen;
}
else
{
//Machine.UserPause = false;
(btn_run as Button).Text = "暂停运行";
(btn_run as Button).Text = crc.GetString("Res0197","暂停运行");
(btn_run as Button).BackColor = Color.Yellow;
}
}
......@@ -184,7 +189,7 @@ namespace TheMachine
{
if (Machine.IOValue(IO_Type.SuddenStop_BTN, RobotManage.Config).Equals(IO_VALUE.LOW))
{
Machine.Msg.add("急停中,无法启动", MsgLevel.warning);
Machine.Msg.add(crc.GetString("Res0182","急停中,无法启动"), MsgLevel.warning);
Machine_ProcessMsgEvent(Machine.Msg.get()[Machine.MachineSide]);
return;
}
......@@ -218,4 +223,4 @@ namespace TheMachine
//btn_run.BackColor = Color.Transparent;
}
}
}
}
\ No newline at end of file
TheMachine/positionTool/FrmPositionTool.cs
using DeviceLibrary;
using OnlineStore;
using DeviceLibrary;
using OnlineStore.Common;
using OnlineStore.DeviceLibrary;
using OnlineStore.LoadCSVLibrary;
......@@ -19,7 +20,7 @@ namespace OnlineStore.ACSingleStore
{
public partial class FrmPositionTool : Form
{
private string LogName = "升降轴位置调试：";
private string LogName = crc.GetString("Res0198","升降轴位置调试：");
AxisBean UpDown_Axis;
string iotype="";
StoreMachine Machine;
......@@ -65,7 +66,7 @@ namespace OnlineStore.ACSingleStore
formStatus(isOn);
if (isOn)
timer1.Start();
ioStatusControl1.IOName = "检测信号";
ioStatusControl1.IOName = crc.GetString("Res0199","检测信号");
}
delegate void ShowLogProDelegate(string msg, Color color);
......@@ -149,7 +150,7 @@ namespace OnlineStore.ACSingleStore
if (speed <= (0))
{
MessageBox.Show("请输入正确的速度");
MessageBox.Show(crc.GetString("Res0200","请输入正确的速度"));
txtSpeed.Focus();
return;
}
......@@ -263,7 +264,7 @@ namespace OnlineStore.ACSingleStore
}
LogUtil.info(LogName + "伺服已停止运动，停止定时器，记录数据");
List<string> strList = new List<string>();
strList.Add("编号,标准位置,升降轴库位入料高点P3,升降轴库位入料低点P4");
strList.Add(crc.GetString("Res0201","编号,标准位置,升降轴库位入料高点P3,升降轴库位入料低点P4"));
int index = 1;
foreach (int p in PositionList)
{
......@@ -299,7 +300,7 @@ namespace OnlineStore.ACSingleStore
var homests = AxisManager.GetHomeEndStatus(PortName, SlvAddr);
var servisop = AxisManager.ServerOnStatus(PortName, SlvAddr);
int moveS = AxisManager.GetBusyStatus(PortName, SlvAddr);
label_servosts.Text = "伺服状态:"+(servisop ? "已使能" : "未使能")+ ","+ "原点状态:"+(homests == 3 ? "已完成" : "未完成") + "," + "忙碌状态:"+(moveS == 1 ? "忙碌中" : "空闲中");
label_servosts.Text = crc.GetString("Res0202","伺服状态:")+(servisop ? crc.GetString("Res0203","已使能") : crc.GetString("Res0204","未使能"))+ ","+ crc.GetString("Res0205","原点状态:")+(homests == 3 ? crc.GetString("Res0206","已完成") : crc.GetString("Res0207","未完成")) + "," + crc.GetString("Res0208","忙碌状态:")+(moveS == 1 ? crc.GetString("Res0209","忙碌中") : crc.GetString("Res0162","空闲中"));
ioStatusControl1.IOValue = (int)GetSingleValue();
ioStatusControl1.ShowData();
......@@ -333,4 +334,4 @@ namespace OnlineStore.ACSingleStore
}
}
}
\ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!