io模块操作增加subType

source/Common/Setting_Init.cs

@@ -16,15 +16,11 @@ namespace OnlineStore.Common
         /// 系统启动时自动启动料仓，=1时自动启动，并隐藏窗口，=0时不需要
         /// 系统启动时自动启动料仓，=1时自动启动，并隐藏窗口，=0时不需要
         /// </summary>
         /// </summary>
         public static string App_AutoRun = "App_AutoRun";
         public static string App_AutoRun = "App_AutoRun";
-        /// <summary>
-        /// 系统主界面标题
-        /// </summary>
-        public static string App_Title = "App_Title"; 
+     
       
       
        
        
         public static string http_server = "http.server";
         public static string http_server = "http.server";
-        public static string Store_CID = "Store_CID";
-        public static string Store_ID = "Store_ID";
+        public static string Store_CID = "Store_CID"; 
 
 
         /// <summary>
         /// <summary>
         /// 料仓数量
         /// 料仓数量

source/Common/util/ConfigAppSettings.cs

@@ -127,9 +127,9 @@ namespace OnlineStore.Common
         {
         {
             try
             try
             {
             {
-                if (key.Equals("") || value.Equals(""))
+                if (key.Equals("")  )
                 {
                 {
-                    //return;
+                    return;
                 }
                 }
                 //增加的内容写在appSettings段下 <add key="RegCode" value="0"/> 
                 //增加的内容写在appSettings段下 <add key="RegCode" value="0"/> 
                 System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
                 System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);

source/DeviceLibrary/AXIS/AxisManager.cs

@@ -41,6 +41,10 @@ namespace OnlineStore.DeviceLibrary
         #endregion
         #endregion
 
 
 
 
+        public abstract bool OpenCard();
+        public abstract bool CloseCard();
+
+
         public abstract bool IsHomeMoveEnd(string portName, short slvAddr);
         public abstract bool IsHomeMoveEnd(string portName, short slvAddr);
 
 
         public abstract bool AbsMoveIsEnd(string portName, short axisNo, int targetPosition, int canErrorCount, out bool countError);
         public abstract bool AbsMoveIsEnd(string portName, short axisNo, int targetPosition, int canErrorCount, out bool countError);

source/DeviceLibrary/AXIS/HC/HCAxisManager.cs

@@ -10,6 +10,15 @@ namespace OnlineStore.DeviceLibrary
 {
 {
     public class HCAxisManager : AxisManager
     public class HCAxisManager : AxisManager
     {
     {
+        public override bool OpenCard()
+        {
+            return HCBoardManager.OpenCard();
+        }
+
+        public override bool CloseCard()
+        {
+            return HCBoardManager.CloseCard();
+        }
         public override void AbsMove(string portName, short slvAddr, int targetPosition, int targetSpeed=0,int ptpAcc=0,int ptpDec=0)
         public override void AbsMove(string portName, short slvAddr, int targetPosition, int targetSpeed=0,int ptpAcc=0,int ptpDec=0)
         {
         {
               HCBoardManager.AbsMove((short)slvAddr, targetPosition, targetSpeed, ptpAcc, ptpDec);
               HCBoardManager.AbsMove((short)slvAddr, targetPosition, targetSpeed, ptpAcc, ptpDec);
@@ -141,5 +150,6 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return false;
             return false;
         }
         }
+
     }
     }
 }
 }

source/DeviceLibrary/AXIS/PanasonicServo/ACServerManager_Partial.cs

@@ -467,6 +467,15 @@ namespace OnlineStore.DeviceLibrary
             return GetCoilData(portName, reviceData, ACCMDManager.Home_Single);
             return GetCoilData(portName, reviceData, ACCMDManager.Home_Single);
         }
         }
 
 
+        public override bool OpenCard()
+        {
+            return true;
+        }
+
+        public override bool CloseCard()
+        {
+            return true;
+        }
     }
     }
     /// <summary>
     /// <summary>
     /// 记录最后一次获得的寄存器的值
     /// 记录最后一次获得的寄存器的值

source/DeviceLibrary/DeviceLibrary.csproj

@@ -118,10 +118,10 @@
     <None Include="StoreConfig\AC\BoxConfig_2.csv">
     <None Include="StoreConfig\AC\BoxConfig_2.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     </None>
-    <None Include="StoreConfig\AC\StoreConfig.csv">
+    <None Include="StoreConfig\AC\BoxConfig_1.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     </None>
-    <None Include="StoreConfig\AC\BoxConfig_1.csv">
+    <None Include="StoreConfig\AC\StoreConfig.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     </None>
   </ItemGroup>
   </ItemGroup>

source/DeviceLibrary/IO/HCIOManager.cs

@@ -26,7 +26,7 @@ namespace OnlineStore.DeviceLibrary.IO
             {
             {
                 if (!HCBoardManager.CardInitOk())
                 if (!HCBoardManager.CardInitOk())
                 {
                 {
-                    HCBoardManager.InitCard();
+                    HCBoardManager.OpenCard();
                 }
                 }
             }
             }
         }
         }

source/DeviceLibrary/IO/IOManager.cs

@@ -17,47 +17,66 @@ namespace OnlineStore.DeviceLibrary
 
 
 
 
         #region KNDIO
         #region KNDIO
-        
-        public static void IOMove(string ioType, IO_VALUE ioValue)
+
+        public static void IOMove(string ioType, IO_VALUE ioValue, int subType )
         {
         {
-            if (StoreManager.Config.DOList.ContainsKey(ioType))
+            if (string.IsNullOrEmpty(ioType))
+            {
+                return;
+            }
+            ConfigIO configIo = GetDO(ioType, subType);
+            if (configIo != null)
             {
             {
-                ConfigIO configIo = StoreManager.Config.DOList[ioType]; 
-                instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue); 
-                Thread.Sleep(60);
+                instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
+                Thread.Sleep(10);
             }
             }
             else
             else
             {
             {
-                LogUtil.error("没有DO=" + ioType);
+                LogUtil.error("未找到DO,[" + ioType + "][" + subType + "]");
             }
             }
         }
         }
 
 
-        public static IO_VALUE IOValue(string ioType)
+        public static IO_VALUE IOValue(string ioType, int subType)
         {
         {
-            IO_VALUE ioValue = IO_VALUE.LOW;
-            if (StoreManager.Config.DIList.ContainsKey(ioType))
+            if (string.IsNullOrEmpty(ioType))
             {
             {
-                ConfigIO configIo = StoreManager.Config.DIList[ioType];
-                ioValue = instance.GetDIValue(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr());
-                //UpdateDoValue(ioType, ioValue);
+                return IO_VALUE.None;
             }
             }
-            else if (StoreManager.Config.DOList.ContainsKey(ioType))
+            IO_VALUE ioValue = IO_VALUE.None;
+            ConfigIO configIo = GetDI(ioType, subType);
+            if (configIo == null)
             {
             {
-                ConfigIO configIo = StoreManager.Config.DOList[ioType];
-                ioValue = instance.GetDOValue(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr());
+                configIo = GetDO(ioType, subType);
+            }
+
+            if (configIo != null)
+            {
+                if (configIo.ProType.Equals(ConfigItemType.DI))
+                {
+                    ioValue = instance.GetDIValue(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr());
+                }
+                else
+                {
+                    ioValue = instance.GetDOValue(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr());
+                }
             }
             }
             else
             else
             {
             {
-                LogUtil.error("没有DO=" + ioType);
+                LogUtil.error("未找到IO[" + ioType + "][" + subType + "]");
             }
             }
             return ioValue;
             return ioValue;
         }
         }
-        public static IO_VALUE DOValue(string ioType)
+        public static IO_VALUE DOValue(string ioType, int subType)
         {
         {
-            IO_VALUE ioValue = IO_VALUE.LOW;
-            if (StoreManager.Config.DOList.ContainsKey(ioType))
+            if (string.IsNullOrEmpty(ioType))
+            {
+                return IO_VALUE.None;
+            }
+            IO_VALUE ioValue = IO_VALUE.None;
+            ConfigIO configIo = GetDO(ioType, subType);
+
+            if (configIo != null)
             {
             {
-                ConfigIO configIo = StoreManager.Config.DOList[ioType];
                 ioValue = instance.GetDOValue(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr());
                 ioValue = instance.GetDOValue(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr());
             }
             }
             else
             else
@@ -66,6 +85,92 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return ioValue;
             return ioValue;
         }
         }
+        public static IO_VALUE DIValue(string ioType, int subType)
+        {
+            if (string.IsNullOrEmpty(ioType))
+            {
+                return IO_VALUE.None;
+            }
+            IO_VALUE ioValue = IO_VALUE.None;
+            ConfigIO configIo = GetDI(ioType, subType);
+            if (configIo != null)
+            {
+                ioValue = instance.GetDIValue(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr());
+            }
+            else
+            {
+                LogUtil.error("未找到 DI [" + ioType + "][" + subType + "]");
+            }
+            return ioValue;
+        }
+        internal static ConfigIO GetIO(string ioType, int subType)
+        {
+            ConfigIO configIo = GetDI(ioType, subType);
+            if (configIo == null)
+            {
+                configIo = GetDO(ioType, subType);
+            }
+            return configIo;
+        }
+        internal static ConfigIO GetDI(string ioType, int subType)
+        {
+            ConfigIO configIo = null;
+            if (subType <= 0)
+            {
+                if (StoreManager.Config.DIList.ContainsKey(ioType))
+                {
+                    return StoreManager.Config.DIList[ioType];
+                }
+            }
+            else
+            {
+                if (StoreManager.allConfigMap.ContainsKey(subType))
+                {
+                    if (StoreManager.allConfigMap[subType].DIList.ContainsKey(ioType))
+                    {
+                        return StoreManager.allConfigMap[subType].DIList[ioType];
+                    }
+                }
+
+            }
+            if (configIo == null && subType > 0)
+            {
+                if (StoreManager.Config.DIList.ContainsKey(ioType))
+                {
+                    return StoreManager.Config.DIList[ioType];
+                }
+            }
+            return configIo;
+        }
+        internal static ConfigIO GetDO(string ioType, int subType)
+        {
+            ConfigIO configIo = null;
+            if (subType <= 0)
+            {
+                if (StoreManager.Config.DOList.ContainsKey(ioType))
+                {
+                    return StoreManager.Config.DOList[ioType];
+                }
+            }
+            else
+            {
+                if (StoreManager.allConfigMap.ContainsKey(subType))
+                {
+                    if (StoreManager.allConfigMap[subType].DOList.ContainsKey(ioType))
+                    {
+                        return StoreManager.allConfigMap[subType].DOList[ioType];
+                    }
+                }
+            }
+            if (configIo == null && subType > 0)
+            {
+                if (StoreManager.Config.DOList.ContainsKey(ioType))
+                {
+                    return StoreManager.Config.DOList[ioType];
+                }
+            }
+            return configIo;
+        }
         #endregion
         #endregion
         public static void Init()
         public static void Init()
         {
         {

source/DeviceLibrary/StoreConfig/AC/BoxConfig_1.csv

@@ -35,3 +35,4 @@ PRO,0,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,,,,,,,,
 PRO,0,是否调试状态,ISDebug,0,,,,,,,,,,,,
 PRO,0,是否调试状态,ISDebug,0,,,,,,,,,,,,
 PRO,,每次吹气的时间（分钟）,BlowAir_Time,10,,,
 PRO,,每次吹气的时间（分钟）,BlowAir_Time,10,,,
 PRO,,两次吹气间隔（分钟）,BlowAir_Interval,10,,, 
 PRO,,两次吹气间隔（分钟）,BlowAir_Interval,10,,, 
+PRO,,温湿度端口号,Humiture_Port,COM5,,,

source/DeviceLibrary/StoreConfig/AC/BoxConfig_2.csv

@@ -35,3 +35,4 @@ PRO,0,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,,,,,,,,
 PRO,0,是否调试状态,ISDebug,0,,,,,,,,,,,,
 PRO,0,是否调试状态,ISDebug,0,,,,,,,,,,,,
 PRO,,每次吹气的时间（分钟）,BlowAir_Time,10,,,
 PRO,,每次吹气的时间（分钟）,BlowAir_Time,10,,,
 PRO,,两次吹气间隔（分钟）,BlowAir_Interval,10,,, 
 PRO,,两次吹气间隔（分钟）,BlowAir_Interval,10,,, 
+PRO,,温湿度端口号,Humiture_Port,COM5,,,

source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv

@@ -34,12 +34,6 @@ DO,0,设备照明ON,Device_Led,8,HC,Y09,
 ,,,,14,HC,Y15,
 ,,,,14,HC,Y15,
 ,,,,15,HC,Y16,
 ,,,,15,HC,Y16,
 ,,,,,,, 
 ,,,,,,, 
-PRO,,需要吹气的温度(温度标准),Max_Temperature,0,,,
-PRO,,需要吹气的湿度(湿度标准),Max_Humidity,10,,,
-PRO,,每次吹气的时间（分钟）,BlowAir_Time,10,,,
-PRO,,两次吹气间隔（分钟）,BlowAir_Interval,10,,, 
-PRO,,温湿度端口号,Humiture_Port,COM5,,,
 ,,,,,,,
 ,,,,,,,
 PRO,,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,
 PRO,,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,
-PRO,,预警温度,WarnTemperate,80,,,
-PRO,,预警湿度,WarnHumidity,80,,,
+PRO,0,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,,,,,,

source/DeviceLibrary/StoreConfig/AC/linePositions_1.csv

 位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴进料口取料点P2
 位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴进料口取料点P2
-4D1001AA0001,455,44,15,10,360000,-2000,13300,13300,-2000,106000,242000,134900,121850
-4D1001AA0002,454,44,15,10,360000,48000,64000,64000,48000,106000,242000,134900,121850
-4D1001AA0003,453,44,15,10,360000,98600,114600,114600,98600,106000,242000,134900,121850
-4D1001AA0004,452,44,15,10,360000,149300,165300,165300,149300,106000,242000,134900,121850
-4D1001AA0005,451,44,15,10,360000,201000,217000,217000,201000,106000,242000,134900,121850
-4D1001BB0001,343,44,15,10,357300,665652,682652,682652,665652,106000,242000,28000,121850
-4D1001BB0002,342,44,15,10,357300,717341,734341,734341,717341,106000,242000,28000,121850
-4D1001BB0003,341,44,15,10,357300,768082,785082,785082,768082,106000,242000,28000,121850
-4D1001BB0004,340,44,15,10,357300,818672,835672,835672,818672,106000,242000,28000,121850
-4D1001BB0005,339,44,15,10,357300,869743,886743,886743,869743,106000,242000,28000,121850
-4D1001CC0001,232,44,15,10,357300,920651,937651,937651,920651,106000,242000,134900,121850
-4D1001CC0002,231,44,15,10,357300,963749,980749,980749,963749,106000,242000,134900,121850
-4D1001CC0003,230,44,15,10,357300,1004967,1021967,1021967,1004967,106000,242000,134900,121850
-4D1001CC0004,229,44,15,10,357300,1047697,1064697,1064697,1047697,106000,242000,134900,121850
-4D1001CC0005,228,44,15,10,357300,1089084,1106084,1106084,1089084,106000,242000,134900,121850
-4D1001CC0006,227,44,15,10,356300,1131305,1148305,1148305,1131305,106000,242000,134900,121850
-4D1001CC0007,226,44,15,10,356300,1173254,1190254,1190254,1173254,106000,242000,134900,121850
-4D1001CC0008,225,44,15,10,356300,1215316,1232316,1232316,1215316,106000,242000,134900,121850
-4D1001CC0009,224,44,15,10,356300,1257058,1274058,1274058,1257058,106000,242000,134900,121850
-4D1001CC0010,223,44,15,10,356300,1298744,1315744,1315744,1298744,106000,242000,134900,121850
-4D1001CC0011,222,44,15,10,356300,1341032,1358032,1358032,1341032,106000,242000,134900,121850
-4D1001DD0001,116,44,15,10,354500,1383193,1400193,1400193,1383193,106000,242000,134900,121850
-4D1001DD0002,115,44,15,10,354500,1425907,1442907,1442907,1425907,106000,242000,134900,121850
-4D1001DD0003,114,44,15,10,354500,1466794,1483794,1483794,1466794,106000,242000,134900,121850
-4D1001DD0004,113,44,15,10,354500,1509243,1526243,1526243,1509243,106000,242000,134900,121850
-4D1001DD0005,112,44,15,10,354500,1551257,1568257,1568257,1551257,106000,242000,134900,121850
-4D1001DD0006,111,44,15,10,354500,1593106,1610106,1610106,1593106,106000,242000,134900,121850
-4D1001DD0007,110,44,15,10,354500,1634704,1651704,1651704,1634704,106000,242000,134900,121850
-4D1001DD0008,109,44,15,10,354500,1677322,1694322,1694322,1677322,106000,242000,134900,121850
-4D1001DD0009,108,44,15,10,354500,1718703,1735703,1735703,1718703,106000,242000,134900,121850
-4D1001DD0010,107,44,15,10,354500,1760884,1777884,1777884,1760884,106000,242000,134900,121850
-4D1001DD0011,106,44,15,10,354500,1802986,1819986,1819986,1802986,106000,242000,134900,121850
-4D1002AA0001,450,12,13,10,440500,937,11937,11937,937,106000,398000,320000,121850
-4D1002AA0002,449,12,13,10,440500,22290,33290,33290,22290,106000,398000,320000,121850
-4D1002AA0003,448,12,13,10,440500,45178,56178,56178,45178,106000,398000,320000,121850
-4D1002AA0004,447,12,13,10,440500,68339,79339,79339,68339,106000,398000,320000,121850
-4D1002AA0005,446,12,13,10,440500,91715,102715,102715,91715,106000,398000,320000,121850
-4D1002AA0006,445,12,13,10,440500,114782,125782,125782,114782,106000,398000,320000,121850
-4D1002AA0007,444,12,13,10,440500,138242,149242,149242,138242,106000,398000,320000,121850
-4D1002AA0008,443,12,13,10,440500,161298,172298,172298,161298,106000,398000,320000,121850
-4D1002AA0009,442,12,13,10,440500,184573,195573,195573,184573,106000,398000,320000,121850
-4D1002AA0010,441,12,13,10,440500,207886,218886,218886,207886,106000,398000,320000,121850
-4D1002AA0011,440,12,13,10,440500,230787,241787,241787,230787,106000,398000,320000,121850
-4D1002AA0012,439,12,13,10,440500,253704,264704,264704,253704,106000,398000,320000,121850
-4D1002AA0013,438,12,11,10,440500,277329,288329,288329,277329,106000,398000,320000,121850
-4D1002AA0014,437,12,11,10,440500,300651,311651,311651,300651,106000,398000,320000,121850
-4D1002AA0015,436,12,11,10,440500,323916,334916,334916,323916,106000,398000,320000,121850
-4D1002AA0016,435,12,11,10,440500,347288,358288,358288,347288,106000,398000,320000,121850
-4D1002AA0017,434,12,11,10,440500,370708,381708,381708,370708,106000,398000,320000,121850
-4D1002AA0018,433,12,11,10,440500,393721,404721,404721,393721,106000,398000,320000,121850
-4D1002AA0019,432,12,11,10,440500,416686,427686,427686,416686,106000,398000,320000,121850
-4D1002AA0020,431,12,11,10,440500,440674,451674,451674,440674,106000,398000,320000,121850
-4D1002BB0001,338,12,11,10,439000,463414,474414,474414,463414,106000,398000,320000,121850
-4D1002BB0002,337,12,11,10,439000,487256,498256,498256,487256,106000,398000,320000,121850
-4D1002BB0003,336,12,11,10,439000,510165,521165,521165,510165,106000,398000,320000,121850
-4D1002BB0004,335,12,11,10,439000,533218,544218,544218,533218,106000,398000,320000,121850
-4D1002BB0005,334,12,11,10,439000,556688,567688,567688,556688,106000,398000,320000,121850
-4D1002BB0006,333,12,11,10,439000,579500,590500,590500,579500,106000,398000,320000,121850
-4D1002BB0007,332,12,11,10,439000,602659,613659,613659,602659,106000,398000,320000,121850
-4D1002BB0008,331,12,11,10,439000,626175,637175,637175,626175,106000,398000,320000,121850
-4D1002BB0009,330,12,13,10,439000,649090,660090,660090,649090,106000,398000,320000,121850
-4D1002BB0010,329,12,13,10,439000,672087,683087,683087,672087,106000,398000,320000,121850
-4D1002BB0011,328,12,13,10,439000,695785,706785,706785,695785,106000,398000,320000,121850
-4D1002BB0012,327,12,13,10,439000,718732,729732,729732,718732,106000,398000,320000,121850
-4D1002BB0013,326,12,13,10,439000,742166,753166,753166,742166,106000,398000,320000,121850
-4D1002BB0014,325,12,13,10,439000,765367,776367,776367,765367,106000,398000,320000,121850
-4D1002BB0015,324,12,13,10,439000,788686,799686,799686,788686,106000,398000,320000,121850
-4D1002BB0016,323,12,13,10,439000,812065,823065,823065,812065,106000,398000,320000,121850
-4D1002BB0017,322,12,13,10,439000,835335,846335,846335,835335,106000,398000,320000,121850
-4D1002BB0018,321,12,13,10,439000,858335,869335,869335,858335,106000,398000,320000,121850
-4D1002BB0019,320,12,13,10,439000,881914,892914,892914,881914,106000,398000,320000,121850
-4D1002BB0020,319,12,13,10,439000,904875,915875,915875,904875,106000,398000,320000,121850
-4D1002CC0001,221,12,13,10,438000,929739,940739,940739,929739,106000,398000,320000,121850
-4D1002CC0002,220,12,13,10,438000,952874,963874,963874,952874,106000,398000,320000,121850
-4D1002CC0003,219,12,13,10,438000,975340,986340,986340,975340,106000,398000,320000,121850
-4D1002CC0004,218,12,13,10,438000,998666,1009666,1009666,998666,106000,398000,320000,121850
-4D1002CC0005,217,12,13,10,438000,1022100,1033100,1033100,1022100,106000,398000,320000,121850
-4D1002CC0006,216,12,13,10,438000,1044921,1055921,1055921,1044921,106000,398000,320000,121850
-4D1002CC0007,215,12,13,10,438000,1068521,1079521,1079521,1068521,106000,398000,320000,121850
-4D1002CC0008,214,12,13,10,438000,1091674,1102674,1102674,1091674,106000,398000,320000,121850
-4D1002CC0009,213,12,13,10,438000,1115106,1126106,1126106,1115106,106000,398000,320000,121850
-4D1002CC0010,212,12,13,10,438000,1138445,1149445,1149445,1138445,106000,398000,320000,121850
-4D1002CC0011,211,12,13,10,436000,1161543,1172543,1172543,1161543,106000,398000,320000,121850
-4D1002CC0012,210,12,13,10,436000,1184754,1195754,1195754,1184754,106000,398000,320000,121850
-4D1002CC0013,209,12,13,10,436000,1208380,1219380,1219380,1208380,106000,398000,320000,121850
-4D1002CC0014,208,12,13,10,436000,1231133,1242133,1242133,1231133,106000,398000,320000,121850
-4D1002CC0015,207,12,13,10,436000,1254236,1265236,1265236,1254236,106000,398000,320000,121850
-4D1002CC0016,206,12,13,10,436000,1277556,1288556,1288556,1277556,106000,398000,320000,121850
-4D1002CC0017,205,12,13,10,436000,1301041,1312041,1312041,1301041,106000,398000,320000,121850
-4D1002CC0018,204,12,13,10,436000,1324418,1335418,1335418,1324418,106000,398000,320000,121850
-4D1002CC0019,203,12,13,10,436000,1347488,1358488,1358488,1347488,106000,398000,320000,121850
-4D1002CC0020,202,12,13,10,436000,1371096,1382096,1382096,1371096,106000,398000,320000,121850
-4D1002DD0001,105,12,13,10,436000,1394728,1405728,1405728,1394728,106000,398000,320000,121850
-4D1002DD0002,104,12,13,10,436000,1418156,1429156,1429156,1418156,106000,398000,320000,121850
-4D1002DD0003,103,12,13,10,436000,1440889,1451889,1451889,1440889,106000,398000,320000,121850
-4D1002DD0004,102,12,13,10,436000,1464856,1475856,1475856,1464856,106000,398000,320000,121850
-4D1002DD0005,101,12,13,10,436000,1487682,1498682,1498682,1487682,106000,398000,320000,121850
-4D1002DD0006,100,12,13,10,436000,1510394,1521394,1521394,1510394,106000,398000,320000,121850
-4D1002DD0007,99,12,13,10,436000,1534542,1545542,1545542,1534542,106000,398000,320000,121850
-4D1002DD0008,98,12,13,10,436000,1557240,1568240,1568240,1557240,106000,398000,320000,121850
-4D1002DD0009,97,12,13,10,436000,1580195,1591195,1591195,1580195,106000,398000,320000,121850
-4D1002DD0010,96,12,13,10,436000,1603686,1614686,1614686,1603686,106000,398000,320000,121850
-4D1002DD0011,95,12,13,10,434000,1626987,1637987,1637987,1626987,106000,398000,320000,121850
-4D1002DD0012,94,12,13,10,434000,1650460,1661460,1661460,1650460,106000,398000,320000,121850
-4D1002DD0013,93,12,13,10,434000,1672841,1683841,1683841,1672841,106000,398000,320000,121850
-4D1002DD0014,92,12,13,10,434000,1696684,1707684,1707684,1696684,106000,398000,320000,121850
-4D1002DD0015,91,12,13,10,434000,1720054,1731054,1731054,1720054,106000,398000,320000,121850
-4D1002DD0016,90,12,13,10,434000,1743324,1754324,1754324,1743324,106000,398000,320000,121850
-4D1002DD0017,89,12,13,10,434000,1766173,1777173,1777173,1766173,106000,398000,320000,121850
-4D1002DD0018,88,12,13,10,434000,1789601,1800601,1800601,1789601,106000,398000,320000,121850
-4D1002DD0019,87,12,13,10,434000,1812610,1823610,1823610,1812610,106000,398000,320000,121850
-4D1003AA0001,430,16,13,10,522000,945,11945,11945,945,106000,380000,290000,121850
-4D1003AA0002,429,16,13,10,522000,23021,34021,34021,23021,106000,380000,290000,121850
-4D1003AA0003,428,16,13,10,522000,48461,59461,59461,48461,106000,380000,290000,121850
-4D1003AA0004,427,16,13,10,522000,73912,84912,84912,73912,106000,380000,290000,121850
-4D1003AA0005,426,16,13,10,522000,99011,110011,110011,99011,106000,380000,290000,121850
-4D1003AA0006,425,16,13,10,522000,124746,135746,135746,124746,106000,380000,290000,121850
-4D1003AA0007,424,16,13,10,522000,150338,161338,161338,150338,106000,380000,290000,121850
-4D1003AA0008,423,16,13,10,522000,175826,186826,186826,175826,106000,380000,290000,121850
-4D1003AA0009,422,16,13,10,522000,201509,212509,212509,201509,106000,380000,290000,121850
-4D1003AA0010,421,16,13,10,522000,226798,237798,237798,226798,106000,380000,290000,121850
-4D1003AA0011,420,16,13,10,522000,252354,263354,263354,252354,106000,380000,290000,121850
-4D1003AA0012,419,16,13,10,522000,277295,288295,288295,277295,106000,380000,290000,121850
-4D1003AA0013,418,16,13,10,522000,303049,314049,314049,303049,106000,380000,290000,121850
-4D1003AA0014,417,16,13,10,522000,328562,339562,339562,328562,106000,380000,290000,121850
-4D1003AA0015,416,16,13,10,522000,354130,365130,365130,354130,106000,380000,290000,121850
-4D1003AA0016,415,16,13,10,522000,379786,390786,390786,379786,106000,380000,290000,121850
-4D1003AA0017,414,16,13,10,522000,405334,416334,416334,405334,106000,380000,290000,121850
-4D1003AA0018,413,16,13,10,522000,430388,441388,441388,430388,106000,380000,290000,121850
-4D1003BB0001,318,16,13,10,521000,456653,467653,467653,456653,106000,380000,290000,121850
-4D1003BB0002,317,16,13,10,521000,482681,493681,493681,482681,106000,380000,290000,121850
-4D1003BB0003,316,16,13,10,521000,507558,518558,518558,507558,106000,380000,290000,121850
-4D1003BB0004,315,16,13,10,521000,532974,543974,543974,532974,106000,380000,290000,121850
-4D1003BB0005,314,16,13,10,521000,558367,569367,569367,558367,106000,380000,290000,121850
-4D1003BB0006,313,16,13,10,521000,584284,595284,595284,584284,106000,380000,290000,121850
-4D1003BB0007,312,16,13,10,521000,609641,620641,620641,609641,106000,380000,290000,121850
-4D1003BB0008,311,16,13,10,521000,635164,646164,646164,635164,106000,380000,290000,121850
-4D1003BB0009,310,16,13,10,521000,660393,671393,671393,660393,106000,380000,290000,121850
-4D1003BB0010,309,16,13,10,520000,686425,697425,697425,686425,106000,380000,290000,121850
-4D1003BB0011,308,16,13,10,520000,711466,722466,722466,711466,106000,380000,290000,121850
-4D1003BB0012,307,16,13,10,520000,737479,748479,748479,737479,106000,380000,290000,121850
-4D1003BB0013,306,16,13,10,520000,762568,773568,773568,762568,106000,380000,290000,121850
-4D1003BB0014,305,16,13,10,520000,788552,799552,799552,788552,106000,380000,290000,121850
-4D1003BB0015,304,16,13,10,520000,814157,825157,825157,814157,106000,380000,290000,121850
-4D1003BB0016,303,16,13,10,520000,839200,850200,850200,839200,106000,380000,290000,121850
-4D1003BB0017,302,16,13,10,520000,865000,876000,876000,865000,106000,380000,290000,121850
-4D1003BB0018,301,16,13,10,520000,891033,902033,902033,891033,106000,380000,290000,121850
-4D1003CC0001,201,16,13,10,519000,915853,926853,926853,915853,106000,380000,290000,121850
-4D1003CC0002,200,16,13,10,519000,941204,952204,952204,941204,106000,380000,290000,121850
-4D1003CC0003,199,16,13,10,519000,966920,977920,977920,966920,106000,380000,290000,121850
-4D1003CC0004,198,16,13,10,519000,992701,1003701,1003701,992701,106000,380000,290000,121850
-4D1003CC0005,197,16,13,10,519000,1017509,1028509,1028509,1017509,106000,380000,290000,121850
-4D1003CC0006,196,16,13,10,519000,1043231,1054231,1054231,1043231,106000,380000,290000,121850
-4D1003CC0007,195,16,13,10,519000,1069102,1080102,1080102,1069102,106000,380000,290000,121850
-4D1003CC0008,194,16,13,10,519000,1094404,1105404,1105404,1094404,106000,380000,290000,121850
-4D1003CC0009,193,16,13,10,519000,1119958,1130958,1130958,1119958,106000,380000,290000,121850
-4D1003CC0010,192,16,13,10,517000,1145554,1156554,1156554,1145554,106000,380000,290000,121850
-4D1003CC0011,191,16,13,10,517000,1170933,1181933,1181933,1170933,106000,380000,290000,121850
-4D1003CC0012,190,16,13,10,517000,1196466,1207466,1207466,1196466,106000,380000,290000,121850
-4D1003CC0013,189,16,13,10,517000,1221822,1232822,1232822,1221822,106000,380000,290000,121850
-4D1003CC0014,188,16,13,10,517000,1247224,1258224,1258224,1247224,106000,380000,290000,121850
-4D1003CC0015,187,16,13,10,517000,1272933,1283933,1283933,1272933,106000,380000,290000,121850
-4D1003CC0016,186,16,13,10,517000,1298390,1309390,1309390,1298390,106000,380000,290000,121850
-4D1003CC0017,185,16,13,10,517000,1324160,1335160,1335160,1324160,106000,380000,290000,121850
-4D1003CC0018,184,16,13,10,517000,1349249,1360249,1360249,1349249,106000,380000,290000,121850
-4D1003DD0001,86,16,13,10,517000,1376357,1387357,1387357,1376357,106000,380000,290000,121850
-4D1003DD0002,85,16,13,10,517000,1401349,1412349,1412349,1401349,106000,380000,290000,121850
-4D1003DD0003,84,16,13,10,517000,1426863,1437863,1437863,1426863,106000,380000,290000,121850
-4D1003DD0004,83,16,13,10,517000,1452299,1463299,1463299,1452299,106000,380000,290000,121850
-4D1003DD0005,82,16,13,10,517000,1478019,1489019,1489019,1478019,106000,380000,290000,121850
-4D1003DD0006,81,16,13,10,517000,1503529,1514529,1514529,1503529,106000,380000,290000,121850
-4D1003DD0007,80,16,13,10,517000,1528466,1539466,1539466,1528466,106000,380000,290000,121850
-4D1003DD0008,79,16,13,10,517000,1554909,1565909,1565909,1554909,106000,380000,290000,121850
-4D1003DD0009,78,16,13,10,517000,1579944,1590944,1590944,1579944,106000,380000,290000,121850
-4D1003DD0010,77,16,13,10,517000,1605287,1616287,1616287,1605287,106000,380000,290000,121850
-4D1003DD0011,76,16,13,10,517000,1631048,1642048,1642048,1631048,106000,380000,290000,121850
-4D1003DD0012,75,16,13,10,517000,1656459,1667459,1667459,1656459,106000,380000,290000,121850
-4D1003DD0013,74,16,13,10,517000,1682063,1693063,1693063,1682063,106000,380000,290000,121850
-4D1003DD0014,73,16,13,10,517000,1707523,1718523,1718523,1707523,106000,380000,290000,121850
-4D1003DD0015,72,16,13,10,517000,1732667,1743667,1743667,1732667,106000,380000,290000,121850
-4D1003DD0016,71,16,13,10,517000,1758424,1769424,1769424,1758424,106000,380000,290000,121850
-4D1003DD0017,70,16,13,10,517000,1783837,1794837,1794837,1783837,106000,380000,290000,121850
-4D1003DD0018,69,16,13,10,517000,1810113,1821113,1821113,1810113,106000,380000,290000,121850
-4D1004AA0001,412,16,15,10,602800,907,11907,11907,907,106000,380000,290000,121850
-4D1004AA0002,411,16,15,10,602800,29415,40415,40415,29415,106000,380000,290000,121850
-4D1004AA0003,410,16,15,10,602800,59032,70032,70032,59032,106000,380000,290000,121850
-4D1004AA0004,409,16,15,10,602800,89021,100021,100021,89021,106000,380000,290000,121850
-4D1004AA0005,408,16,15,10,602800,118530,129530,129530,118530,106000,380000,290000,121850
-4D1004AA0006,407,16,15,10,602800,148769,159769,159769,148769,106000,380000,290000,121850
-4D1004AA0007,406,16,15,10,602800,178645,189645,189645,178645,106000,380000,290000,121850
-4D1004AA0008,405,16,15,10,602800,209194,220194,220194,209194,106000,380000,290000,121850
-4D1004AA0009,404,16,15,10,602800,238872,249872,249872,238872,106000,380000,290000,121850
-4D1004AA0010,403,16,15,10,602800,269205,280205,280205,269205,106000,380000,290000,121850
-4D1004AA0011,402,16,15,10,602800,298631,309631,309631,298631,106000,380000,290000,121850
-4D1004AA0012,401,16,15,10,602800,329069,340069,340069,329069,106000,380000,290000,121850
-4D1004AA0013,400,16,15,10,602800,358863,369863,369863,358863,106000,380000,290000,121850
-4D1004AA0014,399,16,15,10,602800,389194,400194,400194,389194,106000,380000,290000,121850
-4D1004AA0015,398,16,15,10,602800,419438,430438,430438,419438,106000,380000,290000,121850
-4D1004BB0001,300,16,15,10,602800,449001,460001,460001,449001,106000,380000,290000,121850
-4D1004BB0002,299,16,15,10,602800,479503,490503,490503,479503,106000,380000,290000,121850
-4D1004BB0003,298,16,15,10,602800,509505,520505,520505,509505,106000,380000,290000,121850
-4D1004BB0004,297,16,15,10,602800,539364,550364,550364,539364,106000,380000,290000,121850
-4D1004BB0005,296,16,15,10,602800,569761,580761,580761,569761,106000,380000,290000,121850
-4D1004BB0006,295,16,15,10,602800,599795,610795,610795,599795,106000,380000,290000,121850
-4D1004BB0007,294,16,15,10,602800,629822,640822,640822,629822,106000,380000,290000,121850
-4D1004BB0008,293,16,15,10,600800,659657,670657,670657,659657,106000,380000,290000,121850
-4D1004BB0009,292,16,15,10,600800,690156,701156,701156,690156,106000,380000,290000,121850
-4D1004BB0010,291,16,15,10,600800,719879,730879,730879,719879,106000,380000,290000,121850
-4D1004BB0011,290,16,15,10,600800,749659,760659,760659,749659,106000,380000,290000,121850
-4D1004BB0012,289,16,15,10,600800,780249,791249,791249,780249,106000,380000,290000,121850
-4D1004BB0013,288,16,15,10,600800,810450,821450,821450,810450,106000,380000,290000,121850
-4D1004BB0014,287,16,15,10,600800,840384,851384,851384,840384,106000,380000,290000,121850
-4D1004BB0015,286,16,15,10,600800,869989,880989,880989,869989,106000,380000,290000,121850
-4D1004CC0001,183,16,15,10,600300,900021,911021,911021,900021,106000,380000,290000,121850
-4D1004CC0002,182,16,15,10,600300,930645,941645,941645,930645,106000,380000,290000,121850
-4D1004CC0003,181,16,15,10,600300,960935,971935,971935,960935,106000,380000,290000,121850
-4D1004CC0004,180,16,15,10,600300,991125,1002125,1002125,991125,106000,380000,290000,121850
-4D1004CC0005,179,16,15,10,600300,1020689,1031689,1031689,1020689,106000,380000,290000,121850
-4D1004CC0006,178,16,15,10,600300,1051361,1062361,1062361,1051361,106000,380000,290000,121850
-4D1004CC0007,177,16,15,10,600300,1080760,1091760,1091760,1080760,106000,380000,290000,121850
-4D1004CC0008,176,16,15,10,600300,1111200,1122200,1122200,1111200,106000,380000,290000,121850
-4D1004CC0009,175,16,15,10,599300,1141463,1152463,1152463,1141463,106000,380000,290000,121850
-4D1004CC0010,174,16,15,10,599300,1171281,1182281,1182281,1171281,106000,380000,290000,121850
-4D1004CC0011,173,16,15,10,599300,1200939,1211939,1211939,1200939,106000,380000,290000,121850
-4D1004CC0012,172,16,15,10,599300,1231344,1242344,1242344,1231344,106000,380000,290000,121850
-4D1004CC0013,171,16,15,10,599300,1261383,1272383,1272383,1261383,106000,380000,290000,121850
-4D1004CC0014,170,16,15,10,599300,1291359,1302359,1302359,1291359,106000,380000,290000,121850
-4D1004CC0015,169,16,15,10,599300,1321185,1332185,1332185,1321185,106000,380000,290000,121850
-4D1004DD0001,68,16,15,10,598000,1352000,1363000,1363000,1352000,106000,380000,290000,121850
-4D1004DD0002,67,16,15,10,598000,1381717,1392717,1392717,1381717,106000,380000,290000,121850
-4D1004DD0003,66,16,15,10,598000,1411959,1422959,1422959,1411959,106000,380000,290000,121850
-4D1004DD0004,65,16,15,10,598000,1441636,1452636,1452636,1441636,106000,380000,290000,121850
-4D1004DD0005,64,16,15,10,598000,1472141,1483141,1483141,1472141,106000,380000,290000,121850
-4D1004DD0006,63,16,15,10,598000,1501439,1512439,1512439,1501439,106000,380000,290000,121850
-4D1004DD0007,62,16,15,10,598000,1532315,1543315,1543315,1532315,106000,380000,290000,121850
-4D1004DD0008,61,16,15,10,598000,1562708,1573708,1573708,1562708,106000,380000,290000,121850
-4D1004DD0009,60,16,15,10,598000,1591756,1602756,1602756,1591756,106000,380000,290000,121850
-4D1004DD0010,59,16,15,10,598000,1622093,1633093,1633093,1622093,106000,380000,290000,121850
-4D1004DD0011,58,16,15,10,598000,1652079,1663079,1663079,1652079,106000,380000,290000,121850
-4D1004DD0012,57,16,15,10,598000,1682643,1693643,1693643,1682643,106000,380000,290000,121850
-4D1004DD0013,56,16,15,10,598000,1711726,1722726,1722726,1711726,106000,380000,290000,121850
-4D1004DD0014,55,16,15,10,598000,1742854,1753854,1753854,1742854,106000,380000,290000,121850
-4D1004DD0015,54,16,15,10,598000,1772007,1783007,1783007,1772007,106000,380000,290000,121850
-4D1004DD0016,53,16,15,10,598000,1801830,1812830,1812830,1801830,106000,380000,290000,121850
-4D1005AA0001,397,24,15,10,685000,-1044,13956,13956,-1044,106000,341100,223600,121850
-4D1005AA0002,396,24,15,10,685000,31249,46249,46249,31249,106000,341100,223600,121850
-4D1005AA0003,395,24,15,10,685000,65435,80435,80435,65435,106000,341100,223600,121850
-4D1005AA0004,394,24,15,10,685000,99051,114051,114051,99051,106000,341100,223600,121850
-4D1005AA0005,393,24,15,10,685000,133624,148624,148624,133624,106000,341100,223600,121850
-4D1005AA0006,392,24,15,10,685000,167870,182870,182870,167870,106000,341100,223600,121850
-4D1005AA0007,391,24,15,10,685000,200868,215868,215868,200868,106000,341100,223600,121850
-4D1005AA0008,390,24,15,10,685000,235643,250643,250643,235643,106000,341100,223600,121850
-4D1005AA0009,389,24,15,10,685000,270138,285138,285138,270138,106000,341100,223600,121850
-4D1005AA0010,388,24,15,10,685000,303407,318407,318407,303407,106000,341100,223600,121850
-4D1005AA0011,387,24,15,10,685000,337803,352803,352803,337803,106000,341100,223600,121850
-4D1005AA0012,386,24,15,10,685000,371390,386390,386390,371390,106000,341100,223600,121850
-4D1005AA0013,385,24,15,10,685000,405486,420486,420486,405486,106000,341100,223600,121850
-4D1005AA0014,384,24,15,10,685000,439244,454244,454244,439244,106000,341100,223600,121850
-4D1005BB0001,285,24,15,10,683300,479035,494035,494035,479035,106000,341100,223600,121850
-4D1005BB0002,284,24,15,10,683300,512866,527866,527866,512866,106000,341100,223600,121850
-4D1005BB0003,283,24,15,10,683300,546699,561699,561699,546699,106000,341100,223600,121850
-4D1005BB0004,282,24,15,10,683300,580380,595380,595380,580380,106000,341100,223600,121850
-4D1005BB0005,281,24,15,10,683300,614105,629105,629105,614105,106000,341100,223600,121850
-4D1005BB0006,280,24,15,10,683300,648605,663605,663605,648605,106000,341100,223600,121850
-4D1005BB0007,279,24,15,10,683300,683288,698288,698288,683288,106000,341100,223600,121850
-4D1005BB0008,278,24,15,10,683300,717003,732003,732003,717003,106000,341100,223600,121850
-4D1005BB0009,277,24,15,10,683300,750909,765909,765909,750909,106000,341100,223600,121850
-4D1005BB0010,276,24,15,10,683300,785256,800256,800256,785256,106000,341100,223600,121850
-4D1005BB0011,275,24,15,10,683300,819194,834194,834194,819194,106000,341100,223600,121850
-4D1005BB0012,274,24,15,10,683300,853123,868123,868123,853123,106000,341100,223600,121850
-4D1005BB0013,273,24,15,10,683300,886771,901771,901771,886771,106000,341100,223600,121850
-4D1005CC0001,168,32,15,10,681300,921161,936161,936161,921161,106000,304600,157200,121850
-4D1005CC0002,167,32,15,10,681300,960831,975831,975831,960831,106000,304600,157200,121850
-4D1005CC0003,166,32,15,10,681300,999393,1014393,1014393,999393,106000,304600,157200,121850
-4D1005CC0004,165,32,15,10,681300,1038905,1053905,1053905,1038905,106000,304600,157200,121850
-4D1005CC0005,164,32,15,10,681300,1077997,1092997,1092997,1077997,106000,304600,157200,121850
-4D1005CC0006,163,32,15,10,681300,1117126,1132126,1132126,1117126,106000,304600,157200,121850
-4D1005CC0007,162,32,15,10,680000,1156432,1171432,1171432,1156432,106000,304600,157200,121850
-4D1005CC0008,161,32,15,10,680000,1194953,1209953,1209953,1194953,106000,304600,157200,121850
-4D1005CC0009,160,32,15,10,680000,1234612,1249612,1249612,1234612,106000,304600,157200,121850
-4D1005CC0010,159,32,15,10,680000,1273757,1288757,1288757,1273757,106000,304600,157200,121850
-4D1005CC0011,158,32,15,10,680000,1312597,1327597,1327597,1312597,106000,304600,157200,121850
-4D1005CC0012,157,32,15,10,680000,1351954,1366954,1366954,1351954,106000,304600,157200,121850
-4D1005DD0001,52,32,15,10,679500,1392706,1407706,1407706,1392706,106000,304600,157200,121850
-4D1005DD0002,51,32,15,10,679500,1430447,1445447,1445447,1430447,106000,304600,157200,121850
-4D1005DD0003,50,32,15,10,679500,1469689,1484689,1484689,1469689,106000,304600,157200,121850
-4D1005DD0004,49,32,15,10,679500,1508359,1523359,1523359,1508359,106000,304600,157200,121850
-4D1005DD0005,48,32,15,10,679500,1547315,1562315,1562315,1547315,106000,304600,157200,121850
-4D1005DD0006,47,32,15,10,679500,1587005,1602005,1602005,1587005,106000,304600,157200,121850
-4D1005DD0007,46,32,15,10,679500,1626627,1641627,1641627,1626627,106000,304600,157200,121850
-4D1005DD0008,45,32,15,10,679500,1665111,1680111,1680111,1665111,106000,304600,157200,121850
-4D1005DD0009,44,32,15,10,679500,1704081,1719081,1719081,1704081,106000,304600,157200,121850
-4D1005DD0010,43,32,15,10,679500,1743221,1758221,1758221,1743221,106000,304600,157200,121850
-4D1005DD0011,42,32,15,10,679500,1782581,1797581,1797581,1782581,106000,304600,157200,121850
-4D1005DD0012,41,32,15,10,679500,1821760,1836760,1836760,1821760,106000,304600,157200,121850
-4D1006AA0001,383,44,15,10,34100,-1073,15927,15927,-1073,106000,242000,134900,121850
-4D1006AA0002,382,44,15,10,34100,39582,56582,56582,39582,106000,242000,134900,121850
-4D1006AA0003,381,44,15,10,34100,80804,97804,97804,80804,106000,242000,134900,121850
-4D1006AA0004,380,44,15,10,34100,123427,140427,140427,123427,106000,242000,134900,121850
-4D1006AA0005,379,44,15,10,34100,165023,182023,182023,165023,106000,242000,134900,121850
-4D1006AA0006,378,44,15,10,34100,206868,223868,223868,206868,106000,242000,134900,121850
-4D1006AA0007,377,44,15,10,34100,249292,266292,266292,249292,106000,242000,134900,121850
-4D1006AA0008,376,44,15,10,34100,291370,308370,308370,291370,106000,242000,134900,121850
-4D1006AA0009,375,44,15,10,34100,333258,350258,350258,333258,106000,242000,134900,121850
-4D1006AA0010,374,44,15,10,34100,375369,392369,392369,375369,106000,242000,134900,121850
-4D1006AA0011,373,44,15,10,34100,417158,434158,434158,417158,106000,242000,134900,121850
-4D1006BB0001,272,44,15,10,32500,460677,477677,477677,460677,106000,242000,134900,121850
-4D1006BB0002,271,44,15,10,32500,501813,518813,518813,501813,106000,242000,134900,121850
-4D1006BB0003,270,44,15,10,32500,543442,560442,560442,543442,106000,242000,134900,121850
-4D1006BB0004,269,44,15,10,32500,585451,602451,602451,585451,106000,242000,134900,121850
-4D1006BB0005,268,44,15,10,32500,627507,644507,644507,627507,106000,242000,134900,121850
-4D1006BB0006,267,44,15,10,32500,669553,686553,686553,669553,106000,242000,134900,121850
-4D1006BB0007,266,44,15,10,31100,711723,728723,728723,711723,106000,242000,134900,121850
-4D1006BB0008,265,44,15,10,31100,753883,770883,770883,753883,106000,242000,134900,121850
-4D1006BB0009,264,44,15,10,31100,795724,812724,812724,795724,106000,242000,134900,121850
-4D1006BB0010,263,44,15,10,31100,837752,854752,854752,837752,106000,242000,134900,121850
-4D1006BB0011,262,44,15,10,31100,879026,896026,896026,879026,106000,242000,134900,121850
-4D1006CC0001,156,44,15,10,31000,922212,939212,939212,922212,106000,242000,134900,121850
-4D1006CC0002,155,44,15,10,31000,963596,980596,980596,963596,106000,242000,134900,121850
-4D1006CC0003,154,44,15,10,31000,1005241,1022241,1022241,1005241,106000,242000,134900,121850
-4D1006CC0004,153,44,15,10,31000,1047223,1064223,1064223,1047223,106000,242000,134900,121850
-4D1006CC0005,152,44,15,10,31000,1089302,1106302,1106302,1089302,106000,242000,134900,121850
-4D1006CC0006,151,44,15,10,29000,1131674,1148674,1148674,1131674,106000,242000,134900,121850
-4D1006CC0007,150,44,15,10,29000,1173433,1190433,1190433,1173433,106000,242000,134900,121850
-4D1006CC0008,149,44,15,10,29000,1215794,1232794,1232794,1215794,106000,242000,134900,121850
-4D1006CC0009,148,44,15,10,29000,1257447,1274447,1274447,1257447,106000,242000,134900,121850
-4D1006CC0010,147,44,15,10,29000,1299650,1316650,1316650,1299650,106000,242000,134900,121850
-4D1006CC0011,146,44,15,10,29000,1341230,1358230,1358230,1341230,106000,242000,134900,121850
-4D1006DD0001,40,44,15,10,29000,1384239,1401239,1401239,1384239,106000,242000,134900,121850
-4D1006DD0002,39,44,15,10,29000,1426128,1443128,1443128,1426128,106000,242000,134900,121850
-4D1006DD0003,38,44,15,10,29000,1467774,1484774,1484774,1467774,106000,242000,134900,121850
-4D1006DD0004,37,44,15,10,29000,1509372,1526372,1526372,1509372,106000,242000,134900,121850
-4D1006DD0005,36,44,15,10,29000,1551582,1568582,1568582,1551582,106000,242000,134900,121850
-4D1006DD0006,35,44,15,10,29000,1593430,1610430,1610430,1593430,106000,242000,134900,121850
-4D1006DD0007,34,44,15,10,27000,1635640,1652640,1652640,1635640,106000,242000,134900,121850
-4D1006DD0008,33,44,15,10,27000,1677565,1694565,1694565,1677565,106000,242000,134900,121850
-4D1006DD0009,32,44,15,10,27000,1719758,1736758,1736758,1719758,106000,242000,134900,121850
-4D1006DD0010,31,44,15,10,27000,1761338,1778338,1778338,1761338,106000,242000,134900,121850
-4D1006DD0011,30,44,15,10,27000,1801653,1818653,1818653,1801653,106000,242000,134900,121850
-4D1007AA0001,372,44,15,10,115300,-2095,14905,14905,-2095,106000,242000,134900,121850
-4D1007AA0002,371,44,15,10,115300,39609,56609,56609,39609,106000,242000,134900,121850
-4D1007AA0003,370,44,15,10,115300,81433,98433,98433,81433,106000,242000,134900,121850
-4D1007AA0004,369,44,15,10,115300,123336,140336,140336,123336,106000,242000,134900,121850
-4D1007AA0005,368,44,15,10,115300,165363,182363,182363,165363,106000,242000,134900,121850
-4D1007AA0006,367,44,15,10,115300,207379,224379,224379,207379,106000,242000,134900,121850
-4D1007AA0007,366,44,15,10,115300,249242,266242,266242,249242,106000,242000,134900,121850
-4D1007AA0008,365,44,15,10,115300,291626,308626,308626,291626,106000,242000,134900,121850
-4D1007AA0009,364,44,15,10,115300,333632,350632,350632,333632,106000,242000,134900,121850
-4D1007AA0010,363,44,15,10,115300,375428,392428,392428,375428,106000,242000,134900,121850
-4D1007AA0011,362,44,15,10,115300,417435,434435,434435,417435,106000,242000,134900,121850
-4D1007BB0001,261,44,15,10,113500,460483,477483,477483,460483,106000,242000,134900,121850
-4D1007BB0002,260,44,15,10,113500,501547,518547,518547,501547,106000,242000,134900,121850
-4D1007BB0003,259,44,15,10,113500,543766,560766,560766,543766,106000,242000,134900,121850
-4D1007BB0004,258,44,15,10,113500,585860,602860,602860,585860,106000,242000,134900,121850
-4D1007BB0005,257,44,15,10,113500,628452,645452,645452,628452,106000,242000,134900,121850
-4D1007BB0006,256,44,15,10,112500,669678,686678,686678,669678,106000,242000,134900,121850
-4D1007BB0007,255,44,15,10,112500,711576,728576,728576,711576,106000,242000,134900,121850
-4D1007BB0008,254,44,15,10,112500,753883,770883,770883,753883,106000,242000,134900,121850
-4D1007BB0009,253,44,15,10,112500,795949,812949,812949,795949,106000,242000,134900,121850
-4D1007BB0010,252,44,15,10,112500,837702,854702,854702,837702,106000,242000,134900,121850
-4D1007BB0011,251,44,15,10,112500,879910,896910,896910,879910,106000,242000,134900,121850
-4D1007CC0001,145,44,15,10,111500,922509,939509,939509,922509,106000,242000,134900,121850
-4D1007CC0002,144,44,15,10,111500,964293,981293,981293,964293,106000,242000,134900,121850
-4D1007CC0003,143,44,15,10,111500,1005771,1022771,1022771,1005771,106000,242000,134900,121850
-4D1007CC0004,142,44,15,10,111500,1048191,1065191,1065191,1048191,106000,242000,134900,121850
-4D1007CC0005,141,44,15,10,111500,1090081,1107081,1107081,1090081,106000,242000,134900,121850
-4D1007CC0006,140,44,15,10,110500,1131834,1148834,1148834,1131834,106000,242000,134900,121850
-4D1007CC0007,139,44,15,10,110500,1173682,1190682,1190682,1173682,106000,242000,134900,121850
-4D1007CC0008,138,44,15,10,110500,1216162,1233162,1233162,1216162,106000,242000,134900,121850
-4D1007CC0009,137,44,15,10,110500,1257750,1274750,1274750,1257750,106000,242000,134900,121850
-4D1007CC0010,136,44,15,10,110500,1299971,1316971,1316971,1299971,106000,242000,134900,121850
-4D1007CC0011,135,44,15,10,110500,1341636,1358636,1358636,1341636,106000,242000,134900,121850
-4D1007DD0001,29,44,15,10,110000,1384610,1401610,1401610,1384610,106000,242000,134900,121850
-4D1007DD0002,28,44,15,10,110000,1426159,1443159,1443159,1426159,106000,242000,134900,121850
-4D1007DD0003,27,44,15,10,110000,1467467,1484467,1484467,1467467,106000,242000,134900,121850
-4D1007DD0004,26,44,15,10,110000,1510103,1527103,1527103,1510103,106000,242000,134900,121850
-4D1007DD0005,25,44,15,10,110000,1551855,1568855,1568855,1551855,106000,242000,134900,121850
-4D1007DD0006,24,44,15,10,110000,1593683,1610683,1610683,1593683,106000,242000,134900,121850
-4D1007DD0007,23,44,15,10,110000,1635850,1652850,1652850,1635850,106000,242000,134900,121850
-4D1007DD0008,22,44,15,10,110000,1677763,1694763,1694763,1677763,106000,242000,134900,121850
-4D1007DD0009,21,44,15,10,110000,1719665,1736665,1736665,1719665,106000,242000,134900,121850
-4D1007DD0010,20,44,15,10,110000,1761666,1778666,1778666,1761666,106000,242000,134900,121850
-4D1007DD0011,19,44,15,10,110000,1803340,1820340,1820340,1803340,106000,242000,134900,121850
-4D1008AA0001,361,56,15,10,198500,-1077,15923,15923,-1077,106000,185500,43600,121850
-4D1008AA0002,360,56,15,10,198500,49369,66369,66369,49369,106000,185500,43600,121850
-4D1008AA0003,359,56,15,10,198500,100117,117117,117117,100117,106000,185500,43600,121850
-4D1008AA0004,358,56,15,10,198500,150737,167737,167737,150737,106000,185500,43600,121850
-4D1008AA0005,357,56,15,10,198500,202040,219040,219040,202040,106000,185500,43600,121850
-4D1008AA0006,356,56,15,10,196500,253719,270719,270719,253719,106000,185500,43600,121850
-4D1008AA0007,355,56,15,10,196500,304324,321324,321324,304324,106000,185500,43600,121850
-4D1008AA0008,354,56,15,10,196500,355744,372744,372744,355744,106000,185500,43600,121850
-4D1008AA0009,353,56,15,10,196500,406797,423797,423797,406797,106000,185500,43600,121850
-4D1008BB0001,250,56,15,10,196500,458080,475080,475080,458080,106000,185500,43600,121850
-4D1008BB0002,249,56,15,10,196500,509647,526647,526647,509647,106000,185500,43600,121850
-4D1008BB0003,248,56,15,10,196500,560626,577626,577626,560626,106000,185500,43600,121850
-4D1008BB0004,247,56,15,10,196500,611102,628102,628102,611102,106000,185500,43600,121850
-4D1008BB0005,246,56,15,10,194500,662243,679243,679243,662243,106000,185500,43600,121850
-4D1008BB0006,245,56,15,10,194500,713439,730439,730439,713439,106000,185500,43600,121850
-4D1008BB0007,244,56,15,10,194500,764667,781667,781667,764667,106000,185500,43600,121850
-4D1008BB0008,243,56,15,10,194500,815510,832510,832510,815510,106000,185500,43600,121850
-4D1008BB0009,242,56,15,10,194500,866740,883740,883740,866740,106000,185500,43600,121850
-4D1008CC0001,134,56,15,10,193000,917898,934898,934898,917898,106000,185500,43600,121850
-4D1008CC0002,133,56,15,10,193000,969642,986642,986642,969642,106000,185500,43600,121850
-4D1008CC0003,132,56,15,10,193000,1020287,1037287,1037287,1020287,106000,185500,43600,121850
-4D1008CC0004,131,56,15,10,193000,1071539,1088539,1088539,1071539,106000,185500,43600,121850
-4D1008CC0005,130,56,15,10,193000,1122306,1139306,1139306,1122306,106000,185500,43600,121850
-4D1008CC0006,129,56,15,10,193000,1173269,1190269,1190269,1173269,106000,185500,43600,121850
-4D1008CC0007,128,56,15,10,193000,1224229,1241229,1241229,1224229,106000,185500,43600,121850
-4D1008CC0008,127,56,15,10,193000,1275759,1292759,1292759,1275759,106000,185500,43600,121850
-4D1008CC0009,126,56,15,10,193000,1326361,1343361,1343361,1326361,106000,185500,43600,121850
-4D1008DD0001,18,56,15,10,191000,1377468,1394468,1394468,1377468,106000,185500,43600,121850
-4D1008DD0002,17,56,15,10,191000,1428870,1445870,1445870,1428870,106000,185500,43600,121850
-4D1008DD0003,16,56,15,10,191000,1479652,1496652,1496652,1479652,106000,185500,43600,121850
-4D1008DD0004,15,56,15,10,191000,1530551,1547551,1547551,1530551,106000,185500,43600,121850
-4D1008DD0005,14,56,15,10,191000,1581670,1598670,1598670,1581670,106000,185500,43600,121850
-4D1008DD0006,13,56,15,10,191000,1632747,1649747,1649747,1632747,106000,185500,43600,121850
-4D1008DD0007,12,56,15,10,191000,1683584,1700584,1700584,1683584,106000,185500,43600,121850
-4D1008DD0008,11,56,15,10,191000,1734539,1751539,1751539,1734539,106000,185500,43600,121850
-4D1008DD0009,10,56,15,10,191000,1785660,1802660,1802660,1785660,106000,185500,43600,121850
-4D1009AA0001,352,56,15,10,278000,-539,16461,16461,-539,106000,185500,43600,121850
-4D1009AA0002,351,56,15,10,278000,49983,66983,66983,49983,106000,185500,43600,121850
-4D1009AA0003,350,56,15,10,278000,100143,117143,117143,100143,106000,185500,43600,121850
-4D1009AA0004,349,56,15,10,278000,151906,168906,168906,151906,106000,185500,43600,121850
-4D1009AA0005,348,56,15,10,278000,202927,219927,219927,202927,106000,185500,43600,121850
-4D1009AA0006,347,56,15,10,278000,253768,270768,270768,253768,106000,185500,43600,121850
-4D1009AA0007,346,56,11,10,278000,305199,322199,322199,305199,106000,185500,43600,121850
-4D1009AA0008,345,56,11,10,278000,355849,372849,372849,355849,106000,185500,43600,121850
-4D1009AA0009,344,56,11,10,278000,406912,423912,423912,406912,106000,185500,43600,121850
-4D1009BB0001,241,56,11,10,276500,458179,475179,475179,458179,106000,185500,43600,121850
-4D1009BB0002,240,56,11,10,276500,509402,526402,526402,509402,106000,185500,43600,121850
-4D1009BB0003,239,56,11,10,276500,560193,577193,577193,560193,106000,185500,43600,121850
-4D1009BB0004,238,56,11,10,276500,611261,628261,628261,611261,106000,185500,43600,121850
-4D1009BB0005,237,56,15,10,276500,662846,679846,679846,662846,106000,185500,43600,121850
-4D1009BB0006,236,56,15,10,276500,713808,730808,730808,713808,106000,185500,43600,121850
-4D1009BB0007,235,56,15,10,276500,764864,781864,781864,764864,106000,185500,43600,121850
-4D1009BB0008,234,56,15,10,276500,815718,832718,832718,815718,106000,185500,43600,121850
-4D1009BB0009,233,56,15,10,276500,866624,883624,883624,866624,106000,185500,43600,121850
-4D1009CC0001,125,56,15,10,274000,918530,935530,935530,918530,106000,185500,43600,121850
-4D1009CC0002,124,56,15,10,274000,969027,986027,986027,969027,106000,185500,43600,121850
-4D1009CC0003,123,56,15,10,274000,1019520,1036520,1036520,1019520,106000,185500,43600,121850
-4D1009CC0004,122,56,15,10,274000,1071160,1088160,1088160,1071160,106000,185500,43600,121850
-4D1009CC0005,121,56,15,10,274000,1121953,1138953,1138953,1121953,106000,185500,43600,121850
-4D1009CC0006,120,56,15,10,274000,1173282,1190282,1190282,1173282,106000,185500,43600,121850
-4D1009CC0007,119,56,15,10,274000,1224434,1241434,1241434,1224434,106000,185500,43600,121850
-4D1009CC0008,118,56,15,10,274000,1275551,1292551,1292551,1275551,106000,185500,43600,121850
-4D1009CC0009,117,56,15,10,274000,1326189,1343189,1343189,1326189,106000,185500,43600,121850
-4D1009DD0001,9,56,15,10,272000,1377362,1394362,1394362,1377362,106000,185500,43600,121850
-4D1009DD0002,8,56,15,10,272000,1428950,1445950,1445950,1428950,106000,185500,43600,121850
-4D1009DD0003,7,56,15,10,272000,1478972,1495972,1495972,1478972,106000,185500,43600,121850
-4D1009DD0004,6,56,15,10,272000,1530183,1547183,1547183,1530183,106000,185500,43600,121850
-4D1009DD0005,5,56,15,10,272000,1581247,1598247,1598247,1581247,106000,185500,43600,121850
-4D1009DD0006,4,56,15,10,272000,1632582,1649582,1649582,1632582,106000,185500,43600,121850
-4D1009DD0007,3,56,15,10,272000,1683437,1700437,1700437,1683437,106000,185500,43600,121850
-4D1009DD0008,2,56,15,10,272000,1734298,1751298,1751298,1734298,106000,185500,43600,121850
-4D1009DD0009,1,56,15,10,272000,1785501,1802501,1802501,1785501,106000,185500,43600,121850
+4D1801AA0001,455,44,15,18,360000,-2000,13300,13300,-2000,106000,242000,134900,121850
+4D1801AA0002,454,44,15,18,360000,48000,64000,64000,48000,106000,242000,134900,121850
+4D1801AA0003,453,44,15,18,360000,98600,114600,114600,98600,106000,242000,134900,121850
+4D1801AA0004,452,44,15,18,360000,149300,165300,165300,149300,106000,242000,134900,121850
+4D1801AA0005,451,44,15,18,360000,201000,217000,217000,201000,106000,242000,134900,121850
+4D1801BB0001,343,44,15,18,357300,665652,682652,682652,665652,106000,242000,28000,121850
+4D1801BB0002,342,44,15,18,357300,717341,734341,734341,717341,106000,242000,28000,121850
+4D1801BB0003,341,44,15,18,357300,768082,785082,785082,768082,106000,242000,28000,121850
+4D1801BB0004,340,44,15,18,357300,818672,835672,835672,818672,106000,242000,28000,121850
+4D1801BB0005,339,44,15,18,357300,869743,886743,886743,869743,106000,242000,28000,121850
+4D1801CC0001,232,44,15,18,357300,920651,937651,937651,920651,106000,242000,134900,121850
+4D1801CC0002,231,44,15,18,357300,963749,980749,980749,963749,106000,242000,134900,121850
+4D1801CC0003,230,44,15,18,357300,1004967,1021967,1021967,1004967,106000,242000,134900,121850
+4D1801CC0004,229,44,15,18,357300,1047697,1064697,1064697,1047697,106000,242000,134900,121850
+4D1801CC0005,228,44,15,18,357300,1089084,1106084,1106084,1089084,106000,242000,134900,121850
+4D1801CC0006,227,44,15,18,356300,1131305,1148305,1148305,1131305,106000,242000,134900,121850
+4D1801CC0007,226,44,15,18,356300,1173254,1190254,1190254,1173254,106000,242000,134900,121850
+4D1801CC0008,225,44,15,18,356300,1215316,1232316,1232316,1215316,106000,242000,134900,121850
+4D1801CC0009,224,44,15,18,356300,1257058,1274058,1274058,1257058,106000,242000,134900,121850
+4D1801CC0010,223,44,15,18,356300,1298744,1315744,1315744,1298744,106000,242000,134900,121850
+4D1801CC0011,222,44,15,18,356300,1341032,1358032,1358032,1341032,106000,242000,134900,121850
+4D1801DD0001,116,44,15,18,354500,1383193,1400193,1400193,1383193,106000,242000,134900,121850
+4D1801DD0002,115,44,15,18,354500,1425907,1442907,1442907,1425907,106000,242000,134900,121850
+4D1801DD0003,114,44,15,18,354500,1466794,1483794,1483794,1466794,106000,242000,134900,121850
+4D1801DD0004,113,44,15,18,354500,1509243,1526243,1526243,1509243,106000,242000,134900,121850
+4D1801DD0005,112,44,15,18,354500,1551257,1568257,1568257,1551257,106000,242000,134900,121850
+4D1801DD0006,111,44,15,18,354500,1593106,1610106,1610106,1593106,106000,242000,134900,121850
+4D1801DD0007,110,44,15,18,354500,1634704,1651704,1651704,1634704,106000,242000,134900,121850
+4D1801DD0008,109,44,15,18,354500,1677322,1694322,1694322,1677322,106000,242000,134900,121850
+4D1801DD0009,108,44,15,18,354500,1718703,1735703,1735703,1718703,106000,242000,134900,121850
+4D1801DD0010,107,44,15,18,354500,1760884,1777884,1777884,1760884,106000,242000,134900,121850
+4D1801DD0011,106,44,15,18,354500,1802986,1819986,1819986,1802986,106000,242000,134900,121850
+4D1802AA0001,450,12,13,18,440500,937,11937,11937,937,106000,398000,320000,121850
+4D1802AA0002,449,12,13,18,440500,22290,33290,33290,22290,106000,398000,320000,121850
+4D1802AA0003,448,12,13,18,440500,45178,56178,56178,45178,106000,398000,320000,121850
+4D1802AA0004,447,12,13,18,440500,68339,79339,79339,68339,106000,398000,320000,121850
+4D1802AA0005,446,12,13,18,440500,91715,102715,102715,91715,106000,398000,320000,121850
+4D1802AA0006,445,12,13,18,440500,114782,125782,125782,114782,106000,398000,320000,121850
+4D1802AA0007,444,12,13,18,440500,138242,149242,149242,138242,106000,398000,320000,121850
+4D1802AA0008,443,12,13,18,440500,161298,172298,172298,161298,106000,398000,320000,121850
+4D1802AA0009,442,12,13,18,440500,184573,195573,195573,184573,106000,398000,320000,121850
+4D1802AA0010,441,12,13,18,440500,207886,218886,218886,207886,106000,398000,320000,121850
+4D1802AA0011,440,12,13,18,440500,230787,241787,241787,230787,106000,398000,320000,121850
+4D1802AA0012,439,12,13,18,440500,253704,264704,264704,253704,106000,398000,320000,121850
+4D1802AA0013,438,12,11,18,440500,277329,288329,288329,277329,106000,398000,320000,121850
+4D1802AA0014,437,12,11,18,440500,300651,311651,311651,300651,106000,398000,320000,121850
+4D1802AA0015,436,12,11,18,440500,323916,334916,334916,323916,106000,398000,320000,121850
+4D1802AA0016,435,12,11,18,440500,347288,358288,358288,347288,106000,398000,320000,121850
+4D1802AA0017,434,12,11,18,440500,370708,381708,381708,370708,106000,398000,320000,121850
+4D1802AA0018,433,12,11,18,440500,393721,404721,404721,393721,106000,398000,320000,121850
+4D1802AA0019,432,12,11,18,440500,416686,427686,427686,416686,106000,398000,320000,121850
+4D1802AA0020,431,12,11,18,440500,440674,451674,451674,440674,106000,398000,320000,121850
+4D1802BB0001,338,12,11,18,439000,463414,474414,474414,463414,106000,398000,320000,121850
+4D1802BB0002,337,12,11,18,439000,487256,498256,498256,487256,106000,398000,320000,121850
+4D1802BB0003,336,12,11,18,439000,510165,521165,521165,510165,106000,398000,320000,121850
+4D1802BB0004,335,12,11,18,439000,533218,544218,544218,533218,106000,398000,320000,121850
+4D1802BB0005,334,12,11,18,439000,556688,567688,567688,556688,106000,398000,320000,121850
+4D1802BB0006,333,12,11,18,439000,579500,590500,590500,579500,106000,398000,320000,121850
+4D1802BB0007,332,12,11,18,439000,602659,613659,613659,602659,106000,398000,320000,121850
+4D1802BB0008,331,12,11,18,439000,626175,637175,637175,626175,106000,398000,320000,121850
+4D1802BB0009,330,12,13,18,439000,649090,660090,660090,649090,106000,398000,320000,121850
+4D1802BB0010,329,12,13,18,439000,672087,683087,683087,672087,106000,398000,320000,121850
+4D1802BB0011,328,12,13,18,439000,695785,706785,706785,695785,106000,398000,320000,121850
+4D1802BB0012,327,12,13,18,439000,718732,729732,729732,718732,106000,398000,320000,121850
+4D1802BB0013,326,12,13,18,439000,742166,753166,753166,742166,106000,398000,320000,121850
+4D1802BB0014,325,12,13,18,439000,765367,776367,776367,765367,106000,398000,320000,121850
+4D1802BB0015,324,12,13,18,439000,788686,799686,799686,788686,106000,398000,320000,121850
+4D1802BB0016,323,12,13,18,439000,812065,823065,823065,812065,106000,398000,320000,121850
+4D1802BB0017,322,12,13,18,439000,835335,846335,846335,835335,106000,398000,320000,121850
+4D1802BB0018,321,12,13,18,439000,858335,869335,869335,858335,106000,398000,320000,121850
+4D1802BB0019,320,12,13,18,439000,881914,892914,892914,881914,106000,398000,320000,121850
+4D1802BB0020,319,12,13,18,439000,904875,915875,915875,904875,106000,398000,320000,121850
+4D1802CC0001,221,12,13,18,438000,929739,940739,940739,929739,106000,398000,320000,121850
+4D1802CC0002,220,12,13,18,438000,952874,963874,963874,952874,106000,398000,320000,121850
+4D1802CC0003,219,12,13,18,438000,975340,986340,986340,975340,106000,398000,320000,121850
+4D1802CC0004,218,12,13,18,438000,998666,1009666,1009666,998666,106000,398000,320000,121850
+4D1802CC0005,217,12,13,18,438000,1022100,1033100,1033100,1022100,106000,398000,320000,121850
+4D1802CC0006,216,12,13,18,438000,1044921,1055921,1055921,1044921,106000,398000,320000,121850
+4D1802CC0007,215,12,13,18,438000,1068521,1079521,1079521,1068521,106000,398000,320000,121850
+4D1802CC0008,214,12,13,18,438000,1091674,1102674,1102674,1091674,106000,398000,320000,121850
+4D1802CC0009,213,12,13,18,438000,1115106,1126106,1126106,1115106,106000,398000,320000,121850
+4D1802CC0010,212,12,13,18,438000,1138445,1149445,1149445,1138445,106000,398000,320000,121850
+4D1802CC0011,211,12,13,18,436000,1161543,1172543,1172543,1161543,106000,398000,320000,121850
+4D1802CC0012,210,12,13,18,436000,1184754,1195754,1195754,1184754,106000,398000,320000,121850
+4D1802CC0013,209,12,13,18,436000,1208380,1219380,1219380,1208380,106000,398000,320000,121850
+4D1802CC0014,208,12,13,18,436000,1231133,1242133,1242133,1231133,106000,398000,320000,121850
+4D1802CC0015,207,12,13,18,436000,1254236,1265236,1265236,1254236,106000,398000,320000,121850
+4D1802CC0016,206,12,13,18,436000,1277556,1288556,1288556,1277556,106000,398000,320000,121850
+4D1802CC0017,205,12,13,18,436000,1301041,1312041,1312041,1301041,106000,398000,320000,121850
+4D1802CC0018,204,12,13,18,436000,1324418,1335418,1335418,1324418,106000,398000,320000,121850
+4D1802CC0019,203,12,13,18,436000,1347488,1358488,1358488,1347488,106000,398000,320000,121850
+4D1802CC0020,202,12,13,18,436000,1371096,1382096,1382096,1371096,106000,398000,320000,121850
+4D1802DD0001,105,12,13,18,436000,1394728,1405728,1405728,1394728,106000,398000,320000,121850
+4D1802DD0002,104,12,13,18,436000,1418156,1429156,1429156,1418156,106000,398000,320000,121850
+4D1802DD0003,103,12,13,18,436000,1440889,1451889,1451889,1440889,106000,398000,320000,121850
+4D1802DD0004,102,12,13,18,436000,1464856,1475856,1475856,1464856,106000,398000,320000,121850
+4D1802DD0005,101,12,13,18,436000,1487682,1498682,1498682,1487682,106000,398000,320000,121850
+4D1802DD0006,100,12,13,18,436000,1510394,1521394,1521394,1510394,106000,398000,320000,121850
+4D1802DD0007,99,12,13,18,436000,1534542,1545542,1545542,1534542,106000,398000,320000,121850
+4D1802DD0008,98,12,13,18,436000,1557240,1568240,1568240,1557240,106000,398000,320000,121850
+4D1802DD0009,97,12,13,18,436000,1580195,1591195,1591195,1580195,106000,398000,320000,121850
+4D1802DD0010,96,12,13,18,436000,1603686,1614686,1614686,1603686,106000,398000,320000,121850
+4D1802DD0011,95,12,13,18,434000,1626987,1637987,1637987,1626987,106000,398000,320000,121850
+4D1802DD0012,94,12,13,18,434000,1650460,1661460,1661460,1650460,106000,398000,320000,121850
+4D1802DD0013,93,12,13,18,434000,1672841,1683841,1683841,1672841,106000,398000,320000,121850
+4D1802DD0014,92,12,13,18,434000,1696684,1707684,1707684,1696684,106000,398000,320000,121850
+4D1802DD0015,91,12,13,18,434000,1720054,1731054,1731054,1720054,106000,398000,320000,121850
+4D1802DD0016,90,12,13,18,434000,1743324,1754324,1754324,1743324,106000,398000,320000,121850
+4D1802DD0017,89,12,13,18,434000,1766173,1777173,1777173,1766173,106000,398000,320000,121850
+4D1802DD0018,88,12,13,18,434000,1789601,1800601,1800601,1789601,106000,398000,320000,121850
+4D1802DD0019,87,12,13,18,434000,1812610,1823610,1823610,1812610,106000,398000,320000,121850
+4D1803AA0001,430,16,13,18,522000,945,11945,11945,945,106000,380000,290000,121850
+4D1803AA0002,429,16,13,18,522000,23021,34021,34021,23021,106000,380000,290000,121850
+4D1803AA0003,428,16,13,18,522000,48461,59461,59461,48461,106000,380000,290000,121850
+4D1803AA0004,427,16,13,18,522000,73912,84912,84912,73912,106000,380000,290000,121850
+4D1803AA0005,426,16,13,18,522000,99011,110011,110011,99011,106000,380000,290000,121850
+4D1803AA0006,425,16,13,18,522000,124746,135746,135746,124746,106000,380000,290000,121850
+4D1803AA0007,424,16,13,18,522000,150338,161338,161338,150338,106000,380000,290000,121850
+4D1803AA0008,423,16,13,18,522000,175826,186826,186826,175826,106000,380000,290000,121850
+4D1803AA0009,422,16,13,18,522000,201509,212509,212509,201509,106000,380000,290000,121850
+4D1803AA0010,421,16,13,18,522000,226798,237798,237798,226798,106000,380000,290000,121850
+4D1803AA0011,420,16,13,18,522000,252354,263354,263354,252354,106000,380000,290000,121850
+4D1803AA0012,419,16,13,18,522000,277295,288295,288295,277295,106000,380000,290000,121850
+4D1803AA0013,418,16,13,18,522000,303049,314049,314049,303049,106000,380000,290000,121850
+4D1803AA0014,417,16,13,18,522000,328562,339562,339562,328562,106000,380000,290000,121850
+4D1803AA0015,416,16,13,18,522000,354130,365130,365130,354130,106000,380000,290000,121850
+4D1803AA0016,415,16,13,18,522000,379786,390786,390786,379786,106000,380000,290000,121850
+4D1803AA0017,414,16,13,18,522000,405334,416334,416334,405334,106000,380000,290000,121850
+4D1803AA0018,413,16,13,18,522000,430388,441388,441388,430388,106000,380000,290000,121850
+4D1803BB0001,318,16,13,18,521000,456653,467653,467653,456653,106000,380000,290000,121850
+4D1803BB0002,317,16,13,18,521000,482681,493681,493681,482681,106000,380000,290000,121850
+4D1803BB0003,316,16,13,18,521000,507558,518558,518558,507558,106000,380000,290000,121850
+4D1803BB0004,315,16,13,18,521000,532974,543974,543974,532974,106000,380000,290000,121850
+4D1803BB0005,314,16,13,18,521000,558367,569367,569367,558367,106000,380000,290000,121850
+4D1803BB0006,313,16,13,18,521000,584284,595284,595284,584284,106000,380000,290000,121850
+4D1803BB0007,312,16,13,18,521000,609641,620641,620641,609641,106000,380000,290000,121850
+4D1803BB0008,311,16,13,18,521000,635164,646164,646164,635164,106000,380000,290000,121850
+4D1803BB0009,310,16,13,18,521000,660393,671393,671393,660393,106000,380000,290000,121850
+4D1803BB0010,309,16,13,18,520000,686425,697425,697425,686425,106000,380000,290000,121850
+4D1803BB0011,308,16,13,18,520000,711466,722466,722466,711466,106000,380000,290000,121850
+4D1803BB0012,307,16,13,18,520000,737479,748479,748479,737479,106000,380000,290000,121850
+4D1803BB0013,306,16,13,18,520000,762568,773568,773568,762568,106000,380000,290000,121850
+4D1803BB0014,305,16,13,18,520000,788552,799552,799552,788552,106000,380000,290000,121850
+4D1803BB0015,304,16,13,18,520000,814157,825157,825157,814157,106000,380000,290000,121850
+4D1803BB0016,303,16,13,18,520000,839200,850200,850200,839200,106000,380000,290000,121850
+4D1803BB0017,302,16,13,18,520000,865000,876000,876000,865000,106000,380000,290000,121850
+4D1803BB0018,301,16,13,18,520000,891033,902033,902033,891033,106000,380000,290000,121850
+4D1803CC0001,201,16,13,18,519000,915853,926853,926853,915853,106000,380000,290000,121850
+4D1803CC0002,200,16,13,18,519000,941204,952204,952204,941204,106000,380000,290000,121850
+4D1803CC0003,199,16,13,18,519000,966920,977920,977920,966920,106000,380000,290000,121850
+4D1803CC0004,198,16,13,18,519000,992701,1003701,1003701,992701,106000,380000,290000,121850
+4D1803CC0005,197,16,13,18,519000,1017509,1028509,1028509,1017509,106000,380000,290000,121850
+4D1803CC0006,196,16,13,18,519000,1043231,1054231,1054231,1043231,106000,380000,290000,121850
+4D1803CC0007,195,16,13,18,519000,1069102,1080102,1080102,1069102,106000,380000,290000,121850
+4D1803CC0008,194,16,13,18,519000,1094404,1105404,1105404,1094404,106000,380000,290000,121850
+4D1803CC0009,193,16,13,18,519000,1119958,1130958,1130958,1119958,106000,380000,290000,121850
+4D1803CC0010,192,16,13,18,517000,1145554,1156554,1156554,1145554,106000,380000,290000,121850
+4D1803CC0011,191,16,13,18,517000,1170933,1181933,1181933,1170933,106000,380000,290000,121850
+4D1803CC0012,190,16,13,18,517000,1196466,1207466,1207466,1196466,106000,380000,290000,121850
+4D1803CC0013,189,16,13,18,517000,1221822,1232822,1232822,1221822,106000,380000,290000,121850
+4D1803CC0014,188,16,13,18,517000,1247224,1258224,1258224,1247224,106000,380000,290000,121850
+4D1803CC0015,187,16,13,18,517000,1272933,1283933,1283933,1272933,106000,380000,290000,121850
+4D1803CC0016,186,16,13,18,517000,1298390,1309390,1309390,1298390,106000,380000,290000,121850
+4D1803CC0017,185,16,13,18,517000,1324160,1335160,1335160,1324160,106000,380000,290000,121850
+4D1803CC0018,184,16,13,18,517000,1349249,1360249,1360249,1349249,106000,380000,290000,121850
+4D1803DD0001,86,16,13,18,517000,1376357,1387357,1387357,1376357,106000,380000,290000,121850
+4D1803DD0002,85,16,13,18,517000,1401349,1412349,1412349,1401349,106000,380000,290000,121850
+4D1803DD0003,84,16,13,18,517000,1426863,1437863,1437863,1426863,106000,380000,290000,121850
+4D1803DD0004,83,16,13,18,517000,1452299,1463299,1463299,1452299,106000,380000,290000,121850
+4D1803DD0005,82,16,13,18,517000,1478019,1489019,1489019,1478019,106000,380000,290000,121850
+4D1803DD0006,81,16,13,18,517000,1503529,1514529,1514529,1503529,106000,380000,290000,121850
+4D1803DD0007,80,16,13,18,517000,1528466,1539466,1539466,1528466,106000,380000,290000,121850
+4D1803DD0008,79,16,13,18,517000,1554909,1565909,1565909,1554909,106000,380000,290000,121850
+4D1803DD0009,78,16,13,18,517000,1579944,1590944,1590944,1579944,106000,380000,290000,121850
+4D1803DD0010,77,16,13,18,517000,1605287,1616287,1616287,1605287,106000,380000,290000,121850
+4D1803DD0011,76,16,13,18,517000,1631048,1642048,1642048,1631048,106000,380000,290000,121850
+4D1803DD0012,75,16,13,18,517000,1656459,1667459,1667459,1656459,106000,380000,290000,121850
+4D1803DD0013,74,16,13,18,517000,1682063,1693063,1693063,1682063,106000,380000,290000,121850
+4D1803DD0014,73,16,13,18,517000,1707523,1718523,1718523,1707523,106000,380000,290000,121850
+4D1803DD0015,72,16,13,18,517000,1732667,1743667,1743667,1732667,106000,380000,290000,121850
+4D1803DD0016,71,16,13,18,517000,1758424,1769424,1769424,1758424,106000,380000,290000,121850
+4D1803DD0017,70,16,13,18,517000,1783837,1794837,1794837,1783837,106000,380000,290000,121850
+4D1803DD0018,69,16,13,18,517000,1810113,1821113,1821113,1810113,106000,380000,290000,121850
+4D1804AA0001,412,16,15,18,602800,907,11907,11907,907,106000,380000,290000,121850
+4D1804AA0002,411,16,15,18,602800,29415,40415,40415,29415,106000,380000,290000,121850
+4D1804AA0003,410,16,15,18,602800,59032,70032,70032,59032,106000,380000,290000,121850
+4D1804AA0004,409,16,15,18,602800,89021,100021,100021,89021,106000,380000,290000,121850
+4D1804AA0005,408,16,15,18,602800,118530,129530,129530,118530,106000,380000,290000,121850
+4D1804AA0006,407,16,15,18,602800,148769,159769,159769,148769,106000,380000,290000,121850
+4D1804AA0007,406,16,15,18,602800,178645,189645,189645,178645,106000,380000,290000,121850
+4D1804AA0008,405,16,15,18,602800,209194,220194,220194,209194,106000,380000,290000,121850
+4D1804AA0009,404,16,15,18,602800,238872,249872,249872,238872,106000,380000,290000,121850
+4D1804AA0010,403,16,15,18,602800,269205,280205,280205,269205,106000,380000,290000,121850
+4D1804AA0011,402,16,15,18,602800,298631,309631,309631,298631,106000,380000,290000,121850
+4D1804AA0012,401,16,15,18,602800,329069,340069,340069,329069,106000,380000,290000,121850
+4D1804AA0013,400,16,15,18,602800,358863,369863,369863,358863,106000,380000,290000,121850
+4D1804AA0014,399,16,15,18,602800,389194,400194,400194,389194,106000,380000,290000,121850
+4D1804AA0015,398,16,15,18,602800,419438,430438,430438,419438,106000,380000,290000,121850
+4D1804BB0001,300,16,15,18,602800,449001,460001,460001,449001,106000,380000,290000,121850
+4D1804BB0002,299,16,15,18,602800,479503,490503,490503,479503,106000,380000,290000,121850
+4D1804BB0003,298,16,15,18,602800,509505,520505,520505,509505,106000,380000,290000,121850
+4D1804BB0004,297,16,15,18,602800,539364,550364,550364,539364,106000,380000,290000,121850
+4D1804BB0005,296,16,15,18,602800,569761,580761,580761,569761,106000,380000,290000,121850
+4D1804BB0006,295,16,15,18,602800,599795,610795,610795,599795,106000,380000,290000,121850
+4D1804BB0007,294,16,15,18,602800,629822,640822,640822,629822,106000,380000,290000,121850
+4D1804BB0008,293,16,15,18,600800,659657,670657,670657,659657,106000,380000,290000,121850
+4D1804BB0009,292,16,15,18,600800,690156,701156,701156,690156,106000,380000,290000,121850
+4D1804BB0010,291,16,15,18,600800,719879,730879,730879,719879,106000,380000,290000,121850
+4D1804BB0011,290,16,15,18,600800,749659,760659,760659,749659,106000,380000,290000,121850
+4D1804BB0012,289,16,15,18,600800,780249,791249,791249,780249,106000,380000,290000,121850
+4D1804BB0013,288,16,15,18,600800,810450,821450,821450,810450,106000,380000,290000,121850
+4D1804BB0014,287,16,15,18,600800,840384,851384,851384,840384,106000,380000,290000,121850
+4D1804BB0015,286,16,15,18,600800,869989,880989,880989,869989,106000,380000,290000,121850
+4D1804CC0001,183,16,15,18,600300,900021,911021,911021,900021,106000,380000,290000,121850
+4D1804CC0002,182,16,15,18,600300,930645,941645,941645,930645,106000,380000,290000,121850
+4D1804CC0003,181,16,15,18,600300,960935,971935,971935,960935,106000,380000,290000,121850
+4D1804CC0004,180,16,15,18,600300,991125,1002125,1002125,991125,106000,380000,290000,121850
+4D1804CC0005,179,16,15,18,600300,1020689,1031689,1031689,1020689,106000,380000,290000,121850
+4D1804CC0006,178,16,15,18,600300,1051361,1062361,1062361,1051361,106000,380000,290000,121850
+4D1804CC0007,177,16,15,18,600300,1080760,1091760,1091760,1080760,106000,380000,290000,121850
+4D1804CC0008,176,16,15,18,600300,1111200,1122200,1122200,1111200,106000,380000,290000,121850
+4D1804CC0009,175,16,15,18,599300,1141463,1152463,1152463,1141463,106000,380000,290000,121850
+4D1804CC0010,174,16,15,18,599300,1171281,1182281,1182281,1171281,106000,380000,290000,121850
+4D1804CC0011,173,16,15,18,599300,1200939,1211939,1211939,1200939,106000,380000,290000,121850
+4D1804CC0012,172,16,15,18,599300,1231344,1242344,1242344,1231344,106000,380000,290000,121850
+4D1804CC0013,171,16,15,18,599300,1261383,1272383,1272383,1261383,106000,380000,290000,121850
+4D1804CC0014,170,16,15,18,599300,1291359,1302359,1302359,1291359,106000,380000,290000,121850
+4D1804CC0015,169,16,15,18,599300,1321185,1332185,1332185,1321185,106000,380000,290000,121850
+4D1804DD0001,68,16,15,18,598000,1352000,1363000,1363000,1352000,106000,380000,290000,121850
+4D1804DD0002,67,16,15,18,598000,1381717,1392717,1392717,1381717,106000,380000,290000,121850
+4D1804DD0003,66,16,15,18,598000,1411959,1422959,1422959,1411959,106000,380000,290000,121850
+4D1804DD0004,65,16,15,18,598000,1441636,1452636,1452636,1441636,106000,380000,290000,121850
+4D1804DD0005,64,16,15,18,598000,1472141,1483141,1483141,1472141,106000,380000,290000,121850
+4D1804DD0006,63,16,15,18,598000,1501439,1512439,1512439,1501439,106000,380000,290000,121850
+4D1804DD0007,62,16,15,18,598000,1532315,1543315,1543315,1532315,106000,380000,290000,121850
+4D1804DD0008,61,16,15,18,598000,1562708,1573708,1573708,1562708,106000,380000,290000,121850
+4D1804DD0009,60,16,15,18,598000,1591756,1602756,1602756,1591756,106000,380000,290000,121850
+4D1804DD0010,59,16,15,18,598000,1622093,1633093,1633093,1622093,106000,380000,290000,121850
+4D1804DD0011,58,16,15,18,598000,1652079,1663079,1663079,1652079,106000,380000,290000,121850
+4D1804DD0012,57,16,15,18,598000,1682643,1693643,1693643,1682643,106000,380000,290000,121850
+4D1804DD0013,56,16,15,18,598000,1711726,1722726,1722726,1711726,106000,380000,290000,121850
+4D1804DD0014,55,16,15,18,598000,1742854,1753854,1753854,1742854,106000,380000,290000,121850
+4D1804DD0015,54,16,15,18,598000,1772007,1783007,1783007,1772007,106000,380000,290000,121850
+4D1804DD0016,53,16,15,18,598000,1801830,1812830,1812830,1801830,106000,380000,290000,121850
+4D1805AA0001,397,24,15,18,685000,-1044,13956,13956,-1044,106000,341100,223600,121850
+4D1805AA0002,396,24,15,18,685000,31249,46249,46249,31249,106000,341100,223600,121850
+4D1805AA0003,395,24,15,18,685000,65435,80435,80435,65435,106000,341100,223600,121850
+4D1805AA0004,394,24,15,18,685000,99051,114051,114051,99051,106000,341100,223600,121850
+4D1805AA0005,393,24,15,18,685000,133624,148624,148624,133624,106000,341100,223600,121850
+4D1805AA0006,392,24,15,18,685000,167870,182870,182870,167870,106000,341100,223600,121850
+4D1805AA0007,391,24,15,18,685000,200868,215868,215868,200868,106000,341100,223600,121850
+4D1805AA0008,390,24,15,18,685000,235643,250643,250643,235643,106000,341100,223600,121850
+4D1805AA0009,389,24,15,18,685000,270138,285138,285138,270138,106000,341100,223600,121850
+4D1805AA0010,388,24,15,18,685000,303407,318407,318407,303407,106000,341100,223600,121850
+4D1805AA0011,387,24,15,18,685000,337803,352803,352803,337803,106000,341100,223600,121850
+4D1805AA0012,386,24,15,18,685000,371390,386390,386390,371390,106000,341100,223600,121850
+4D1805AA0013,385,24,15,18,685000,405486,420486,420486,405486,106000,341100,223600,121850
+4D1805AA0014,384,24,15,18,685000,439244,454244,454244,439244,106000,341100,223600,121850
+4D1805BB0001,285,24,15,18,683300,479035,494035,494035,479035,106000,341100,223600,121850
+4D1805BB0002,284,24,15,18,683300,512866,527866,527866,512866,106000,341100,223600,121850
+4D1805BB0003,283,24,15,18,683300,546699,561699,561699,546699,106000,341100,223600,121850
+4D1805BB0004,282,24,15,18,683300,580380,595380,595380,580380,106000,341100,223600,121850
+4D1805BB0005,281,24,15,18,683300,614105,629105,629105,614105,106000,341100,223600,121850
+4D1805BB0006,280,24,15,18,683300,648605,663605,663605,648605,106000,341100,223600,121850
+4D1805BB0007,279,24,15,18,683300,683288,698288,698288,683288,106000,341100,223600,121850
+4D1805BB0008,278,24,15,18,683300,717003,732003,732003,717003,106000,341100,223600,121850
+4D1805BB0009,277,24,15,18,683300,750909,765909,765909,750909,106000,341100,223600,121850
+4D1805BB0010,276,24,15,18,683300,785256,800256,800256,785256,106000,341100,223600,121850
+4D1805BB0011,275,24,15,18,683300,819194,834194,834194,819194,106000,341100,223600,121850
+4D1805BB0012,274,24,15,18,683300,853123,868123,868123,853123,106000,341100,223600,121850
+4D1805BB0013,273,24,15,18,683300,886771,901771,901771,886771,106000,341100,223600,121850
+4D1805CC0001,168,32,15,18,681300,921161,936161,936161,921161,106000,304600,157200,121850
+4D1805CC0002,167,32,15,18,681300,960831,975831,975831,960831,106000,304600,157200,121850
+4D1805CC0003,166,32,15,18,681300,999393,1014393,1014393,999393,106000,304600,157200,121850
+4D1805CC0004,165,32,15,18,681300,1038905,1053905,1053905,1038905,106000,304600,157200,121850
+4D1805CC0005,164,32,15,18,681300,1077997,1092997,1092997,1077997,106000,304600,157200,121850
+4D1805CC0006,163,32,15,18,681300,1117126,1132126,1132126,1117126,106000,304600,157200,121850
+4D1805CC0007,162,32,15,18,680000,1156432,1171432,1171432,1156432,106000,304600,157200,121850
+4D1805CC0008,161,32,15,18,680000,1194953,1209953,1209953,1194953,106000,304600,157200,121850
+4D1805CC0009,160,32,15,18,680000,1234612,1249612,1249612,1234612,106000,304600,157200,121850
+4D1805CC0010,159,32,15,18,680000,1273757,1288757,1288757,1273757,106000,304600,157200,121850
+4D1805CC0011,158,32,15,18,680000,1312597,1327597,1327597,1312597,106000,304600,157200,121850
+4D1805CC0012,157,32,15,18,680000,1351954,1366954,1366954,1351954,106000,304600,157200,121850
+4D1805DD0001,52,32,15,18,679500,1392706,1407706,1407706,1392706,106000,304600,157200,121850
+4D1805DD0002,51,32,15,18,679500,1430447,1445447,1445447,1430447,106000,304600,157200,121850
+4D1805DD0003,50,32,15,18,679500,1469689,1484689,1484689,1469689,106000,304600,157200,121850
+4D1805DD0004,49,32,15,18,679500,1508359,1523359,1523359,1508359,106000,304600,157200,121850
+4D1805DD0005,48,32,15,18,679500,1547315,1562315,1562315,1547315,106000,304600,157200,121850
+4D1805DD0006,47,32,15,18,679500,1587005,1602005,1602005,1587005,106000,304600,157200,121850
+4D1805DD0007,46,32,15,18,679500,1626627,1641627,1641627,1626627,106000,304600,157200,121850
+4D1805DD0008,45,32,15,18,679500,1665111,1680111,1680111,1665111,106000,304600,157200,121850
+4D1805DD0009,44,32,15,18,679500,1704081,1719081,1719081,1704081,106000,304600,157200,121850
+4D1805DD0010,43,32,15,18,679500,1743221,1758221,1758221,1743221,106000,304600,157200,121850
+4D1805DD0011,42,32,15,18,679500,1782581,1797581,1797581,1782581,106000,304600,157200,121850
+4D1805DD0012,41,32,15,18,679500,1821760,1836760,1836760,1821760,106000,304600,157200,121850
+4D1806AA0001,383,44,15,18,34100,-1073,15927,15927,-1073,106000,242000,134900,121850
+4D1806AA0002,382,44,15,18,34100,39582,56582,56582,39582,106000,242000,134900,121850
+4D1806AA0003,381,44,15,18,34100,80804,97804,97804,80804,106000,242000,134900,121850
+4D1806AA0004,380,44,15,18,34100,123427,140427,140427,123427,106000,242000,134900,121850
+4D1806AA0005,379,44,15,18,34100,165023,182023,182023,165023,106000,242000,134900,121850
+4D1806AA0006,378,44,15,18,34100,206868,223868,223868,206868,106000,242000,134900,121850
+4D1806AA0007,377,44,15,18,34100,249292,266292,266292,249292,106000,242000,134900,121850
+4D1806AA0008,376,44,15,18,34100,291370,308370,308370,291370,106000,242000,134900,121850
+4D1806AA0009,375,44,15,18,34100,333258,350258,350258,333258,106000,242000,134900,121850
+4D1806AA0010,374,44,15,18,34100,375369,392369,392369,375369,106000,242000,134900,121850
+4D1806AA0011,373,44,15,18,34100,417158,434158,434158,417158,106000,242000,134900,121850
+4D1806BB0001,272,44,15,18,32500,460677,477677,477677,460677,106000,242000,134900,121850
+4D1806BB0002,271,44,15,18,32500,501813,518813,518813,501813,106000,242000,134900,121850
+4D1806BB0003,270,44,15,18,32500,543442,560442,560442,543442,106000,242000,134900,121850
+4D1806BB0004,269,44,15,18,32500,585451,602451,602451,585451,106000,242000,134900,121850
+4D1806BB0005,268,44,15,18,32500,627507,644507,644507,627507,106000,242000,134900,121850
+4D1806BB0006,267,44,15,18,32500,669553,686553,686553,669553,106000,242000,134900,121850
+4D1806BB0007,266,44,15,18,31100,711723,728723,728723,711723,106000,242000,134900,121850
+4D1806BB0008,265,44,15,18,31100,753883,770883,770883,753883,106000,242000,134900,121850
+4D1806BB0009,264,44,15,18,31100,795724,812724,812724,795724,106000,242000,134900,121850
+4D1806BB0010,263,44,15,18,31100,837752,854752,854752,837752,106000,242000,134900,121850
+4D1806BB0011,262,44,15,18,31100,879026,896026,896026,879026,106000,242000,134900,121850
+4D1806CC0001,156,44,15,18,31000,922212,939212,939212,922212,106000,242000,134900,121850
+4D1806CC0002,155,44,15,18,31000,963596,980596,980596,963596,106000,242000,134900,121850
+4D1806CC0003,154,44,15,18,31000,1005241,1022241,1022241,1005241,106000,242000,134900,121850
+4D1806CC0004,153,44,15,18,31000,1047223,1064223,1064223,1047223,106000,242000,134900,121850
+4D1806CC0005,152,44,15,18,31000,1089302,1106302,1106302,1089302,106000,242000,134900,121850
+4D1806CC0006,151,44,15,18,29000,1131674,1148674,1148674,1131674,106000,242000,134900,121850
+4D1806CC0007,150,44,15,18,29000,1173433,1190433,1190433,1173433,106000,242000,134900,121850
+4D1806CC0008,149,44,15,18,29000,1215794,1232794,1232794,1215794,106000,242000,134900,121850
+4D1806CC0009,148,44,15,18,29000,1257447,1274447,1274447,1257447,106000,242000,134900,121850
+4D1806CC0010,147,44,15,18,29000,1299650,1316650,1316650,1299650,106000,242000,134900,121850
+4D1806CC0011,146,44,15,18,29000,1341230,1358230,1358230,1341230,106000,242000,134900,121850
+4D1806DD0001,40,44,15,18,29000,1384239,1401239,1401239,1384239,106000,242000,134900,121850
+4D1806DD0002,39,44,15,18,29000,1426128,1443128,1443128,1426128,106000,242000,134900,121850
+4D1806DD0003,38,44,15,18,29000,1467774,1484774,1484774,1467774,106000,242000,134900,121850
+4D1806DD0004,37,44,15,18,29000,1509372,1526372,1526372,1509372,106000,242000,134900,121850
+4D1806DD0005,36,44,15,18,29000,1551582,1568582,1568582,1551582,106000,242000,134900,121850
+4D1806DD0006,35,44,15,18,29000,1593430,1610430,1610430,1593430,106000,242000,134900,121850
+4D1806DD0007,34,44,15,18,27000,1635640,1652640,1652640,1635640,106000,242000,134900,121850
+4D1806DD0008,33,44,15,18,27000,1677565,1694565,1694565,1677565,106000,242000,134900,121850
+4D1806DD0009,32,44,15,18,27000,1719758,1736758,1736758,1719758,106000,242000,134900,121850
+4D1806DD0010,31,44,15,18,27000,1761338,1778338,1778338,1761338,106000,242000,134900,121850
+4D1806DD0011,30,44,15,18,27000,1801653,1818653,1818653,1801653,106000,242000,134900,121850
+4D1807AA0001,372,44,15,18,115300,-2095,14905,14905,-2095,106000,242000,134900,121850
+4D1807AA0002,371,44,15,18,115300,39609,56609,56609,39609,106000,242000,134900,121850
+4D1807AA0003,370,44,15,18,115300,81433,98433,98433,81433,106000,242000,134900,121850
+4D1807AA0004,369,44,15,18,115300,123336,140336,140336,123336,106000,242000,134900,121850
+4D1807AA0005,368,44,15,18,115300,165363,182363,182363,165363,106000,242000,134900,121850
+4D1807AA0006,367,44,15,18,115300,207379,224379,224379,207379,106000,242000,134900,121850
+4D1807AA0007,366,44,15,18,115300,249242,266242,266242,249242,106000,242000,134900,121850
+4D1807AA0008,365,44,15,18,115300,291626,308626,308626,291626,106000,242000,134900,121850
+4D1807AA0009,364,44,15,18,115300,333632,350632,350632,333632,106000,242000,134900,121850
+4D1807AA0010,363,44,15,18,115300,375428,392428,392428,375428,106000,242000,134900,121850
+4D1807AA0011,362,44,15,18,115300,417435,434435,434435,417435,106000,242000,134900,121850
+4D1807BB0001,261,44,15,18,113500,460483,477483,477483,460483,106000,242000,134900,121850
+4D1807BB0002,260,44,15,18,113500,501547,518547,518547,501547,106000,242000,134900,121850
+4D1807BB0003,259,44,15,18,113500,543766,560766,560766,543766,106000,242000,134900,121850
+4D1807BB0004,258,44,15,18,113500,585860,602860,602860,585860,106000,242000,134900,121850
+4D1807BB0005,257,44,15,18,113500,628452,645452,645452,628452,106000,242000,134900,121850
+4D1807BB0006,256,44,15,18,112500,669678,686678,686678,669678,106000,242000,134900,121850
+4D1807BB0007,255,44,15,18,112500,711576,728576,728576,711576,106000,242000,134900,121850
+4D1807BB0008,254,44,15,18,112500,753883,770883,770883,753883,106000,242000,134900,121850
+4D1807BB0009,253,44,15,18,112500,795949,812949,812949,795949,106000,242000,134900,121850
+4D1807BB0010,252,44,15,18,112500,837702,854702,854702,837702,106000,242000,134900,121850
+4D1807BB0011,251,44,15,18,112500,879910,896910,896910,879910,106000,242000,134900,121850
+4D1807CC0001,145,44,15,18,111500,922509,939509,939509,922509,106000,242000,134900,121850
+4D1807CC0002,144,44,15,18,111500,964293,981293,981293,964293,106000,242000,134900,121850
+4D1807CC0003,143,44,15,18,111500,1005771,1022771,1022771,1005771,106000,242000,134900,121850
+4D1807CC0004,142,44,15,18,111500,1048191,1065191,1065191,1048191,106000,242000,134900,121850
+4D1807CC0005,141,44,15,18,111500,1090081,1107081,1107081,1090081,106000,242000,134900,121850
+4D1807CC0006,140,44,15,18,110500,1131834,1148834,1148834,1131834,106000,242000,134900,121850
+4D1807CC0007,139,44,15,18,110500,1173682,1190682,1190682,1173682,106000,242000,134900,121850
+4D1807CC0008,138,44,15,18,110500,1216162,1233162,1233162,1216162,106000,242000,134900,121850
+4D1807CC0009,137,44,15,18,110500,1257750,1274750,1274750,1257750,106000,242000,134900,121850
+4D1807CC0010,136,44,15,18,110500,1299971,1316971,1316971,1299971,106000,242000,134900,121850
+4D1807CC0011,135,44,15,18,110500,1341636,1358636,1358636,1341636,106000,242000,134900,121850
+4D1807DD0001,29,44,15,18,110000,1384610,1401610,1401610,1384610,106000,242000,134900,121850
+4D1807DD0002,28,44,15,18,110000,1426159,1443159,1443159,1426159,106000,242000,134900,121850
+4D1807DD0003,27,44,15,18,110000,1467467,1484467,1484467,1467467,106000,242000,134900,121850
+4D1807DD0004,26,44,15,18,110000,1510103,1527103,1527103,1510103,106000,242000,134900,121850
+4D1807DD0005,25,44,15,18,110000,1551855,1568855,1568855,1551855,106000,242000,134900,121850
+4D1807DD0006,24,44,15,18,110000,1593683,1610683,1610683,1593683,106000,242000,134900,121850
+4D1807DD0007,23,44,15,18,110000,1635850,1652850,1652850,1635850,106000,242000,134900,121850
+4D1807DD0008,22,44,15,18,110000,1677763,1694763,1694763,1677763,106000,242000,134900,121850
+4D1807DD0009,21,44,15,18,110000,1719665,1736665,1736665,1719665,106000,242000,134900,121850
+4D1807DD0010,20,44,15,18,110000,1761666,1778666,1778666,1761666,106000,242000,134900,121850
+4D1807DD0011,19,44,15,18,110000,1803340,1820340,1820340,1803340,106000,242000,134900,121850
+4D1808AA0001,361,56,15,18,198500,-1077,15923,15923,-1077,106000,185500,43600,121850
+4D1808AA0002,360,56,15,18,198500,49369,66369,66369,49369,106000,185500,43600,121850
+4D1808AA0003,359,56,15,18,198500,100117,117117,117117,100117,106000,185500,43600,121850
+4D1808AA0004,358,56,15,18,198500,150737,167737,167737,150737,106000,185500,43600,121850
+4D1808AA0005,357,56,15,18,198500,202040,219040,219040,202040,106000,185500,43600,121850
+4D1808AA0006,356,56,15,18,196500,253719,270719,270719,253719,106000,185500,43600,121850
+4D1808AA0007,355,56,15,18,196500,304324,321324,321324,304324,106000,185500,43600,121850
+4D1808AA0008,354,56,15,18,196500,355744,372744,372744,355744,106000,185500,43600,121850
+4D1808AA0009,353,56,15,18,196500,406797,423797,423797,406797,106000,185500,43600,121850
+4D1808BB0001,250,56,15,18,196500,458080,475080,475080,458080,106000,185500,43600,121850
+4D1808BB0002,249,56,15,18,196500,509647,526647,526647,509647,106000,185500,43600,121850
+4D1808BB0003,248,56,15,18,196500,560626,577626,577626,560626,106000,185500,43600,121850
+4D1808BB0004,247,56,15,18,196500,611102,628102,628102,611102,106000,185500,43600,121850
+4D1808BB0005,246,56,15,18,194500,662243,679243,679243,662243,106000,185500,43600,121850
+4D1808BB0006,245,56,15,18,194500,713439,730439,730439,713439,106000,185500,43600,121850
+4D1808BB0007,244,56,15,18,194500,764667,781667,781667,764667,106000,185500,43600,121850
+4D1808BB0008,243,56,15,18,194500,815510,832510,832510,815510,106000,185500,43600,121850
+4D1808BB0009,242,56,15,18,194500,866740,883740,883740,866740,106000,185500,43600,121850
+4D1808CC0001,134,56,15,18,193000,917898,934898,934898,917898,106000,185500,43600,121850
+4D1808CC0002,133,56,15,18,193000,969642,986642,986642,969642,106000,185500,43600,121850
+4D1808CC0003,132,56,15,18,193000,1020287,1037287,1037287,1020287,106000,185500,43600,121850
+4D1808CC0004,131,56,15,18,193000,1071539,1088539,1088539,1071539,106000,185500,43600,121850
+4D1808CC0005,130,56,15,18,193000,1122306,1139306,1139306,1122306,106000,185500,43600,121850
+4D1808CC0006,129,56,15,18,193000,1173269,1190269,1190269,1173269,106000,185500,43600,121850
+4D1808CC0007,128,56,15,18,193000,1224229,1241229,1241229,1224229,106000,185500,43600,121850
+4D1808CC0008,127,56,15,18,193000,1275759,1292759,1292759,1275759,106000,185500,43600,121850
+4D1808CC0009,126,56,15,18,193000,1326361,1343361,1343361,1326361,106000,185500,43600,121850
+4D1808DD0001,18,56,15,18,191000,1377468,1394468,1394468,1377468,106000,185500,43600,121850
+4D1808DD0002,17,56,15,18,191000,1428870,1445870,1445870,1428870,106000,185500,43600,121850
+4D1808DD0003,16,56,15,18,191000,1479652,1496652,1496652,1479652,106000,185500,43600,121850
+4D1808DD0004,15,56,15,18,191000,1530551,1547551,1547551,1530551,106000,185500,43600,121850
+4D1808DD0005,14,56,15,18,191000,1581670,1598670,1598670,1581670,106000,185500,43600,121850
+4D1808DD0006,13,56,15,18,191000,1632747,1649747,1649747,1632747,106000,185500,43600,121850
+4D1808DD0007,12,56,15,18,191000,1683584,1700584,1700584,1683584,106000,185500,43600,121850
+4D1808DD0008,11,56,15,18,191000,1734539,1751539,1751539,1734539,106000,185500,43600,121850
+4D1808DD0009,1,56,15,18,191000,1785660,1802660,1802660,1785660,106000,185500,43600,121850
+4D1809AA0001,352,56,15,18,278000,-539,16461,16461,-539,106000,185500,43600,121850
+4D1809AA0002,351,56,15,18,278000,49983,66983,66983,49983,106000,185500,43600,121850
+4D1809AA0003,350,56,15,18,278000,100143,117143,117143,100143,106000,185500,43600,121850
+4D1809AA0004,349,56,15,18,278000,151906,168906,168906,151906,106000,185500,43600,121850
+4D1809AA0005,348,56,15,18,278000,202927,219927,219927,202927,106000,185500,43600,121850
+4D1809AA0006,347,56,15,18,278000,253768,270768,270768,253768,106000,185500,43600,121850
+4D1809AA0007,346,56,11,18,278000,305199,322199,322199,305199,106000,185500,43600,121850
+4D1809AA0008,345,56,11,18,278000,355849,372849,372849,355849,106000,185500,43600,121850
+4D1809AA0009,344,56,11,18,278000,406912,423912,423912,406912,106000,185500,43600,121850
+4D1809BB0001,241,56,11,18,276500,458179,475179,475179,458179,106000,185500,43600,121850
+4D1809BB0002,240,56,11,18,276500,509402,526402,526402,509402,106000,185500,43600,121850
+4D1809BB0003,239,56,11,18,276500,560193,577193,577193,560193,106000,185500,43600,121850
+4D1809BB0004,238,56,11,18,276500,611261,628261,628261,611261,106000,185500,43600,121850
+4D1809BB0005,237,56,15,18,276500,662846,679846,679846,662846,106000,185500,43600,121850
+4D1809BB0006,236,56,15,18,276500,713808,730808,730808,713808,106000,185500,43600,121850
+4D1809BB0007,235,56,15,18,276500,764864,781864,781864,764864,106000,185500,43600,121850
+4D1809BB0008,234,56,15,18,276500,815718,832718,832718,815718,106000,185500,43600,121850
+4D1809BB0009,233,56,15,18,276500,866624,883624,883624,866624,106000,185500,43600,121850
+4D1809CC0001,125,56,15,18,274000,918530,935530,935530,918530,106000,185500,43600,121850
+4D1809CC0002,124,56,15,18,274000,969027,986027,986027,969027,106000,185500,43600,121850
+4D1809CC0003,123,56,15,18,274000,1019520,1036520,1036520,1019520,106000,185500,43600,121850
+4D1809CC0004,122,56,15,18,274000,1071160,1088160,1088160,1071160,106000,185500,43600,121850
+4D1809CC0005,121,56,15,18,274000,1121953,1138953,1138953,1121953,106000,185500,43600,121850
+4D1809CC0006,120,56,15,18,274000,1173282,1190282,1190282,1173282,106000,185500,43600,121850
+4D1809CC0007,119,56,15,18,274000,1224434,1241434,1241434,1224434,106000,185500,43600,121850
+4D1809CC0008,118,56,15,18,274000,1275551,1292551,1292551,1275551,106000,185500,43600,121850
+4D1809CC0009,117,56,15,18,274000,1326189,1343189,1343189,1326189,106000,185500,43600,121850
+4D1809DD0001,9,56,15,18,272000,1377362,1394362,1394362,1377362,106000,185500,43600,121850
+4D1809DD0002,8,56,15,18,272000,1428950,1445950,1445950,1428950,106000,185500,43600,121850
+4D1809DD0003,7,56,15,18,272000,1478972,1495972,1495972,1478972,106000,185500,43600,121850
+4D1809DD0004,6,56,15,18,272000,1530183,1547183,1547183,1530183,106000,185500,43600,121850
+4D1809DD0005,5,56,15,18,272000,1581247,1598247,1598247,1581247,106000,185500,43600,121850
+4D1809DD0006,4,56,15,18,272000,1632582,1649582,1649582,1632582,106000,185500,43600,121850
+4D1809DD0007,3,56,15,18,272000,1683437,1700437,1700437,1683437,106000,185500,43600,121850
+4D1809DD0008,2,56,15,18,272000,1734298,1751298,1751298,1734298,106000,185500,43600,121850
+4D1809DD0009,1,56,15,18,272000,1785501,1802501,1802501,1785501,106000,185500,43600,121850

source/DeviceLibrary/StoreConfig/AC/linePositions_2.csv

 位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴进料口取料点P2
 位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴进料口取料点P2
-4D1001AA0001,455,44,15,10,360000,-2000,13300,13300,-2000,106000,242000,134900,121850
-4D1001AA0002,454,44,15,10,360000,48000,64000,64000,48000,106000,242000,134900,121850
-4D1001AA0003,453,44,15,10,360000,98600,114600,114600,98600,106000,242000,134900,121850
-4D1001AA0004,452,44,15,10,360000,149300,165300,165300,149300,106000,242000,134900,121850
-4D1001AA0005,451,44,15,10,360000,201000,217000,217000,201000,106000,242000,134900,121850
-4D1001BB0001,343,44,15,10,357300,665652,682652,682652,665652,106000,242000,28000,121850
-4D1001BB0002,342,44,15,10,357300,717341,734341,734341,717341,106000,242000,28000,121850
-4D1001BB0003,341,44,15,10,357300,768082,785082,785082,768082,106000,242000,28000,121850
-4D1001BB0004,340,44,15,10,357300,818672,835672,835672,818672,106000,242000,28000,121850
-4D1001BB0005,339,44,15,10,357300,869743,886743,886743,869743,106000,242000,28000,121850
-4D1001CC0001,232,44,15,10,357300,920651,937651,937651,920651,106000,242000,134900,121850
-4D1001CC0002,231,44,15,10,357300,963749,980749,980749,963749,106000,242000,134900,121850
-4D1001CC0003,230,44,15,10,357300,1004967,1021967,1021967,1004967,106000,242000,134900,121850
-4D1001CC0004,229,44,15,10,357300,1047697,1064697,1064697,1047697,106000,242000,134900,121850
-4D1001CC0005,228,44,15,10,357300,1089084,1106084,1106084,1089084,106000,242000,134900,121850
-4D1001CC0006,227,44,15,10,356300,1131305,1148305,1148305,1131305,106000,242000,134900,121850
-4D1001CC0007,226,44,15,10,356300,1173254,1190254,1190254,1173254,106000,242000,134900,121850
-4D1001CC0008,225,44,15,10,356300,1215316,1232316,1232316,1215316,106000,242000,134900,121850
-4D1001CC0009,224,44,15,10,356300,1257058,1274058,1274058,1257058,106000,242000,134900,121850
-4D1001CC0010,223,44,15,10,356300,1298744,1315744,1315744,1298744,106000,242000,134900,121850
-4D1001CC0011,222,44,15,10,356300,1341032,1358032,1358032,1341032,106000,242000,134900,121850
-4D1001DD0001,116,44,15,10,354500,1383193,1400193,1400193,1383193,106000,242000,134900,121850
-4D1001DD0002,115,44,15,10,354500,1425907,1442907,1442907,1425907,106000,242000,134900,121850
-4D1001DD0003,114,44,15,10,354500,1466794,1483794,1483794,1466794,106000,242000,134900,121850
-4D1001DD0004,113,44,15,10,354500,1509243,1526243,1526243,1509243,106000,242000,134900,121850
-4D1001DD0005,112,44,15,10,354500,1551257,1568257,1568257,1551257,106000,242000,134900,121850
-4D1001DD0006,111,44,15,10,354500,1593106,1610106,1610106,1593106,106000,242000,134900,121850
-4D1001DD0007,110,44,15,10,354500,1634704,1651704,1651704,1634704,106000,242000,134900,121850
-4D1001DD0008,109,44,15,10,354500,1677322,1694322,1694322,1677322,106000,242000,134900,121850
-4D1001DD0009,108,44,15,10,354500,1718703,1735703,1735703,1718703,106000,242000,134900,121850
-4D1001DD0010,107,44,15,10,354500,1760884,1777884,1777884,1760884,106000,242000,134900,121850
-4D1001DD0011,106,44,15,10,354500,1802986,1819986,1819986,1802986,106000,242000,134900,121850
-4D1002AA0001,450,12,13,10,440500,937,11937,11937,937,106000,398000,320000,121850
-4D1002AA0002,449,12,13,10,440500,22290,33290,33290,22290,106000,398000,320000,121850
-4D1002AA0003,448,12,13,10,440500,45178,56178,56178,45178,106000,398000,320000,121850
-4D1002AA0004,447,12,13,10,440500,68339,79339,79339,68339,106000,398000,320000,121850
-4D1002AA0005,446,12,13,10,440500,91715,102715,102715,91715,106000,398000,320000,121850
-4D1002AA0006,445,12,13,10,440500,114782,125782,125782,114782,106000,398000,320000,121850
-4D1002AA0007,444,12,13,10,440500,138242,149242,149242,138242,106000,398000,320000,121850
-4D1002AA0008,443,12,13,10,440500,161298,172298,172298,161298,106000,398000,320000,121850
-4D1002AA0009,442,12,13,10,440500,184573,195573,195573,184573,106000,398000,320000,121850
-4D1002AA0010,441,12,13,10,440500,207886,218886,218886,207886,106000,398000,320000,121850
-4D1002AA0011,440,12,13,10,440500,230787,241787,241787,230787,106000,398000,320000,121850
-4D1002AA0012,439,12,13,10,440500,253704,264704,264704,253704,106000,398000,320000,121850
-4D1002AA0013,438,12,11,10,440500,277329,288329,288329,277329,106000,398000,320000,121850
-4D1002AA0014,437,12,11,10,440500,300651,311651,311651,300651,106000,398000,320000,121850
-4D1002AA0015,436,12,11,10,440500,323916,334916,334916,323916,106000,398000,320000,121850
-4D1002AA0016,435,12,11,10,440500,347288,358288,358288,347288,106000,398000,320000,121850
-4D1002AA0017,434,12,11,10,440500,370708,381708,381708,370708,106000,398000,320000,121850
-4D1002AA0018,433,12,11,10,440500,393721,404721,404721,393721,106000,398000,320000,121850
-4D1002AA0019,432,12,11,10,440500,416686,427686,427686,416686,106000,398000,320000,121850
-4D1002AA0020,431,12,11,10,440500,440674,451674,451674,440674,106000,398000,320000,121850
-4D1002BB0001,338,12,11,10,439000,463414,474414,474414,463414,106000,398000,320000,121850
-4D1002BB0002,337,12,11,10,439000,487256,498256,498256,487256,106000,398000,320000,121850
-4D1002BB0003,336,12,11,10,439000,510165,521165,521165,510165,106000,398000,320000,121850
-4D1002BB0004,335,12,11,10,439000,533218,544218,544218,533218,106000,398000,320000,121850
-4D1002BB0005,334,12,11,10,439000,556688,567688,567688,556688,106000,398000,320000,121850
-4D1002BB0006,333,12,11,10,439000,579500,590500,590500,579500,106000,398000,320000,121850
-4D1002BB0007,332,12,11,10,439000,602659,613659,613659,602659,106000,398000,320000,121850
-4D1002BB0008,331,12,11,10,439000,626175,637175,637175,626175,106000,398000,320000,121850
-4D1002BB0009,330,12,13,10,439000,649090,660090,660090,649090,106000,398000,320000,121850
-4D1002BB0010,329,12,13,10,439000,672087,683087,683087,672087,106000,398000,320000,121850
-4D1002BB0011,328,12,13,10,439000,695785,706785,706785,695785,106000,398000,320000,121850
-4D1002BB0012,327,12,13,10,439000,718732,729732,729732,718732,106000,398000,320000,121850
-4D1002BB0013,326,12,13,10,439000,742166,753166,753166,742166,106000,398000,320000,121850
-4D1002BB0014,325,12,13,10,439000,765367,776367,776367,765367,106000,398000,320000,121850
-4D1002BB0015,324,12,13,10,439000,788686,799686,799686,788686,106000,398000,320000,121850
-4D1002BB0016,323,12,13,10,439000,812065,823065,823065,812065,106000,398000,320000,121850
-4D1002BB0017,322,12,13,10,439000,835335,846335,846335,835335,106000,398000,320000,121850
-4D1002BB0018,321,12,13,10,439000,858335,869335,869335,858335,106000,398000,320000,121850
-4D1002BB0019,320,12,13,10,439000,881914,892914,892914,881914,106000,398000,320000,121850
-4D1002BB0020,319,12,13,10,439000,904875,915875,915875,904875,106000,398000,320000,121850
-4D1002CC0001,221,12,13,10,438000,929739,940739,940739,929739,106000,398000,320000,121850
-4D1002CC0002,220,12,13,10,438000,952874,963874,963874,952874,106000,398000,320000,121850
-4D1002CC0003,219,12,13,10,438000,975340,986340,986340,975340,106000,398000,320000,121850
-4D1002CC0004,218,12,13,10,438000,998666,1009666,1009666,998666,106000,398000,320000,121850
-4D1002CC0005,217,12,13,10,438000,1022100,1033100,1033100,1022100,106000,398000,320000,121850
-4D1002CC0006,216,12,13,10,438000,1044921,1055921,1055921,1044921,106000,398000,320000,121850
-4D1002CC0007,215,12,13,10,438000,1068521,1079521,1079521,1068521,106000,398000,320000,121850
-4D1002CC0008,214,12,13,10,438000,1091674,1102674,1102674,1091674,106000,398000,320000,121850
-4D1002CC0009,213,12,13,10,438000,1115106,1126106,1126106,1115106,106000,398000,320000,121850
-4D1002CC0010,212,12,13,10,438000,1138445,1149445,1149445,1138445,106000,398000,320000,121850
-4D1002CC0011,211,12,13,10,436000,1161543,1172543,1172543,1161543,106000,398000,320000,121850
-4D1002CC0012,210,12,13,10,436000,1184754,1195754,1195754,1184754,106000,398000,320000,121850
-4D1002CC0013,209,12,13,10,436000,1208380,1219380,1219380,1208380,106000,398000,320000,121850
-4D1002CC0014,208,12,13,10,436000,1231133,1242133,1242133,1231133,106000,398000,320000,121850
-4D1002CC0015,207,12,13,10,436000,1254236,1265236,1265236,1254236,106000,398000,320000,121850
-4D1002CC0016,206,12,13,10,436000,1277556,1288556,1288556,1277556,106000,398000,320000,121850
-4D1002CC0017,205,12,13,10,436000,1301041,1312041,1312041,1301041,106000,398000,320000,121850
-4D1002CC0018,204,12,13,10,436000,1324418,1335418,1335418,1324418,106000,398000,320000,121850
-4D1002CC0019,203,12,13,10,436000,1347488,1358488,1358488,1347488,106000,398000,320000,121850
-4D1002CC0020,202,12,13,10,436000,1371096,1382096,1382096,1371096,106000,398000,320000,121850
-4D1002DD0001,105,12,13,10,436000,1394728,1405728,1405728,1394728,106000,398000,320000,121850
-4D1002DD0002,104,12,13,10,436000,1418156,1429156,1429156,1418156,106000,398000,320000,121850
-4D1002DD0003,103,12,13,10,436000,1440889,1451889,1451889,1440889,106000,398000,320000,121850
-4D1002DD0004,102,12,13,10,436000,1464856,1475856,1475856,1464856,106000,398000,320000,121850
-4D1002DD0005,101,12,13,10,436000,1487682,1498682,1498682,1487682,106000,398000,320000,121850
-4D1002DD0006,100,12,13,10,436000,1510394,1521394,1521394,1510394,106000,398000,320000,121850
-4D1002DD0007,99,12,13,10,436000,1534542,1545542,1545542,1534542,106000,398000,320000,121850
-4D1002DD0008,98,12,13,10,436000,1557240,1568240,1568240,1557240,106000,398000,320000,121850
-4D1002DD0009,97,12,13,10,436000,1580195,1591195,1591195,1580195,106000,398000,320000,121850
-4D1002DD0010,96,12,13,10,436000,1603686,1614686,1614686,1603686,106000,398000,320000,121850
-4D1002DD0011,95,12,13,10,434000,1626987,1637987,1637987,1626987,106000,398000,320000,121850
-4D1002DD0012,94,12,13,10,434000,1650460,1661460,1661460,1650460,106000,398000,320000,121850
-4D1002DD0013,93,12,13,10,434000,1672841,1683841,1683841,1672841,106000,398000,320000,121850
-4D1002DD0014,92,12,13,10,434000,1696684,1707684,1707684,1696684,106000,398000,320000,121850
-4D1002DD0015,91,12,13,10,434000,1720054,1731054,1731054,1720054,106000,398000,320000,121850
-4D1002DD0016,90,12,13,10,434000,1743324,1754324,1754324,1743324,106000,398000,320000,121850
-4D1002DD0017,89,12,13,10,434000,1766173,1777173,1777173,1766173,106000,398000,320000,121850
-4D1002DD0018,88,12,13,10,434000,1789601,1800601,1800601,1789601,106000,398000,320000,121850
-4D1002DD0019,87,12,13,10,434000,1812610,1823610,1823610,1812610,106000,398000,320000,121850
-4D1003AA0001,430,16,13,10,522000,945,11945,11945,945,106000,380000,290000,121850
-4D1003AA0002,429,16,13,10,522000,23021,34021,34021,23021,106000,380000,290000,121850
-4D1003AA0003,428,16,13,10,522000,48461,59461,59461,48461,106000,380000,290000,121850
-4D1003AA0004,427,16,13,10,522000,73912,84912,84912,73912,106000,380000,290000,121850
-4D1003AA0005,426,16,13,10,522000,99011,110011,110011,99011,106000,380000,290000,121850
-4D1003AA0006,425,16,13,10,522000,124746,135746,135746,124746,106000,380000,290000,121850
-4D1003AA0007,424,16,13,10,522000,150338,161338,161338,150338,106000,380000,290000,121850
-4D1003AA0008,423,16,13,10,522000,175826,186826,186826,175826,106000,380000,290000,121850
-4D1003AA0009,422,16,13,10,522000,201509,212509,212509,201509,106000,380000,290000,121850
-4D1003AA0010,421,16,13,10,522000,226798,237798,237798,226798,106000,380000,290000,121850
-4D1003AA0011,420,16,13,10,522000,252354,263354,263354,252354,106000,380000,290000,121850
-4D1003AA0012,419,16,13,10,522000,277295,288295,288295,277295,106000,380000,290000,121850
-4D1003AA0013,418,16,13,10,522000,303049,314049,314049,303049,106000,380000,290000,121850
-4D1003AA0014,417,16,13,10,522000,328562,339562,339562,328562,106000,380000,290000,121850
-4D1003AA0015,416,16,13,10,522000,354130,365130,365130,354130,106000,380000,290000,121850
-4D1003AA0016,415,16,13,10,522000,379786,390786,390786,379786,106000,380000,290000,121850
-4D1003AA0017,414,16,13,10,522000,405334,416334,416334,405334,106000,380000,290000,121850
-4D1003AA0018,413,16,13,10,522000,430388,441388,441388,430388,106000,380000,290000,121850
-4D1003BB0001,318,16,13,10,521000,456653,467653,467653,456653,106000,380000,290000,121850
-4D1003BB0002,317,16,13,10,521000,482681,493681,493681,482681,106000,380000,290000,121850
-4D1003BB0003,316,16,13,10,521000,507558,518558,518558,507558,106000,380000,290000,121850
-4D1003BB0004,315,16,13,10,521000,532974,543974,543974,532974,106000,380000,290000,121850
-4D1003BB0005,314,16,13,10,521000,558367,569367,569367,558367,106000,380000,290000,121850
-4D1003BB0006,313,16,13,10,521000,584284,595284,595284,584284,106000,380000,290000,121850
-4D1003BB0007,312,16,13,10,521000,609641,620641,620641,609641,106000,380000,290000,121850
-4D1003BB0008,311,16,13,10,521000,635164,646164,646164,635164,106000,380000,290000,121850
-4D1003BB0009,310,16,13,10,521000,660393,671393,671393,660393,106000,380000,290000,121850
-4D1003BB0010,309,16,13,10,520000,686425,697425,697425,686425,106000,380000,290000,121850
-4D1003BB0011,308,16,13,10,520000,711466,722466,722466,711466,106000,380000,290000,121850
-4D1003BB0012,307,16,13,10,520000,737479,748479,748479,737479,106000,380000,290000,121850
-4D1003BB0013,306,16,13,10,520000,762568,773568,773568,762568,106000,380000,290000,121850
-4D1003BB0014,305,16,13,10,520000,788552,799552,799552,788552,106000,380000,290000,121850
-4D1003BB0015,304,16,13,10,520000,814157,825157,825157,814157,106000,380000,290000,121850
-4D1003BB0016,303,16,13,10,520000,839200,850200,850200,839200,106000,380000,290000,121850
-4D1003BB0017,302,16,13,10,520000,865000,876000,876000,865000,106000,380000,290000,121850
-4D1003BB0018,301,16,13,10,520000,891033,902033,902033,891033,106000,380000,290000,121850
-4D1003CC0001,201,16,13,10,519000,915853,926853,926853,915853,106000,380000,290000,121850
-4D1003CC0002,200,16,13,10,519000,941204,952204,952204,941204,106000,380000,290000,121850
-4D1003CC0003,199,16,13,10,519000,966920,977920,977920,966920,106000,380000,290000,121850
-4D1003CC0004,198,16,13,10,519000,992701,1003701,1003701,992701,106000,380000,290000,121850
-4D1003CC0005,197,16,13,10,519000,1017509,1028509,1028509,1017509,106000,380000,290000,121850
-4D1003CC0006,196,16,13,10,519000,1043231,1054231,1054231,1043231,106000,380000,290000,121850
-4D1003CC0007,195,16,13,10,519000,1069102,1080102,1080102,1069102,106000,380000,290000,121850
-4D1003CC0008,194,16,13,10,519000,1094404,1105404,1105404,1094404,106000,380000,290000,121850
-4D1003CC0009,193,16,13,10,519000,1119958,1130958,1130958,1119958,106000,380000,290000,121850
-4D1003CC0010,192,16,13,10,517000,1145554,1156554,1156554,1145554,106000,380000,290000,121850
-4D1003CC0011,191,16,13,10,517000,1170933,1181933,1181933,1170933,106000,380000,290000,121850
-4D1003CC0012,190,16,13,10,517000,1196466,1207466,1207466,1196466,106000,380000,290000,121850
-4D1003CC0013,189,16,13,10,517000,1221822,1232822,1232822,1221822,106000,380000,290000,121850
-4D1003CC0014,188,16,13,10,517000,1247224,1258224,1258224,1247224,106000,380000,290000,121850
-4D1003CC0015,187,16,13,10,517000,1272933,1283933,1283933,1272933,106000,380000,290000,121850
-4D1003CC0016,186,16,13,10,517000,1298390,1309390,1309390,1298390,106000,380000,290000,121850
-4D1003CC0017,185,16,13,10,517000,1324160,1335160,1335160,1324160,106000,380000,290000,121850
-4D1003CC0018,184,16,13,10,517000,1349249,1360249,1360249,1349249,106000,380000,290000,121850
-4D1003DD0001,86,16,13,10,517000,1376357,1387357,1387357,1376357,106000,380000,290000,121850
-4D1003DD0002,85,16,13,10,517000,1401349,1412349,1412349,1401349,106000,380000,290000,121850
-4D1003DD0003,84,16,13,10,517000,1426863,1437863,1437863,1426863,106000,380000,290000,121850
-4D1003DD0004,83,16,13,10,517000,1452299,1463299,1463299,1452299,106000,380000,290000,121850
-4D1003DD0005,82,16,13,10,517000,1478019,1489019,1489019,1478019,106000,380000,290000,121850
-4D1003DD0006,81,16,13,10,517000,1503529,1514529,1514529,1503529,106000,380000,290000,121850
-4D1003DD0007,80,16,13,10,517000,1528466,1539466,1539466,1528466,106000,380000,290000,121850
-4D1003DD0008,79,16,13,10,517000,1554909,1565909,1565909,1554909,106000,380000,290000,121850
-4D1003DD0009,78,16,13,10,517000,1579944,1590944,1590944,1579944,106000,380000,290000,121850
-4D1003DD0010,77,16,13,10,517000,1605287,1616287,1616287,1605287,106000,380000,290000,121850
-4D1003DD0011,76,16,13,10,517000,1631048,1642048,1642048,1631048,106000,380000,290000,121850
-4D1003DD0012,75,16,13,10,517000,1656459,1667459,1667459,1656459,106000,380000,290000,121850
-4D1003DD0013,74,16,13,10,517000,1682063,1693063,1693063,1682063,106000,380000,290000,121850
-4D1003DD0014,73,16,13,10,517000,1707523,1718523,1718523,1707523,106000,380000,290000,121850
-4D1003DD0015,72,16,13,10,517000,1732667,1743667,1743667,1732667,106000,380000,290000,121850
-4D1003DD0016,71,16,13,10,517000,1758424,1769424,1769424,1758424,106000,380000,290000,121850
-4D1003DD0017,70,16,13,10,517000,1783837,1794837,1794837,1783837,106000,380000,290000,121850
-4D1003DD0018,69,16,13,10,517000,1810113,1821113,1821113,1810113,106000,380000,290000,121850
-4D1004AA0001,412,16,15,10,602800,907,11907,11907,907,106000,380000,290000,121850
-4D1004AA0002,411,16,15,10,602800,29415,40415,40415,29415,106000,380000,290000,121850
-4D1004AA0003,410,16,15,10,602800,59032,70032,70032,59032,106000,380000,290000,121850
-4D1004AA0004,409,16,15,10,602800,89021,100021,100021,89021,106000,380000,290000,121850
-4D1004AA0005,408,16,15,10,602800,118530,129530,129530,118530,106000,380000,290000,121850
-4D1004AA0006,407,16,15,10,602800,148769,159769,159769,148769,106000,380000,290000,121850
-4D1004AA0007,406,16,15,10,602800,178645,189645,189645,178645,106000,380000,290000,121850
-4D1004AA0008,405,16,15,10,602800,209194,220194,220194,209194,106000,380000,290000,121850
-4D1004AA0009,404,16,15,10,602800,238872,249872,249872,238872,106000,380000,290000,121850
-4D1004AA0010,403,16,15,10,602800,269205,280205,280205,269205,106000,380000,290000,121850
-4D1004AA0011,402,16,15,10,602800,298631,309631,309631,298631,106000,380000,290000,121850
-4D1004AA0012,401,16,15,10,602800,329069,340069,340069,329069,106000,380000,290000,121850
-4D1004AA0013,400,16,15,10,602800,358863,369863,369863,358863,106000,380000,290000,121850
-4D1004AA0014,399,16,15,10,602800,389194,400194,400194,389194,106000,380000,290000,121850
-4D1004AA0015,398,16,15,10,602800,419438,430438,430438,419438,106000,380000,290000,121850
-4D1004BB0001,300,16,15,10,602800,449001,460001,460001,449001,106000,380000,290000,121850
-4D1004BB0002,299,16,15,10,602800,479503,490503,490503,479503,106000,380000,290000,121850
-4D1004BB0003,298,16,15,10,602800,509505,520505,520505,509505,106000,380000,290000,121850
-4D1004BB0004,297,16,15,10,602800,539364,550364,550364,539364,106000,380000,290000,121850
-4D1004BB0005,296,16,15,10,602800,569761,580761,580761,569761,106000,380000,290000,121850
-4D1004BB0006,295,16,15,10,602800,599795,610795,610795,599795,106000,380000,290000,121850
-4D1004BB0007,294,16,15,10,602800,629822,640822,640822,629822,106000,380000,290000,121850
-4D1004BB0008,293,16,15,10,600800,659657,670657,670657,659657,106000,380000,290000,121850
-4D1004BB0009,292,16,15,10,600800,690156,701156,701156,690156,106000,380000,290000,121850
-4D1004BB0010,291,16,15,10,600800,719879,730879,730879,719879,106000,380000,290000,121850
-4D1004BB0011,290,16,15,10,600800,749659,760659,760659,749659,106000,380000,290000,121850
-4D1004BB0012,289,16,15,10,600800,780249,791249,791249,780249,106000,380000,290000,121850
-4D1004BB0013,288,16,15,10,600800,810450,821450,821450,810450,106000,380000,290000,121850
-4D1004BB0014,287,16,15,10,600800,840384,851384,851384,840384,106000,380000,290000,121850
-4D1004BB0015,286,16,15,10,600800,869989,880989,880989,869989,106000,380000,290000,121850
-4D1004CC0001,183,16,15,10,600300,900021,911021,911021,900021,106000,380000,290000,121850
-4D1004CC0002,182,16,15,10,600300,930645,941645,941645,930645,106000,380000,290000,121850
-4D1004CC0003,181,16,15,10,600300,960935,971935,971935,960935,106000,380000,290000,121850
-4D1004CC0004,180,16,15,10,600300,991125,1002125,1002125,991125,106000,380000,290000,121850
-4D1004CC0005,179,16,15,10,600300,1020689,1031689,1031689,1020689,106000,380000,290000,121850
-4D1004CC0006,178,16,15,10,600300,1051361,1062361,1062361,1051361,106000,380000,290000,121850
-4D1004CC0007,177,16,15,10,600300,1080760,1091760,1091760,1080760,106000,380000,290000,121850
-4D1004CC0008,176,16,15,10,600300,1111200,1122200,1122200,1111200,106000,380000,290000,121850
-4D1004CC0009,175,16,15,10,599300,1141463,1152463,1152463,1141463,106000,380000,290000,121850
-4D1004CC0010,174,16,15,10,599300,1171281,1182281,1182281,1171281,106000,380000,290000,121850
-4D1004CC0011,173,16,15,10,599300,1200939,1211939,1211939,1200939,106000,380000,290000,121850
-4D1004CC0012,172,16,15,10,599300,1231344,1242344,1242344,1231344,106000,380000,290000,121850
-4D1004CC0013,171,16,15,10,599300,1261383,1272383,1272383,1261383,106000,380000,290000,121850
-4D1004CC0014,170,16,15,10,599300,1291359,1302359,1302359,1291359,106000,380000,290000,121850
-4D1004CC0015,169,16,15,10,599300,1321185,1332185,1332185,1321185,106000,380000,290000,121850
-4D1004DD0001,68,16,15,10,598000,1352000,1363000,1363000,1352000,106000,380000,290000,121850
-4D1004DD0002,67,16,15,10,598000,1381717,1392717,1392717,1381717,106000,380000,290000,121850
-4D1004DD0003,66,16,15,10,598000,1411959,1422959,1422959,1411959,106000,380000,290000,121850
-4D1004DD0004,65,16,15,10,598000,1441636,1452636,1452636,1441636,106000,380000,290000,121850
-4D1004DD0005,64,16,15,10,598000,1472141,1483141,1483141,1472141,106000,380000,290000,121850
-4D1004DD0006,63,16,15,10,598000,1501439,1512439,1512439,1501439,106000,380000,290000,121850
-4D1004DD0007,62,16,15,10,598000,1532315,1543315,1543315,1532315,106000,380000,290000,121850
-4D1004DD0008,61,16,15,10,598000,1562708,1573708,1573708,1562708,106000,380000,290000,121850
-4D1004DD0009,60,16,15,10,598000,1591756,1602756,1602756,1591756,106000,380000,290000,121850
-4D1004DD0010,59,16,15,10,598000,1622093,1633093,1633093,1622093,106000,380000,290000,121850
-4D1004DD0011,58,16,15,10,598000,1652079,1663079,1663079,1652079,106000,380000,290000,121850
-4D1004DD0012,57,16,15,10,598000,1682643,1693643,1693643,1682643,106000,380000,290000,121850
-4D1004DD0013,56,16,15,10,598000,1711726,1722726,1722726,1711726,106000,380000,290000,121850
-4D1004DD0014,55,16,15,10,598000,1742854,1753854,1753854,1742854,106000,380000,290000,121850
-4D1004DD0015,54,16,15,10,598000,1772007,1783007,1783007,1772007,106000,380000,290000,121850
-4D1004DD0016,53,16,15,10,598000,1801830,1812830,1812830,1801830,106000,380000,290000,121850
-4D1005AA0001,397,24,15,10,685000,-1044,13956,13956,-1044,106000,341100,223600,121850
-4D1005AA0002,396,24,15,10,685000,31249,46249,46249,31249,106000,341100,223600,121850
-4D1005AA0003,395,24,15,10,685000,65435,80435,80435,65435,106000,341100,223600,121850
-4D1005AA0004,394,24,15,10,685000,99051,114051,114051,99051,106000,341100,223600,121850
-4D1005AA0005,393,24,15,10,685000,133624,148624,148624,133624,106000,341100,223600,121850
-4D1005AA0006,392,24,15,10,685000,167870,182870,182870,167870,106000,341100,223600,121850
-4D1005AA0007,391,24,15,10,685000,200868,215868,215868,200868,106000,341100,223600,121850
-4D1005AA0008,390,24,15,10,685000,235643,250643,250643,235643,106000,341100,223600,121850
-4D1005AA0009,389,24,15,10,685000,270138,285138,285138,270138,106000,341100,223600,121850
-4D1005AA0010,388,24,15,10,685000,303407,318407,318407,303407,106000,341100,223600,121850
-4D1005AA0011,387,24,15,10,685000,337803,352803,352803,337803,106000,341100,223600,121850
-4D1005AA0012,386,24,15,10,685000,371390,386390,386390,371390,106000,341100,223600,121850
-4D1005AA0013,385,24,15,10,685000,405486,420486,420486,405486,106000,341100,223600,121850
-4D1005AA0014,384,24,15,10,685000,439244,454244,454244,439244,106000,341100,223600,121850
-4D1005BB0001,285,24,15,10,683300,479035,494035,494035,479035,106000,341100,223600,121850
-4D1005BB0002,284,24,15,10,683300,512866,527866,527866,512866,106000,341100,223600,121850
-4D1005BB0003,283,24,15,10,683300,546699,561699,561699,546699,106000,341100,223600,121850
-4D1005BB0004,282,24,15,10,683300,580380,595380,595380,580380,106000,341100,223600,121850
-4D1005BB0005,281,24,15,10,683300,614105,629105,629105,614105,106000,341100,223600,121850
-4D1005BB0006,280,24,15,10,683300,648605,663605,663605,648605,106000,341100,223600,121850
-4D1005BB0007,279,24,15,10,683300,683288,698288,698288,683288,106000,341100,223600,121850
-4D1005BB0008,278,24,15,10,683300,717003,732003,732003,717003,106000,341100,223600,121850
-4D1005BB0009,277,24,15,10,683300,750909,765909,765909,750909,106000,341100,223600,121850
-4D1005BB0010,276,24,15,10,683300,785256,800256,800256,785256,106000,341100,223600,121850
-4D1005BB0011,275,24,15,10,683300,819194,834194,834194,819194,106000,341100,223600,121850
-4D1005BB0012,274,24,15,10,683300,853123,868123,868123,853123,106000,341100,223600,121850
-4D1005BB0013,273,24,15,10,683300,886771,901771,901771,886771,106000,341100,223600,121850
-4D1005CC0001,168,32,15,10,681300,921161,936161,936161,921161,106000,304600,157200,121850
-4D1005CC0002,167,32,15,10,681300,960831,975831,975831,960831,106000,304600,157200,121850
-4D1005CC0003,166,32,15,10,681300,999393,1014393,1014393,999393,106000,304600,157200,121850
-4D1005CC0004,165,32,15,10,681300,1038905,1053905,1053905,1038905,106000,304600,157200,121850
-4D1005CC0005,164,32,15,10,681300,1077997,1092997,1092997,1077997,106000,304600,157200,121850
-4D1005CC0006,163,32,15,10,681300,1117126,1132126,1132126,1117126,106000,304600,157200,121850
-4D1005CC0007,162,32,15,10,680000,1156432,1171432,1171432,1156432,106000,304600,157200,121850
-4D1005CC0008,161,32,15,10,680000,1194953,1209953,1209953,1194953,106000,304600,157200,121850
-4D1005CC0009,160,32,15,10,680000,1234612,1249612,1249612,1234612,106000,304600,157200,121850
-4D1005CC0010,159,32,15,10,680000,1273757,1288757,1288757,1273757,106000,304600,157200,121850
-4D1005CC0011,158,32,15,10,680000,1312597,1327597,1327597,1312597,106000,304600,157200,121850
-4D1005CC0012,157,32,15,10,680000,1351954,1366954,1366954,1351954,106000,304600,157200,121850
-4D1005DD0001,52,32,15,10,679500,1392706,1407706,1407706,1392706,106000,304600,157200,121850
-4D1005DD0002,51,32,15,10,679500,1430447,1445447,1445447,1430447,106000,304600,157200,121850
-4D1005DD0003,50,32,15,10,679500,1469689,1484689,1484689,1469689,106000,304600,157200,121850
-4D1005DD0004,49,32,15,10,679500,1508359,1523359,1523359,1508359,106000,304600,157200,121850
-4D1005DD0005,48,32,15,10,679500,1547315,1562315,1562315,1547315,106000,304600,157200,121850
-4D1005DD0006,47,32,15,10,679500,1587005,1602005,1602005,1587005,106000,304600,157200,121850
-4D1005DD0007,46,32,15,10,679500,1626627,1641627,1641627,1626627,106000,304600,157200,121850
-4D1005DD0008,45,32,15,10,679500,1665111,1680111,1680111,1665111,106000,304600,157200,121850
-4D1005DD0009,44,32,15,10,679500,1704081,1719081,1719081,1704081,106000,304600,157200,121850
-4D1005DD0010,43,32,15,10,679500,1743221,1758221,1758221,1743221,106000,304600,157200,121850
-4D1005DD0011,42,32,15,10,679500,1782581,1797581,1797581,1782581,106000,304600,157200,121850
-4D1005DD0012,41,32,15,10,679500,1821760,1836760,1836760,1821760,106000,304600,157200,121850
-4D1006AA0001,383,44,15,10,34100,-1073,15927,15927,-1073,106000,242000,134900,121850
-4D1006AA0002,382,44,15,10,34100,39582,56582,56582,39582,106000,242000,134900,121850
-4D1006AA0003,381,44,15,10,34100,80804,97804,97804,80804,106000,242000,134900,121850
-4D1006AA0004,380,44,15,10,34100,123427,140427,140427,123427,106000,242000,134900,121850
-4D1006AA0005,379,44,15,10,34100,165023,182023,182023,165023,106000,242000,134900,121850
-4D1006AA0006,378,44,15,10,34100,206868,223868,223868,206868,106000,242000,134900,121850
-4D1006AA0007,377,44,15,10,34100,249292,266292,266292,249292,106000,242000,134900,121850
-4D1006AA0008,376,44,15,10,34100,291370,308370,308370,291370,106000,242000,134900,121850
-4D1006AA0009,375,44,15,10,34100,333258,350258,350258,333258,106000,242000,134900,121850
-4D1006AA0010,374,44,15,10,34100,375369,392369,392369,375369,106000,242000,134900,121850
-4D1006AA0011,373,44,15,10,34100,417158,434158,434158,417158,106000,242000,134900,121850
-4D1006BB0001,272,44,15,10,32500,460677,477677,477677,460677,106000,242000,134900,121850
-4D1006BB0002,271,44,15,10,32500,501813,518813,518813,501813,106000,242000,134900,121850
-4D1006BB0003,270,44,15,10,32500,543442,560442,560442,543442,106000,242000,134900,121850
-4D1006BB0004,269,44,15,10,32500,585451,602451,602451,585451,106000,242000,134900,121850
-4D1006BB0005,268,44,15,10,32500,627507,644507,644507,627507,106000,242000,134900,121850
-4D1006BB0006,267,44,15,10,32500,669553,686553,686553,669553,106000,242000,134900,121850
-4D1006BB0007,266,44,15,10,31100,711723,728723,728723,711723,106000,242000,134900,121850
-4D1006BB0008,265,44,15,10,31100,753883,770883,770883,753883,106000,242000,134900,121850
-4D1006BB0009,264,44,15,10,31100,795724,812724,812724,795724,106000,242000,134900,121850
-4D1006BB0010,263,44,15,10,31100,837752,854752,854752,837752,106000,242000,134900,121850
-4D1006BB0011,262,44,15,10,31100,879026,896026,896026,879026,106000,242000,134900,121850
-4D1006CC0001,156,44,15,10,31000,922212,939212,939212,922212,106000,242000,134900,121850
-4D1006CC0002,155,44,15,10,31000,963596,980596,980596,963596,106000,242000,134900,121850
-4D1006CC0003,154,44,15,10,31000,1005241,1022241,1022241,1005241,106000,242000,134900,121850
-4D1006CC0004,153,44,15,10,31000,1047223,1064223,1064223,1047223,106000,242000,134900,121850
-4D1006CC0005,152,44,15,10,31000,1089302,1106302,1106302,1089302,106000,242000,134900,121850
-4D1006CC0006,151,44,15,10,29000,1131674,1148674,1148674,1131674,106000,242000,134900,121850
-4D1006CC0007,150,44,15,10,29000,1173433,1190433,1190433,1173433,106000,242000,134900,121850
-4D1006CC0008,149,44,15,10,29000,1215794,1232794,1232794,1215794,106000,242000,134900,121850
-4D1006CC0009,148,44,15,10,29000,1257447,1274447,1274447,1257447,106000,242000,134900,121850
-4D1006CC0010,147,44,15,10,29000,1299650,1316650,1316650,1299650,106000,242000,134900,121850
-4D1006CC0011,146,44,15,10,29000,1341230,1358230,1358230,1341230,106000,242000,134900,121850
-4D1006DD0001,40,44,15,10,29000,1384239,1401239,1401239,1384239,106000,242000,134900,121850
-4D1006DD0002,39,44,15,10,29000,1426128,1443128,1443128,1426128,106000,242000,134900,121850
-4D1006DD0003,38,44,15,10,29000,1467774,1484774,1484774,1467774,106000,242000,134900,121850
-4D1006DD0004,37,44,15,10,29000,1509372,1526372,1526372,1509372,106000,242000,134900,121850
-4D1006DD0005,36,44,15,10,29000,1551582,1568582,1568582,1551582,106000,242000,134900,121850
-4D1006DD0006,35,44,15,10,29000,1593430,1610430,1610430,1593430,106000,242000,134900,121850
-4D1006DD0007,34,44,15,10,27000,1635640,1652640,1652640,1635640,106000,242000,134900,121850
-4D1006DD0008,33,44,15,10,27000,1677565,1694565,1694565,1677565,106000,242000,134900,121850
-4D1006DD0009,32,44,15,10,27000,1719758,1736758,1736758,1719758,106000,242000,134900,121850
-4D1006DD0010,31,44,15,10,27000,1761338,1778338,1778338,1761338,106000,242000,134900,121850
-4D1006DD0011,30,44,15,10,27000,1801653,1818653,1818653,1801653,106000,242000,134900,121850
-4D1007AA0001,372,44,15,10,115300,-2095,14905,14905,-2095,106000,242000,134900,121850
-4D1007AA0002,371,44,15,10,115300,39609,56609,56609,39609,106000,242000,134900,121850
-4D1007AA0003,370,44,15,10,115300,81433,98433,98433,81433,106000,242000,134900,121850
-4D1007AA0004,369,44,15,10,115300,123336,140336,140336,123336,106000,242000,134900,121850
-4D1007AA0005,368,44,15,10,115300,165363,182363,182363,165363,106000,242000,134900,121850
-4D1007AA0006,367,44,15,10,115300,207379,224379,224379,207379,106000,242000,134900,121850
-4D1007AA0007,366,44,15,10,115300,249242,266242,266242,249242,106000,242000,134900,121850
-4D1007AA0008,365,44,15,10,115300,291626,308626,308626,291626,106000,242000,134900,121850
-4D1007AA0009,364,44,15,10,115300,333632,350632,350632,333632,106000,242000,134900,121850
-4D1007AA0010,363,44,15,10,115300,375428,392428,392428,375428,106000,242000,134900,121850
-4D1007AA0011,362,44,15,10,115300,417435,434435,434435,417435,106000,242000,134900,121850
-4D1007BB0001,261,44,15,10,113500,460483,477483,477483,460483,106000,242000,134900,121850
-4D1007BB0002,260,44,15,10,113500,501547,518547,518547,501547,106000,242000,134900,121850
-4D1007BB0003,259,44,15,10,113500,543766,560766,560766,543766,106000,242000,134900,121850
-4D1007BB0004,258,44,15,10,113500,585860,602860,602860,585860,106000,242000,134900,121850
-4D1007BB0005,257,44,15,10,113500,628452,645452,645452,628452,106000,242000,134900,121850
-4D1007BB0006,256,44,15,10,112500,669678,686678,686678,669678,106000,242000,134900,121850
-4D1007BB0007,255,44,15,10,112500,711576,728576,728576,711576,106000,242000,134900,121850
-4D1007BB0008,254,44,15,10,112500,753883,770883,770883,753883,106000,242000,134900,121850
-4D1007BB0009,253,44,15,10,112500,795949,812949,812949,795949,106000,242000,134900,121850
-4D1007BB0010,252,44,15,10,112500,837702,854702,854702,837702,106000,242000,134900,121850
-4D1007BB0011,251,44,15,10,112500,879910,896910,896910,879910,106000,242000,134900,121850
-4D1007CC0001,145,44,15,10,111500,922509,939509,939509,922509,106000,242000,134900,121850
-4D1007CC0002,144,44,15,10,111500,964293,981293,981293,964293,106000,242000,134900,121850
-4D1007CC0003,143,44,15,10,111500,1005771,1022771,1022771,1005771,106000,242000,134900,121850
-4D1007CC0004,142,44,15,10,111500,1048191,1065191,1065191,1048191,106000,242000,134900,121850
-4D1007CC0005,141,44,15,10,111500,1090081,1107081,1107081,1090081,106000,242000,134900,121850
-4D1007CC0006,140,44,15,10,110500,1131834,1148834,1148834,1131834,106000,242000,134900,121850
-4D1007CC0007,139,44,15,10,110500,1173682,1190682,1190682,1173682,106000,242000,134900,121850
-4D1007CC0008,138,44,15,10,110500,1216162,1233162,1233162,1216162,106000,242000,134900,121850
-4D1007CC0009,137,44,15,10,110500,1257750,1274750,1274750,1257750,106000,242000,134900,121850
-4D1007CC0010,136,44,15,10,110500,1299971,1316971,1316971,1299971,106000,242000,134900,121850
-4D1007CC0011,135,44,15,10,110500,1341636,1358636,1358636,1341636,106000,242000,134900,121850
-4D1007DD0001,29,44,15,10,110000,1384610,1401610,1401610,1384610,106000,242000,134900,121850
-4D1007DD0002,28,44,15,10,110000,1426159,1443159,1443159,1426159,106000,242000,134900,121850
-4D1007DD0003,27,44,15,10,110000,1467467,1484467,1484467,1467467,106000,242000,134900,121850
-4D1007DD0004,26,44,15,10,110000,1510103,1527103,1527103,1510103,106000,242000,134900,121850
-4D1007DD0005,25,44,15,10,110000,1551855,1568855,1568855,1551855,106000,242000,134900,121850
-4D1007DD0006,24,44,15,10,110000,1593683,1610683,1610683,1593683,106000,242000,134900,121850
-4D1007DD0007,23,44,15,10,110000,1635850,1652850,1652850,1635850,106000,242000,134900,121850
-4D1007DD0008,22,44,15,10,110000,1677763,1694763,1694763,1677763,106000,242000,134900,121850
-4D1007DD0009,21,44,15,10,110000,1719665,1736665,1736665,1719665,106000,242000,134900,121850
-4D1007DD0010,20,44,15,10,110000,1761666,1778666,1778666,1761666,106000,242000,134900,121850
-4D1007DD0011,19,44,15,10,110000,1803340,1820340,1820340,1803340,106000,242000,134900,121850
-4D1008AA0001,361,56,15,10,198500,-1077,15923,15923,-1077,106000,185500,43600,121850
-4D1008AA0002,360,56,15,10,198500,49369,66369,66369,49369,106000,185500,43600,121850
-4D1008AA0003,359,56,15,10,198500,100117,117117,117117,100117,106000,185500,43600,121850
-4D1008AA0004,358,56,15,10,198500,150737,167737,167737,150737,106000,185500,43600,121850
-4D1008AA0005,357,56,15,10,198500,202040,219040,219040,202040,106000,185500,43600,121850
-4D1008AA0006,356,56,15,10,196500,253719,270719,270719,253719,106000,185500,43600,121850
-4D1008AA0007,355,56,15,10,196500,304324,321324,321324,304324,106000,185500,43600,121850
-4D1008AA0008,354,56,15,10,196500,355744,372744,372744,355744,106000,185500,43600,121850
-4D1008AA0009,353,56,15,10,196500,406797,423797,423797,406797,106000,185500,43600,121850
-4D1008BB0001,250,56,15,10,196500,458080,475080,475080,458080,106000,185500,43600,121850
-4D1008BB0002,249,56,15,10,196500,509647,526647,526647,509647,106000,185500,43600,121850
-4D1008BB0003,248,56,15,10,196500,560626,577626,577626,560626,106000,185500,43600,121850
-4D1008BB0004,247,56,15,10,196500,611102,628102,628102,611102,106000,185500,43600,121850
-4D1008BB0005,246,56,15,10,194500,662243,679243,679243,662243,106000,185500,43600,121850
-4D1008BB0006,245,56,15,10,194500,713439,730439,730439,713439,106000,185500,43600,121850
-4D1008BB0007,244,56,15,10,194500,764667,781667,781667,764667,106000,185500,43600,121850
-4D1008BB0008,243,56,15,10,194500,815510,832510,832510,815510,106000,185500,43600,121850
-4D1008BB0009,242,56,15,10,194500,866740,883740,883740,866740,106000,185500,43600,121850
-4D1008CC0001,134,56,15,10,193000,917898,934898,934898,917898,106000,185500,43600,121850
-4D1008CC0002,133,56,15,10,193000,969642,986642,986642,969642,106000,185500,43600,121850
-4D1008CC0003,132,56,15,10,193000,1020287,1037287,1037287,1020287,106000,185500,43600,121850
-4D1008CC0004,131,56,15,10,193000,1071539,1088539,1088539,1071539,106000,185500,43600,121850
-4D1008CC0005,130,56,15,10,193000,1122306,1139306,1139306,1122306,106000,185500,43600,121850
-4D1008CC0006,129,56,15,10,193000,1173269,1190269,1190269,1173269,106000,185500,43600,121850
-4D1008CC0007,128,56,15,10,193000,1224229,1241229,1241229,1224229,106000,185500,43600,121850
-4D1008CC0008,127,56,15,10,193000,1275759,1292759,1292759,1275759,106000,185500,43600,121850
-4D1008CC0009,126,56,15,10,193000,1326361,1343361,1343361,1326361,106000,185500,43600,121850
-4D1008DD0001,18,56,15,10,191000,1377468,1394468,1394468,1377468,106000,185500,43600,121850
-4D1008DD0002,17,56,15,10,191000,1428870,1445870,1445870,1428870,106000,185500,43600,121850
-4D1008DD0003,16,56,15,10,191000,1479652,1496652,1496652,1479652,106000,185500,43600,121850
-4D1008DD0004,15,56,15,10,191000,1530551,1547551,1547551,1530551,106000,185500,43600,121850
-4D1008DD0005,14,56,15,10,191000,1581670,1598670,1598670,1581670,106000,185500,43600,121850
-4D1008DD0006,13,56,15,10,191000,1632747,1649747,1649747,1632747,106000,185500,43600,121850
-4D1008DD0007,12,56,15,10,191000,1683584,1700584,1700584,1683584,106000,185500,43600,121850
-4D1008DD0008,11,56,15,10,191000,1734539,1751539,1751539,1734539,106000,185500,43600,121850
-4D1008DD0009,10,56,15,10,191000,1785660,1802660,1802660,1785660,106000,185500,43600,121850
-4D1009AA0001,352,56,15,10,278000,-539,16461,16461,-539,106000,185500,43600,121850
-4D1009AA0002,351,56,15,10,278000,49983,66983,66983,49983,106000,185500,43600,121850
-4D1009AA0003,350,56,15,10,278000,100143,117143,117143,100143,106000,185500,43600,121850
-4D1009AA0004,349,56,15,10,278000,151906,168906,168906,151906,106000,185500,43600,121850
-4D1009AA0005,348,56,15,10,278000,202927,219927,219927,202927,106000,185500,43600,121850
-4D1009AA0006,347,56,15,10,278000,253768,270768,270768,253768,106000,185500,43600,121850
-4D1009AA0007,346,56,11,10,278000,305199,322199,322199,305199,106000,185500,43600,121850
-4D1009AA0008,345,56,11,10,278000,355849,372849,372849,355849,106000,185500,43600,121850
-4D1009AA0009,344,56,11,10,278000,406912,423912,423912,406912,106000,185500,43600,121850
-4D1009BB0001,241,56,11,10,276500,458179,475179,475179,458179,106000,185500,43600,121850
-4D1009BB0002,240,56,11,10,276500,509402,526402,526402,509402,106000,185500,43600,121850
-4D1009BB0003,239,56,11,10,276500,560193,577193,577193,560193,106000,185500,43600,121850
-4D1009BB0004,238,56,11,10,276500,611261,628261,628261,611261,106000,185500,43600,121850
-4D1009BB0005,237,56,15,10,276500,662846,679846,679846,662846,106000,185500,43600,121850
-4D1009BB0006,236,56,15,10,276500,713808,730808,730808,713808,106000,185500,43600,121850
-4D1009BB0007,235,56,15,10,276500,764864,781864,781864,764864,106000,185500,43600,121850
-4D1009BB0008,234,56,15,10,276500,815718,832718,832718,815718,106000,185500,43600,121850
-4D1009BB0009,233,56,15,10,276500,866624,883624,883624,866624,106000,185500,43600,121850
-4D1009CC0001,125,56,15,10,274000,918530,935530,935530,918530,106000,185500,43600,121850
-4D1009CC0002,124,56,15,10,274000,969027,986027,986027,969027,106000,185500,43600,121850
-4D1009CC0003,123,56,15,10,274000,1019520,1036520,1036520,1019520,106000,185500,43600,121850
-4D1009CC0004,122,56,15,10,274000,1071160,1088160,1088160,1071160,106000,185500,43600,121850
-4D1009CC0005,121,56,15,10,274000,1121953,1138953,1138953,1121953,106000,185500,43600,121850
-4D1009CC0006,120,56,15,10,274000,1173282,1190282,1190282,1173282,106000,185500,43600,121850
-4D1009CC0007,119,56,15,10,274000,1224434,1241434,1241434,1224434,106000,185500,43600,121850
-4D1009CC0008,118,56,15,10,274000,1275551,1292551,1292551,1275551,106000,185500,43600,121850
-4D1009CC0009,117,56,15,10,274000,1326189,1343189,1343189,1326189,106000,185500,43600,121850
-4D1009DD0001,9,56,15,10,272000,1377362,1394362,1394362,1377362,106000,185500,43600,121850
-4D1009DD0002,8,56,15,10,272000,1428950,1445950,1445950,1428950,106000,185500,43600,121850
-4D1009DD0003,7,56,15,10,272000,1478972,1495972,1495972,1478972,106000,185500,43600,121850
-4D1009DD0004,6,56,15,10,272000,1530183,1547183,1547183,1530183,106000,185500,43600,121850
-4D1009DD0005,5,56,15,10,272000,1581247,1598247,1598247,1581247,106000,185500,43600,121850
-4D1009DD0006,4,56,15,10,272000,1632582,1649582,1649582,1632582,106000,185500,43600,121850
-4D1009DD0007,3,56,15,10,272000,1683437,1700437,1700437,1683437,106000,185500,43600,121850
-4D1009DD0008,2,56,15,10,272000,1734298,1751298,1751298,1734298,106000,185500,43600,121850
-4D1009DD0009,1,56,15,10,272000,1785501,1802501,1802501,1785501,106000,185500,43600,121850
+4D1701AA0001,455,44,15,17,360000,-2000,13300,13300,-2000,106000,242000,134900,121850
+4D1701AA0002,454,44,15,17,360000,48000,64000,64000,48000,106000,242000,134900,121850
+4D1701AA0003,453,44,15,17,360000,98600,114600,114600,98600,106000,242000,134900,121850
+4D1701AA0004,452,44,15,17,360000,149300,165300,165300,149300,106000,242000,134900,121850
+4D1701AA0005,451,44,15,17,360000,201000,217000,217000,201000,106000,242000,134900,121850
+4D1701BB0001,343,44,15,17,357300,665652,682652,682652,665652,106000,242000,28000,121850
+4D1701BB0002,342,44,15,17,357300,717341,734341,734341,717341,106000,242000,28000,121850
+4D1701BB0003,341,44,15,17,357300,768082,785082,785082,768082,106000,242000,28000,121850
+4D1701BB0004,340,44,15,17,357300,818672,835672,835672,818672,106000,242000,28000,121850
+4D1701BB0005,339,44,15,17,357300,869743,886743,886743,869743,106000,242000,28000,121850
+4D1701CC0001,232,44,15,17,357300,920651,937651,937651,920651,106000,242000,134900,121850
+4D1701CC0002,231,44,15,17,357300,963749,980749,980749,963749,106000,242000,134900,121850
+4D1701CC0003,230,44,15,17,357300,1004967,1021967,1021967,1004967,106000,242000,134900,121850
+4D1701CC0004,229,44,15,17,357300,1047697,1064697,1064697,1047697,106000,242000,134900,121850
+4D1701CC0005,228,44,15,17,357300,1089084,1106084,1106084,1089084,106000,242000,134900,121850
+4D1701CC0006,227,44,15,17,356300,1131305,1148305,1148305,1131305,106000,242000,134900,121850
+4D1701CC0007,226,44,15,17,356300,1173254,1190254,1190254,1173254,106000,242000,134900,121850
+4D1701CC0008,225,44,15,17,356300,1215316,1232316,1232316,1215316,106000,242000,134900,121850
+4D1701CC0009,224,44,15,17,356300,1257058,1274058,1274058,1257058,106000,242000,134900,121850
+4D1701CC0010,223,44,15,17,356300,1298744,1315744,1315744,1298744,106000,242000,134900,121850
+4D1701CC0011,222,44,15,17,356300,1341032,1358032,1358032,1341032,106000,242000,134900,121850
+4D1701DD0001,116,44,15,17,354500,1383193,1400193,1400193,1383193,106000,242000,134900,121850
+4D1701DD0002,115,44,15,17,354500,1425907,1442907,1442907,1425907,106000,242000,134900,121850
+4D1701DD0003,114,44,15,17,354500,1466794,1483794,1483794,1466794,106000,242000,134900,121850
+4D1701DD0004,113,44,15,17,354500,1509243,1526243,1526243,1509243,106000,242000,134900,121850
+4D1701DD0005,112,44,15,17,354500,1551257,1568257,1568257,1551257,106000,242000,134900,121850
+4D1701DD0006,111,44,15,17,354500,1593106,1610106,1610106,1593106,106000,242000,134900,121850
+4D1701DD0007,110,44,15,17,354500,1634704,1651704,1651704,1634704,106000,242000,134900,121850
+4D1701DD0008,109,44,15,17,354500,1677322,1694322,1694322,1677322,106000,242000,134900,121850
+4D1701DD0009,108,44,15,17,354500,1718703,1735703,1735703,1718703,106000,242000,134900,121850
+4D1701DD0010,107,44,15,17,354500,1760884,1777884,1777884,1760884,106000,242000,134900,121850
+4D1701DD0011,106,44,15,17,354500,1802986,1819986,1819986,1802986,106000,242000,134900,121850
+4D1702AA0001,450,12,13,17,440500,937,11937,11937,937,106000,398000,320000,121850
+4D1702AA0002,449,12,13,17,440500,22290,33290,33290,22290,106000,398000,320000,121850
+4D1702AA0003,448,12,13,17,440500,45178,56178,56178,45178,106000,398000,320000,121850
+4D1702AA0004,447,12,13,17,440500,68339,79339,79339,68339,106000,398000,320000,121850
+4D1702AA0005,446,12,13,17,440500,91715,102715,102715,91715,106000,398000,320000,121850
+4D1702AA0006,445,12,13,17,440500,114782,125782,125782,114782,106000,398000,320000,121850
+4D1702AA0007,444,12,13,17,440500,138242,149242,149242,138242,106000,398000,320000,121850
+4D1702AA0008,443,12,13,17,440500,161298,172298,172298,161298,106000,398000,320000,121850
+4D1702AA0009,442,12,13,17,440500,184573,195573,195573,184573,106000,398000,320000,121850
+4D1702AA0010,441,12,13,17,440500,207886,218886,218886,207886,106000,398000,320000,121850
+4D1702AA0011,440,12,13,17,440500,230787,241787,241787,230787,106000,398000,320000,121850
+4D1702AA0012,439,12,13,17,440500,253704,264704,264704,253704,106000,398000,320000,121850
+4D1702AA0013,438,12,11,17,440500,277329,288329,288329,277329,106000,398000,320000,121850
+4D1702AA0014,437,12,11,17,440500,300651,311651,311651,300651,106000,398000,320000,121850
+4D1702AA0015,436,12,11,17,440500,323916,334916,334916,323916,106000,398000,320000,121850
+4D1702AA0016,435,12,11,17,440500,347288,358288,358288,347288,106000,398000,320000,121850
+4D1702AA0017,434,12,11,17,440500,370708,381708,381708,370708,106000,398000,320000,121850
+4D1702AA0018,433,12,11,17,440500,393721,404721,404721,393721,106000,398000,320000,121850
+4D1702AA0019,432,12,11,17,440500,416686,427686,427686,416686,106000,398000,320000,121850
+4D1702AA0020,431,12,11,17,440500,440674,451674,451674,440674,106000,398000,320000,121850
+4D1702BB0001,338,12,11,17,439000,463414,474414,474414,463414,106000,398000,320000,121850
+4D1702BB0002,337,12,11,17,439000,487256,498256,498256,487256,106000,398000,320000,121850
+4D1702BB0003,336,12,11,17,439000,510165,521165,521165,510165,106000,398000,320000,121850
+4D1702BB0004,335,12,11,17,439000,533218,544218,544218,533218,106000,398000,320000,121850
+4D1702BB0005,334,12,11,17,439000,556688,567688,567688,556688,106000,398000,320000,121850
+4D1702BB0006,333,12,11,17,439000,579500,590500,590500,579500,106000,398000,320000,121850
+4D1702BB0007,332,12,11,17,439000,602659,613659,613659,602659,106000,398000,320000,121850
+4D1702BB0008,331,12,11,17,439000,626175,637175,637175,626175,106000,398000,320000,121850
+4D1702BB0009,330,12,13,17,439000,649090,660090,660090,649090,106000,398000,320000,121850
+4D1702BB0010,329,12,13,17,439000,672087,683087,683087,672087,106000,398000,320000,121850
+4D1702BB0011,328,12,13,17,439000,695785,706785,706785,695785,106000,398000,320000,121850
+4D1702BB0012,327,12,13,17,439000,718732,729732,729732,718732,106000,398000,320000,121850
+4D1702BB0013,326,12,13,17,439000,742166,753166,753166,742166,106000,398000,320000,121850
+4D1702BB0014,325,12,13,17,439000,765367,776367,776367,765367,106000,398000,320000,121850
+4D1702BB0015,324,12,13,17,439000,788686,799686,799686,788686,106000,398000,320000,121850
+4D1702BB0016,323,12,13,17,439000,812065,823065,823065,812065,106000,398000,320000,121850
+4D1702BB0017,322,12,13,17,439000,835335,846335,846335,835335,106000,398000,320000,121850
+4D1702BB0018,321,12,13,17,439000,858335,869335,869335,858335,106000,398000,320000,121850
+4D1702BB0019,320,12,13,17,439000,881914,892914,892914,881914,106000,398000,320000,121850
+4D1702BB0020,319,12,13,17,439000,904875,915875,915875,904875,106000,398000,320000,121850
+4D1702CC0001,221,12,13,17,438000,929739,940739,940739,929739,106000,398000,320000,121850
+4D1702CC0002,220,12,13,17,438000,952874,963874,963874,952874,106000,398000,320000,121850
+4D1702CC0003,219,12,13,17,438000,975340,986340,986340,975340,106000,398000,320000,121850
+4D1702CC0004,218,12,13,17,438000,998666,1009666,1009666,998666,106000,398000,320000,121850
+4D1702CC0005,217,12,13,17,438000,1022100,1033100,1033100,1022100,106000,398000,320000,121850
+4D1702CC0006,216,12,13,17,438000,1044921,1055921,1055921,1044921,106000,398000,320000,121850
+4D1702CC0007,215,12,13,17,438000,1068521,1079521,1079521,1068521,106000,398000,320000,121850
+4D1702CC0008,214,12,13,17,438000,1091674,1102674,1102674,1091674,106000,398000,320000,121850
+4D1702CC0009,213,12,13,17,438000,1115106,1126106,1126106,1115106,106000,398000,320000,121850
+4D1702CC0010,212,12,13,17,438000,1138445,1149445,1149445,1138445,106000,398000,320000,121850
+4D1702CC0011,211,12,13,17,436000,1161543,1172543,1172543,1161543,106000,398000,320000,121850
+4D1702CC0012,210,12,13,17,436000,1184754,1195754,1195754,1184754,106000,398000,320000,121850
+4D1702CC0013,209,12,13,17,436000,1208380,1219380,1219380,1208380,106000,398000,320000,121850
+4D1702CC0014,208,12,13,17,436000,1231133,1242133,1242133,1231133,106000,398000,320000,121850
+4D1702CC0015,207,12,13,17,436000,1254236,1265236,1265236,1254236,106000,398000,320000,121850
+4D1702CC0016,206,12,13,17,436000,1277556,1288556,1288556,1277556,106000,398000,320000,121850
+4D1702CC0017,205,12,13,17,436000,1301041,1312041,1312041,1301041,106000,398000,320000,121850
+4D1702CC0018,204,12,13,17,436000,1324418,1335418,1335418,1324418,106000,398000,320000,121850
+4D1702CC0019,203,12,13,17,436000,1347488,1358488,1358488,1347488,106000,398000,320000,121850
+4D1702CC0020,202,12,13,17,436000,1371096,1382096,1382096,1371096,106000,398000,320000,121850
+4D1702DD0001,105,12,13,17,436000,1394728,1405728,1405728,1394728,106000,398000,320000,121850
+4D1702DD0002,104,12,13,17,436000,1418156,1429156,1429156,1418156,106000,398000,320000,121850
+4D1702DD0003,103,12,13,17,436000,1440889,1451889,1451889,1440889,106000,398000,320000,121850
+4D1702DD0004,102,12,13,17,436000,1464856,1475856,1475856,1464856,106000,398000,320000,121850
+4D1702DD0005,101,12,13,17,436000,1487682,1498682,1498682,1487682,106000,398000,320000,121850
+4D1702DD0006,100,12,13,17,436000,1510394,1521394,1521394,1510394,106000,398000,320000,121850
+4D1702DD0007,99,12,13,17,436000,1534542,1545542,1545542,1534542,106000,398000,320000,121850
+4D1702DD0008,98,12,13,17,436000,1557240,1568240,1568240,1557240,106000,398000,320000,121850
+4D1702DD0009,97,12,13,17,436000,1580195,1591195,1591195,1580195,106000,398000,320000,121850
+4D1702DD0010,96,12,13,17,436000,1603686,1614686,1614686,1603686,106000,398000,320000,121850
+4D1702DD0011,95,12,13,17,434000,1626987,1637987,1637987,1626987,106000,398000,320000,121850
+4D1702DD0012,94,12,13,17,434000,1650460,1661460,1661460,1650460,106000,398000,320000,121850
+4D1702DD0013,93,12,13,17,434000,1672841,1683841,1683841,1672841,106000,398000,320000,121850
+4D1702DD0014,92,12,13,17,434000,1696684,1707684,1707684,1696684,106000,398000,320000,121850
+4D1702DD0015,91,12,13,17,434000,1720054,1731054,1731054,1720054,106000,398000,320000,121850
+4D1702DD0016,90,12,13,17,434000,1743324,1754324,1754324,1743324,106000,398000,320000,121850
+4D1702DD0017,89,12,13,17,434000,1766173,1777173,1777173,1766173,106000,398000,320000,121850
+4D1702DD0018,88,12,13,17,434000,1789601,1800601,1800601,1789601,106000,398000,320000,121850
+4D1702DD0019,87,12,13,17,434000,1812610,1823610,1823610,1812610,106000,398000,320000,121850
+4D1703AA0001,430,16,13,17,522000,945,11945,11945,945,106000,380000,290000,121850
+4D1703AA0002,429,16,13,17,522000,23021,34021,34021,23021,106000,380000,290000,121850
+4D1703AA0003,428,16,13,17,522000,48461,59461,59461,48461,106000,380000,290000,121850
+4D1703AA0004,427,16,13,17,522000,73912,84912,84912,73912,106000,380000,290000,121850
+4D1703AA0005,426,16,13,17,522000,99011,110011,110011,99011,106000,380000,290000,121850
+4D1703AA0006,425,16,13,17,522000,124746,135746,135746,124746,106000,380000,290000,121850
+4D1703AA0007,424,16,13,17,522000,150338,161338,161338,150338,106000,380000,290000,121850
+4D1703AA0008,423,16,13,17,522000,175826,186826,186826,175826,106000,380000,290000,121850
+4D1703AA0009,422,16,13,17,522000,201509,212509,212509,201509,106000,380000,290000,121850
+4D1703AA0010,421,16,13,17,522000,226798,237798,237798,226798,106000,380000,290000,121850
+4D1703AA0011,420,16,13,17,522000,252354,263354,263354,252354,106000,380000,290000,121850
+4D1703AA0012,419,16,13,17,522000,277295,288295,288295,277295,106000,380000,290000,121850
+4D1703AA0013,418,16,13,17,522000,303049,314049,314049,303049,106000,380000,290000,121850
+4D1703AA0014,417,16,13,17,522000,328562,339562,339562,328562,106000,380000,290000,121850
+4D1703AA0015,416,16,13,17,522000,354130,365130,365130,354130,106000,380000,290000,121850
+4D1703AA0016,415,16,13,17,522000,379786,390786,390786,379786,106000,380000,290000,121850
+4D1703AA0017,414,16,13,17,522000,405334,416334,416334,405334,106000,380000,290000,121850
+4D1703AA0018,413,16,13,17,522000,430388,441388,441388,430388,106000,380000,290000,121850
+4D1703BB0001,318,16,13,17,521000,456653,467653,467653,456653,106000,380000,290000,121850
+4D1703BB0002,317,16,13,17,521000,482681,493681,493681,482681,106000,380000,290000,121850
+4D1703BB0003,316,16,13,17,521000,507558,518558,518558,507558,106000,380000,290000,121850
+4D1703BB0004,315,16,13,17,521000,532974,543974,543974,532974,106000,380000,290000,121850
+4D1703BB0005,314,16,13,17,521000,558367,569367,569367,558367,106000,380000,290000,121850
+4D1703BB0006,313,16,13,17,521000,584284,595284,595284,584284,106000,380000,290000,121850
+4D1703BB0007,312,16,13,17,521000,609641,620641,620641,609641,106000,380000,290000,121850
+4D1703BB0008,311,16,13,17,521000,635164,646164,646164,635164,106000,380000,290000,121850
+4D1703BB0009,310,16,13,17,521000,660393,671393,671393,660393,106000,380000,290000,121850
+4D1703BB0010,309,16,13,17,520000,686425,697425,697425,686425,106000,380000,290000,121850
+4D1703BB0011,308,16,13,17,520000,711466,722466,722466,711466,106000,380000,290000,121850
+4D1703BB0012,307,16,13,17,520000,737479,748479,748479,737479,106000,380000,290000,121850
+4D1703BB0013,306,16,13,17,520000,762568,773568,773568,762568,106000,380000,290000,121850
+4D1703BB0014,305,16,13,17,520000,788552,799552,799552,788552,106000,380000,290000,121850
+4D1703BB0015,304,16,13,17,520000,814157,825157,825157,814157,106000,380000,290000,121850
+4D1703BB0016,303,16,13,17,520000,839200,850200,850200,839200,106000,380000,290000,121850
+4D1703BB0017,302,16,13,17,520000,865000,876000,876000,865000,106000,380000,290000,121850
+4D1703BB0018,301,16,13,17,520000,891033,902033,902033,891033,106000,380000,290000,121850
+4D1703CC0001,201,16,13,17,519000,915853,926853,926853,915853,106000,380000,290000,121850
+4D1703CC0002,200,16,13,17,519000,941204,952204,952204,941204,106000,380000,290000,121850
+4D1703CC0003,199,16,13,17,519000,966920,977920,977920,966920,106000,380000,290000,121850
+4D1703CC0004,198,16,13,17,519000,992701,1003701,1003701,992701,106000,380000,290000,121850
+4D1703CC0005,197,16,13,17,519000,1017509,1028509,1028509,1017509,106000,380000,290000,121850
+4D1703CC0006,196,16,13,17,519000,1043231,1054231,1054231,1043231,106000,380000,290000,121850
+4D1703CC0007,195,16,13,17,519000,1069102,1080102,1080102,1069102,106000,380000,290000,121850
+4D1703CC0008,194,16,13,17,519000,1094404,1105404,1105404,1094404,106000,380000,290000,121850
+4D1703CC0009,193,16,13,17,519000,1119958,1130958,1130958,1119958,106000,380000,290000,121850
+4D1703CC0010,192,16,13,17,517000,1145554,1156554,1156554,1145554,106000,380000,290000,121850
+4D1703CC0011,191,16,13,17,517000,1170933,1181933,1181933,1170933,106000,380000,290000,121850
+4D1703CC0012,190,16,13,17,517000,1196466,1207466,1207466,1196466,106000,380000,290000,121850
+4D1703CC0013,189,16,13,17,517000,1221822,1232822,1232822,1221822,106000,380000,290000,121850
+4D1703CC0014,188,16,13,17,517000,1247224,1258224,1258224,1247224,106000,380000,290000,121850
+4D1703CC0015,187,16,13,17,517000,1272933,1283933,1283933,1272933,106000,380000,290000,121850
+4D1703CC0016,186,16,13,17,517000,1298390,1309390,1309390,1298390,106000,380000,290000,121850
+4D1703CC0017,185,16,13,17,517000,1324160,1335160,1335160,1324160,106000,380000,290000,121850
+4D1703CC0018,184,16,13,17,517000,1349249,1360249,1360249,1349249,106000,380000,290000,121850
+4D1703DD0001,86,16,13,17,517000,1376357,1387357,1387357,1376357,106000,380000,290000,121850
+4D1703DD0002,85,16,13,17,517000,1401349,1412349,1412349,1401349,106000,380000,290000,121850
+4D1703DD0003,84,16,13,17,517000,1426863,1437863,1437863,1426863,106000,380000,290000,121850
+4D1703DD0004,83,16,13,17,517000,1452299,1463299,1463299,1452299,106000,380000,290000,121850
+4D1703DD0005,82,16,13,17,517000,1478019,1489019,1489019,1478019,106000,380000,290000,121850
+4D1703DD0006,81,16,13,17,517000,1503529,1514529,1514529,1503529,106000,380000,290000,121850
+4D1703DD0007,80,16,13,17,517000,1528466,1539466,1539466,1528466,106000,380000,290000,121850
+4D1703DD0008,79,16,13,17,517000,1554909,1565909,1565909,1554909,106000,380000,290000,121850
+4D1703DD0009,78,16,13,17,517000,1579944,1590944,1590944,1579944,106000,380000,290000,121850
+4D1703DD0010,77,16,13,17,517000,1605287,1616287,1616287,1605287,106000,380000,290000,121850
+4D1703DD0011,76,16,13,17,517000,1631048,1642048,1642048,1631048,106000,380000,290000,121850
+4D1703DD0012,75,16,13,17,517000,1656459,1667459,1667459,1656459,106000,380000,290000,121850
+4D1703DD0013,74,16,13,17,517000,1682063,1693063,1693063,1682063,106000,380000,290000,121850
+4D1703DD0014,73,16,13,17,517000,1707523,1718523,1718523,1707523,106000,380000,290000,121850
+4D1703DD0015,72,16,13,17,517000,1732667,1743667,1743667,1732667,106000,380000,290000,121850
+4D1703DD0016,71,16,13,17,517000,1758424,1769424,1769424,1758424,106000,380000,290000,121850
+4D1703DD0017,70,16,13,17,517000,1783837,1794837,1794837,1783837,106000,380000,290000,121850
+4D1703DD0018,69,16,13,17,517000,1810113,1821113,1821113,1810113,106000,380000,290000,121850
+4D1704AA0001,412,16,15,17,602800,907,11907,11907,907,106000,380000,290000,121850
+4D1704AA0002,411,16,15,17,602800,29415,40415,40415,29415,106000,380000,290000,121850
+4D1704AA0003,410,16,15,17,602800,59032,70032,70032,59032,106000,380000,290000,121850
+4D1704AA0004,409,16,15,17,602800,89021,100021,100021,89021,106000,380000,290000,121850
+4D1704AA0005,408,16,15,17,602800,118530,129530,129530,118530,106000,380000,290000,121850
+4D1704AA0006,407,16,15,17,602800,148769,159769,159769,148769,106000,380000,290000,121850
+4D1704AA0007,406,16,15,17,602800,178645,189645,189645,178645,106000,380000,290000,121850
+4D1704AA0008,405,16,15,17,602800,209194,220194,220194,209194,106000,380000,290000,121850
+4D1704AA0009,404,16,15,17,602800,238872,249872,249872,238872,106000,380000,290000,121850
+4D1704AA0010,403,16,15,17,602800,269205,280205,280205,269205,106000,380000,290000,121850
+4D1704AA0011,402,16,15,17,602800,298631,309631,309631,298631,106000,380000,290000,121850
+4D1704AA0012,401,16,15,17,602800,329069,340069,340069,329069,106000,380000,290000,121850
+4D1704AA0013,400,16,15,17,602800,358863,369863,369863,358863,106000,380000,290000,121850
+4D1704AA0014,399,16,15,17,602800,389194,400194,400194,389194,106000,380000,290000,121850
+4D1704AA0015,398,16,15,17,602800,419438,430438,430438,419438,106000,380000,290000,121850
+4D1704BB0001,300,16,15,17,602800,449001,460001,460001,449001,106000,380000,290000,121850
+4D1704BB0002,299,16,15,17,602800,479503,490503,490503,479503,106000,380000,290000,121850
+4D1704BB0003,298,16,15,17,602800,509505,520505,520505,509505,106000,380000,290000,121850
+4D1704BB0004,297,16,15,17,602800,539364,550364,550364,539364,106000,380000,290000,121850
+4D1704BB0005,296,16,15,17,602800,569761,580761,580761,569761,106000,380000,290000,121850
+4D1704BB0006,295,16,15,17,602800,599795,610795,610795,599795,106000,380000,290000,121850
+4D1704BB0007,294,16,15,17,602800,629822,640822,640822,629822,106000,380000,290000,121850
+4D1704BB0008,293,16,15,17,600800,659657,670657,670657,659657,106000,380000,290000,121850
+4D1704BB0009,292,16,15,17,600800,690156,701156,701156,690156,106000,380000,290000,121850
+4D1704BB0010,291,16,15,17,600800,719879,730879,730879,719879,106000,380000,290000,121850
+4D1704BB0011,290,16,15,17,600800,749659,760659,760659,749659,106000,380000,290000,121850
+4D1704BB0012,289,16,15,17,600800,780249,791249,791249,780249,106000,380000,290000,121850
+4D1704BB0013,288,16,15,17,600800,810450,821450,821450,810450,106000,380000,290000,121850
+4D1704BB0014,287,16,15,17,600800,840384,851384,851384,840384,106000,380000,290000,121850
+4D1704BB0015,286,16,15,17,600800,869989,880989,880989,869989,106000,380000,290000,121850
+4D1704CC0001,183,16,15,17,600300,900021,911021,911021,900021,106000,380000,290000,121850
+4D1704CC0002,182,16,15,17,600300,930645,941645,941645,930645,106000,380000,290000,121850
+4D1704CC0003,181,16,15,17,600300,960935,971935,971935,960935,106000,380000,290000,121850
+4D1704CC0004,180,16,15,17,600300,991125,1002125,1002125,991125,106000,380000,290000,121850
+4D1704CC0005,179,16,15,17,600300,1020689,1031689,1031689,1020689,106000,380000,290000,121850
+4D1704CC0006,178,16,15,17,600300,1051361,1062361,1062361,1051361,106000,380000,290000,121850
+4D1704CC0007,177,16,15,17,600300,1080760,1091760,1091760,1080760,106000,380000,290000,121850
+4D1704CC0008,176,16,15,17,600300,1111200,1122200,1122200,1111200,106000,380000,290000,121850
+4D1704CC0009,175,16,15,17,599300,1141463,1152463,1152463,1141463,106000,380000,290000,121850
+4D1704CC0010,174,16,15,17,599300,1171281,1182281,1182281,1171281,106000,380000,290000,121850
+4D1704CC0011,173,16,15,17,599300,1200939,1211939,1211939,1200939,106000,380000,290000,121850
+4D1704CC0012,172,16,15,17,599300,1231344,1242344,1242344,1231344,106000,380000,290000,121850
+4D1704CC0013,171,16,15,17,599300,1261383,1272383,1272383,1261383,106000,380000,290000,121850
+4D1704CC0014,170,16,15,17,599300,1291359,1302359,1302359,1291359,106000,380000,290000,121850
+4D1704CC0015,169,16,15,17,599300,1321185,1332185,1332185,1321185,106000,380000,290000,121850
+4D1704DD0001,68,16,15,17,598000,1352000,1363000,1363000,1352000,106000,380000,290000,121850
+4D1704DD0002,67,16,15,17,598000,1381717,1392717,1392717,1381717,106000,380000,290000,121850
+4D1704DD0003,66,16,15,17,598000,1411959,1422959,1422959,1411959,106000,380000,290000,121850
+4D1704DD0004,65,16,15,17,598000,1441636,1452636,1452636,1441636,106000,380000,290000,121850
+4D1704DD0005,64,16,15,17,598000,1472141,1483141,1483141,1472141,106000,380000,290000,121850
+4D1704DD0006,63,16,15,17,598000,1501439,1512439,1512439,1501439,106000,380000,290000,121850
+4D1704DD0007,62,16,15,17,598000,1532315,1543315,1543315,1532315,106000,380000,290000,121850
+4D1704DD0008,61,16,15,17,598000,1562708,1573708,1573708,1562708,106000,380000,290000,121850
+4D1704DD0009,60,16,15,17,598000,1591756,1602756,1602756,1591756,106000,380000,290000,121850
+4D1704DD0010,59,16,15,17,598000,1622093,1633093,1633093,1622093,106000,380000,290000,121850
+4D1704DD0011,58,16,15,17,598000,1652079,1663079,1663079,1652079,106000,380000,290000,121850
+4D1704DD0012,57,16,15,17,598000,1682643,1693643,1693643,1682643,106000,380000,290000,121850
+4D1704DD0013,56,16,15,17,598000,1711726,1722726,1722726,1711726,106000,380000,290000,121850
+4D1704DD0014,55,16,15,17,598000,1742854,1753854,1753854,1742854,106000,380000,290000,121850
+4D1704DD0015,54,16,15,17,598000,1772007,1783007,1783007,1772007,106000,380000,290000,121850
+4D1704DD0016,53,16,15,17,598000,1801830,1812830,1812830,1801830,106000,380000,290000,121850
+4D1705AA0001,397,24,15,17,685000,-1044,13956,13956,-1044,106000,341100,223600,121850
+4D1705AA0002,396,24,15,17,685000,31249,46249,46249,31249,106000,341100,223600,121850
+4D1705AA0003,395,24,15,17,685000,65435,80435,80435,65435,106000,341100,223600,121850
+4D1705AA0004,394,24,15,17,685000,99051,114051,114051,99051,106000,341100,223600,121850
+4D1705AA0005,393,24,15,17,685000,133624,148624,148624,133624,106000,341100,223600,121850
+4D1705AA0006,392,24,15,17,685000,167870,182870,182870,167870,106000,341100,223600,121850
+4D1705AA0007,391,24,15,17,685000,200868,215868,215868,200868,106000,341100,223600,121850
+4D1705AA0008,390,24,15,17,685000,235643,250643,250643,235643,106000,341100,223600,121850
+4D1705AA0009,389,24,15,17,685000,270138,285138,285138,270138,106000,341100,223600,121850
+4D1705AA0010,388,24,15,17,685000,303407,318407,318407,303407,106000,341100,223600,121850
+4D1705AA0011,387,24,15,17,685000,337803,352803,352803,337803,106000,341100,223600,121850
+4D1705AA0012,386,24,15,17,685000,371390,386390,386390,371390,106000,341100,223600,121850
+4D1705AA0013,385,24,15,17,685000,405486,420486,420486,405486,106000,341100,223600,121850
+4D1705AA0014,384,24,15,17,685000,439244,454244,454244,439244,106000,341100,223600,121850
+4D1705BB0001,285,24,15,17,683300,479035,494035,494035,479035,106000,341100,223600,121850
+4D1705BB0002,284,24,15,17,683300,512866,527866,527866,512866,106000,341100,223600,121850
+4D1705BB0003,283,24,15,17,683300,546699,561699,561699,546699,106000,341100,223600,121850
+4D1705BB0004,282,24,15,17,683300,580380,595380,595380,580380,106000,341100,223600,121850
+4D1705BB0005,281,24,15,17,683300,614105,629105,629105,614105,106000,341100,223600,121850
+4D1705BB0006,280,24,15,17,683300,648605,663605,663605,648605,106000,341100,223600,121850
+4D1705BB0007,279,24,15,17,683300,683288,698288,698288,683288,106000,341100,223600,121850
+4D1705BB0008,278,24,15,17,683300,717003,732003,732003,717003,106000,341100,223600,121850
+4D1705BB0009,277,24,15,17,683300,750909,765909,765909,750909,106000,341100,223600,121850
+4D1705BB0010,276,24,15,17,683300,785256,800256,800256,785256,106000,341100,223600,121850
+4D1705BB0011,275,24,15,17,683300,819194,834194,834194,819194,106000,341100,223600,121850
+4D1705BB0012,274,24,15,17,683300,853123,868123,868123,853123,106000,341100,223600,121850
+4D1705BB0013,273,24,15,17,683300,886771,901771,901771,886771,106000,341100,223600,121850
+4D1705CC0001,168,32,15,17,681300,921161,936161,936161,921161,106000,304600,157200,121850
+4D1705CC0002,167,32,15,17,681300,960831,975831,975831,960831,106000,304600,157200,121850
+4D1705CC0003,166,32,15,17,681300,999393,1014393,1014393,999393,106000,304600,157200,121850
+4D1705CC0004,165,32,15,17,681300,1038905,1053905,1053905,1038905,106000,304600,157200,121850
+4D1705CC0005,164,32,15,17,681300,1077997,1092997,1092997,1077997,106000,304600,157200,121850
+4D1705CC0006,163,32,15,17,681300,1117126,1132126,1132126,1117126,106000,304600,157200,121850
+4D1705CC0007,162,32,15,17,680000,1156432,1171432,1171432,1156432,106000,304600,157200,121850
+4D1705CC0008,161,32,15,17,680000,1194953,1209953,1209953,1194953,106000,304600,157200,121850
+4D1705CC0009,160,32,15,17,680000,1234612,1249612,1249612,1234612,106000,304600,157200,121850
+4D1705CC0010,159,32,15,17,680000,1273757,1288757,1288757,1273757,106000,304600,157200,121850
+4D1705CC0011,158,32,15,17,680000,1312597,1327597,1327597,1312597,106000,304600,157200,121850
+4D1705CC0012,157,32,15,17,680000,1351954,1366954,1366954,1351954,106000,304600,157200,121850
+4D1705DD0001,52,32,15,17,679500,1392706,1407706,1407706,1392706,106000,304600,157200,121850
+4D1705DD0002,51,32,15,17,679500,1430447,1445447,1445447,1430447,106000,304600,157200,121850
+4D1705DD0003,50,32,15,17,679500,1469689,1484689,1484689,1469689,106000,304600,157200,121850
+4D1705DD0004,49,32,15,17,679500,1508359,1523359,1523359,1508359,106000,304600,157200,121850
+4D1705DD0005,48,32,15,17,679500,1547315,1562315,1562315,1547315,106000,304600,157200,121850
+4D1705DD0006,47,32,15,17,679500,1587005,1602005,1602005,1587005,106000,304600,157200,121850
+4D1705DD0007,46,32,15,17,679500,1626627,1641627,1641627,1626627,106000,304600,157200,121850
+4D1705DD0008,45,32,15,17,679500,1665111,1680111,1680111,1665111,106000,304600,157200,121850
+4D1705DD0009,44,32,15,17,679500,1704081,1719081,1719081,1704081,106000,304600,157200,121850
+4D1705DD0010,43,32,15,17,679500,1743221,1758221,1758221,1743221,106000,304600,157200,121850
+4D1705DD0011,42,32,15,17,679500,1782581,1797581,1797581,1782581,106000,304600,157200,121850
+4D1705DD0012,41,32,15,17,679500,1821760,1836760,1836760,1821760,106000,304600,157200,121850
+4D1706AA0001,383,44,15,17,34100,-1073,15927,15927,-1073,106000,242000,134900,121850
+4D1706AA0002,382,44,15,17,34100,39582,56582,56582,39582,106000,242000,134900,121850
+4D1706AA0003,381,44,15,17,34100,80804,97804,97804,80804,106000,242000,134900,121850
+4D1706AA0004,380,44,15,17,34100,123427,140427,140427,123427,106000,242000,134900,121850
+4D1706AA0005,379,44,15,17,34100,165023,182023,182023,165023,106000,242000,134900,121850
+4D1706AA0006,378,44,15,17,34100,206868,223868,223868,206868,106000,242000,134900,121850
+4D1706AA0007,377,44,15,17,34100,249292,266292,266292,249292,106000,242000,134900,121850
+4D1706AA0008,376,44,15,17,34100,291370,308370,308370,291370,106000,242000,134900,121850
+4D1706AA0009,375,44,15,17,34100,333258,350258,350258,333258,106000,242000,134900,121850
+4D1706AA0010,374,44,15,17,34100,375369,392369,392369,375369,106000,242000,134900,121850
+4D1706AA0011,373,44,15,17,34100,417158,434158,434158,417158,106000,242000,134900,121850
+4D1706BB0001,272,44,15,17,32500,460677,477677,477677,460677,106000,242000,134900,121850
+4D1706BB0002,271,44,15,17,32500,501813,518813,518813,501813,106000,242000,134900,121850
+4D1706BB0003,270,44,15,17,32500,543442,560442,560442,543442,106000,242000,134900,121850
+4D1706BB0004,269,44,15,17,32500,585451,602451,602451,585451,106000,242000,134900,121850
+4D1706BB0005,268,44,15,17,32500,627507,644507,644507,627507,106000,242000,134900,121850
+4D1706BB0006,267,44,15,17,32500,669553,686553,686553,669553,106000,242000,134900,121850
+4D1706BB0007,266,44,15,17,31100,711723,728723,728723,711723,106000,242000,134900,121850
+4D1706BB0008,265,44,15,17,31100,753883,770883,770883,753883,106000,242000,134900,121850
+4D1706BB0009,264,44,15,17,31100,795724,812724,812724,795724,106000,242000,134900,121850
+4D1706BB0010,263,44,15,17,31100,837752,854752,854752,837752,106000,242000,134900,121850
+4D1706BB0011,262,44,15,17,31100,879026,896026,896026,879026,106000,242000,134900,121850
+4D1706CC0001,156,44,15,17,31000,922212,939212,939212,922212,106000,242000,134900,121850
+4D1706CC0002,155,44,15,17,31000,963596,980596,980596,963596,106000,242000,134900,121850
+4D1706CC0003,154,44,15,17,31000,1005241,1022241,1022241,1005241,106000,242000,134900,121850
+4D1706CC0004,153,44,15,17,31000,1047223,1064223,1064223,1047223,106000,242000,134900,121850
+4D1706CC0005,152,44,15,17,31000,1089302,1106302,1106302,1089302,106000,242000,134900,121850
+4D1706CC0006,151,44,15,17,29000,1131674,1148674,1148674,1131674,106000,242000,134900,121850
+4D1706CC0007,150,44,15,17,29000,1173433,1190433,1190433,1173433,106000,242000,134900,121850
+4D1706CC0008,149,44,15,17,29000,1215794,1232794,1232794,1215794,106000,242000,134900,121850
+4D1706CC0009,148,44,15,17,29000,1257447,1274447,1274447,1257447,106000,242000,134900,121850
+4D1706CC0010,147,44,15,17,29000,1299650,1316650,1316650,1299650,106000,242000,134900,121850
+4D1706CC0011,146,44,15,17,29000,1341230,1358230,1358230,1341230,106000,242000,134900,121850
+4D1706DD0001,40,44,15,17,29000,1384239,1401239,1401239,1384239,106000,242000,134900,121850
+4D1706DD0002,39,44,15,17,29000,1426128,1443128,1443128,1426128,106000,242000,134900,121850
+4D1706DD0003,38,44,15,17,29000,1467774,1484774,1484774,1467774,106000,242000,134900,121850
+4D1706DD0004,37,44,15,17,29000,1509372,1526372,1526372,1509372,106000,242000,134900,121850
+4D1706DD0005,36,44,15,17,29000,1551582,1568582,1568582,1551582,106000,242000,134900,121850
+4D1706DD0006,35,44,15,17,29000,1593430,1610430,1610430,1593430,106000,242000,134900,121850
+4D1706DD0007,34,44,15,17,27000,1635640,1652640,1652640,1635640,106000,242000,134900,121850
+4D1706DD0008,33,44,15,17,27000,1677565,1694565,1694565,1677565,106000,242000,134900,121850
+4D1706DD0009,32,44,15,17,27000,1719758,1736758,1736758,1719758,106000,242000,134900,121850
+4D1706DD0010,31,44,15,17,27000,1761338,1778338,1778338,1761338,106000,242000,134900,121850
+4D1706DD0011,30,44,15,17,27000,1801653,1818653,1818653,1801653,106000,242000,134900,121850
+4D1707AA0001,372,44,15,17,115300,-2095,14905,14905,-2095,106000,242000,134900,121850
+4D1707AA0002,371,44,15,17,115300,39609,56609,56609,39609,106000,242000,134900,121850
+4D1707AA0003,370,44,15,17,115300,81433,98433,98433,81433,106000,242000,134900,121850
+4D1707AA0004,369,44,15,17,115300,123336,140336,140336,123336,106000,242000,134900,121850
+4D1707AA0005,368,44,15,17,115300,165363,182363,182363,165363,106000,242000,134900,121850
+4D1707AA0006,367,44,15,17,115300,207379,224379,224379,207379,106000,242000,134900,121850
+4D1707AA0007,366,44,15,17,115300,249242,266242,266242,249242,106000,242000,134900,121850
+4D1707AA0008,365,44,15,17,115300,291626,308626,308626,291626,106000,242000,134900,121850
+4D1707AA0009,364,44,15,17,115300,333632,350632,350632,333632,106000,242000,134900,121850
+4D1707AA0010,363,44,15,17,115300,375428,392428,392428,375428,106000,242000,134900,121850
+4D1707AA0011,362,44,15,17,115300,417435,434435,434435,417435,106000,242000,134900,121850
+4D1707BB0001,261,44,15,17,113500,460483,477483,477483,460483,106000,242000,134900,121850
+4D1707BB0002,260,44,15,17,113500,501547,518547,518547,501547,106000,242000,134900,121850
+4D1707BB0003,259,44,15,17,113500,543766,560766,560766,543766,106000,242000,134900,121850
+4D1707BB0004,258,44,15,17,113500,585860,602860,602860,585860,106000,242000,134900,121850
+4D1707BB0005,257,44,15,17,113500,628452,645452,645452,628452,106000,242000,134900,121850
+4D1707BB0006,256,44,15,17,112500,669678,686678,686678,669678,106000,242000,134900,121850
+4D1707BB0007,255,44,15,17,112500,711576,728576,728576,711576,106000,242000,134900,121850
+4D1707BB0008,254,44,15,17,112500,753883,770883,770883,753883,106000,242000,134900,121850
+4D1707BB0009,253,44,15,17,112500,795949,812949,812949,795949,106000,242000,134900,121850
+4D1707BB0010,252,44,15,17,112500,837702,854702,854702,837702,106000,242000,134900,121850
+4D1707BB0011,251,44,15,17,112500,879910,896910,896910,879910,106000,242000,134900,121850
+4D1707CC0001,145,44,15,17,111500,922509,939509,939509,922509,106000,242000,134900,121850
+4D1707CC0002,144,44,15,17,111500,964293,981293,981293,964293,106000,242000,134900,121850
+4D1707CC0003,143,44,15,17,111500,1005771,1022771,1022771,1005771,106000,242000,134900,121850
+4D1707CC0004,142,44,15,17,111500,1048191,1065191,1065191,1048191,106000,242000,134900,121850
+4D1707CC0005,141,44,15,17,111500,1090081,1107081,1107081,1090081,106000,242000,134900,121850
+4D1707CC0006,140,44,15,17,110500,1131834,1148834,1148834,1131834,106000,242000,134900,121850
+4D1707CC0007,139,44,15,17,110500,1173682,1190682,1190682,1173682,106000,242000,134900,121850
+4D1707CC0008,138,44,15,17,110500,1216162,1233162,1233162,1216162,106000,242000,134900,121850
+4D1707CC0009,137,44,15,17,110500,1257750,1274750,1274750,1257750,106000,242000,134900,121850
+4D1707CC0010,136,44,15,17,110500,1299971,1316971,1316971,1299971,106000,242000,134900,121850
+4D1707CC0011,135,44,15,17,110500,1341636,1358636,1358636,1341636,106000,242000,134900,121850
+4D1707DD0001,29,44,15,17,110000,1384610,1401610,1401610,1384610,106000,242000,134900,121850
+4D1707DD0002,28,44,15,17,110000,1426159,1443159,1443159,1426159,106000,242000,134900,121850
+4D1707DD0003,27,44,15,17,110000,1467467,1484467,1484467,1467467,106000,242000,134900,121850
+4D1707DD0004,26,44,15,17,110000,1510103,1527103,1527103,1510103,106000,242000,134900,121850
+4D1707DD0005,25,44,15,17,110000,1551855,1568855,1568855,1551855,106000,242000,134900,121850
+4D1707DD0006,24,44,15,17,110000,1593683,1610683,1610683,1593683,106000,242000,134900,121850
+4D1707DD0007,23,44,15,17,110000,1635850,1652850,1652850,1635850,106000,242000,134900,121850
+4D1707DD0008,22,44,15,17,110000,1677763,1694763,1694763,1677763,106000,242000,134900,121850
+4D1707DD0009,21,44,15,17,110000,1719665,1736665,1736665,1719665,106000,242000,134900,121850
+4D1707DD0010,20,44,15,17,110000,1761666,1778666,1778666,1761666,106000,242000,134900,121850
+4D1707DD0011,19,44,15,17,110000,1803340,1820340,1820340,1803340,106000,242000,134900,121850
+4D1708AA0001,361,56,15,17,198500,-1077,15923,15923,-1077,106000,185500,43600,121850
+4D1708AA0002,360,56,15,17,198500,49369,66369,66369,49369,106000,185500,43600,121850
+4D1708AA0003,359,56,15,17,198500,100117,117117,117117,100117,106000,185500,43600,121850
+4D1708AA0004,358,56,15,17,198500,150737,167737,167737,150737,106000,185500,43600,121850
+4D1708AA0005,357,56,15,17,198500,202040,219040,219040,202040,106000,185500,43600,121850
+4D1708AA0006,356,56,15,17,196500,253719,270719,270719,253719,106000,185500,43600,121850
+4D1708AA0007,355,56,15,17,196500,304324,321324,321324,304324,106000,185500,43600,121850
+4D1708AA0008,354,56,15,17,196500,355744,372744,372744,355744,106000,185500,43600,121850
+4D1708AA0009,353,56,15,17,196500,406797,423797,423797,406797,106000,185500,43600,121850
+4D1708BB0001,250,56,15,17,196500,458080,475080,475080,458080,106000,185500,43600,121850
+4D1708BB0002,249,56,15,17,196500,509647,526647,526647,509647,106000,185500,43600,121850
+4D1708BB0003,248,56,15,17,196500,560626,577626,577626,560626,106000,185500,43600,121850
+4D1708BB0004,247,56,15,17,196500,611102,628102,628102,611102,106000,185500,43600,121850
+4D1708BB0005,246,56,15,17,194500,662243,679243,679243,662243,106000,185500,43600,121850
+4D1708BB0006,245,56,15,17,194500,713439,730439,730439,713439,106000,185500,43600,121850
+4D1708BB0007,244,56,15,17,194500,764667,781667,781667,764667,106000,185500,43600,121850
+4D1708BB0008,243,56,15,17,194500,815510,832510,832510,815510,106000,185500,43600,121850
+4D1708BB0009,242,56,15,17,194500,866740,883740,883740,866740,106000,185500,43600,121850
+4D1708CC0001,134,56,15,17,193000,917898,934898,934898,917898,106000,185500,43600,121850
+4D1708CC0002,133,56,15,17,193000,969642,986642,986642,969642,106000,185500,43600,121850
+4D1708CC0003,132,56,15,17,193000,1020287,1037287,1037287,1020287,106000,185500,43600,121850
+4D1708CC0004,131,56,15,17,193000,1071539,1088539,1088539,1071539,106000,185500,43600,121850
+4D1708CC0005,130,56,15,17,193000,1122306,1139306,1139306,1122306,106000,185500,43600,121850
+4D1708CC0006,129,56,15,17,193000,1173269,1190269,1190269,1173269,106000,185500,43600,121850
+4D1708CC0007,128,56,15,17,193000,1224229,1241229,1241229,1224229,106000,185500,43600,121850
+4D1708CC0008,127,56,15,17,193000,1275759,1292759,1292759,1275759,106000,185500,43600,121850
+4D1708CC0009,126,56,15,17,193000,1326361,1343361,1343361,1326361,106000,185500,43600,121850
+4D1708DD0001,18,56,15,17,191000,1377468,1394468,1394468,1377468,106000,185500,43600,121850
+4D1708DD0002,17,56,15,17,191000,1428870,1445870,1445870,1428870,106000,185500,43600,121850
+4D1708DD0003,16,56,15,17,191000,1479652,1496652,1496652,1479652,106000,185500,43600,121850
+4D1708DD0004,15,56,15,17,191000,1530551,1547551,1547551,1530551,106000,185500,43600,121850
+4D1708DD0005,14,56,15,17,191000,1581670,1598670,1598670,1581670,106000,185500,43600,121850
+4D1708DD0006,13,56,15,17,191000,1632747,1649747,1649747,1632747,106000,185500,43600,121850
+4D1708DD0007,12,56,15,17,191000,1683584,1700584,1700584,1683584,106000,185500,43600,121850
+4D1708DD0008,11,56,15,17,191000,1734539,1751539,1751539,1734539,106000,185500,43600,121850
+4D1708DD0009,2,56,15,17,191000,1785660,1802660,1802660,1785660,106000,185500,43600,121850
+4D1709AA0001,352,56,15,17,278000,-539,16461,16461,-539,106000,185500,43600,121850
+4D1709AA0002,351,56,15,17,278000,49983,66983,66983,49983,106000,185500,43600,121850
+4D1709AA0003,350,56,15,17,278000,100143,117143,117143,100143,106000,185500,43600,121850
+4D1709AA0004,349,56,15,17,278000,151906,168906,168906,151906,106000,185500,43600,121850
+4D1709AA0005,348,56,15,17,278000,202927,219927,219927,202927,106000,185500,43600,121850
+4D1709AA0006,347,56,15,17,278000,253768,270768,270768,253768,106000,185500,43600,121850
+4D1709AA0007,346,56,11,17,278000,305199,322199,322199,305199,106000,185500,43600,121850
+4D1709AA0008,345,56,11,17,278000,355849,372849,372849,355849,106000,185500,43600,121850
+4D1709AA0009,344,56,11,17,278000,406912,423912,423912,406912,106000,185500,43600,121850
+4D1709BB0001,241,56,11,17,276500,458179,475179,475179,458179,106000,185500,43600,121850
+4D1709BB0002,240,56,11,17,276500,509402,526402,526402,509402,106000,185500,43600,121850
+4D1709BB0003,239,56,11,17,276500,560193,577193,577193,560193,106000,185500,43600,121850
+4D1709BB0004,238,56,11,17,276500,611261,628261,628261,611261,106000,185500,43600,121850
+4D1709BB0005,237,56,15,17,276500,662846,679846,679846,662846,106000,185500,43600,121850
+4D1709BB0006,236,56,15,17,276500,713808,730808,730808,713808,106000,185500,43600,121850
+4D1709BB0007,235,56,15,17,276500,764864,781864,781864,764864,106000,185500,43600,121850
+4D1709BB0008,234,56,15,17,276500,815718,832718,832718,815718,106000,185500,43600,121850
+4D1709BB0009,233,56,15,17,276500,866624,883624,883624,866624,106000,185500,43600,121850
+4D1709CC0001,125,56,15,17,274000,918530,935530,935530,918530,106000,185500,43600,121850
+4D1709CC0002,124,56,15,17,274000,969027,986027,986027,969027,106000,185500,43600,121850
+4D1709CC0003,123,56,15,17,274000,1019520,1036520,1036520,1019520,106000,185500,43600,121850
+4D1709CC0004,122,56,15,17,274000,1071160,1088160,1088160,1071160,106000,185500,43600,121850
+4D1709CC0005,121,56,15,17,274000,1121953,1138953,1138953,1121953,106000,185500,43600,121850
+4D1709CC0006,120,56,15,17,274000,1173282,1190282,1190282,1173282,106000,185500,43600,121850
+4D1709CC0007,119,56,15,17,274000,1224434,1241434,1241434,1224434,106000,185500,43600,121850
+4D1709CC0008,118,56,15,17,274000,1275551,1292551,1292551,1275551,106000,185500,43600,121850
+4D1709CC0009,117,56,15,17,274000,1326189,1343189,1343189,1326189,106000,185500,43600,121850
+4D1709DD0001,9,56,15,17,272000,1377362,1394362,1394362,1377362,106000,185500,43600,121850
+4D1709DD0002,8,56,15,17,272000,1428950,1445950,1445950,1428950,106000,185500,43600,121850
+4D1709DD0003,7,56,15,17,272000,1478972,1495972,1495972,1478972,106000,185500,43600,121850
+4D1709DD0004,6,56,15,17,272000,1530183,1547183,1547183,1530183,106000,185500,43600,121850
+4D1709DD0005,5,56,15,17,272000,1581247,1598247,1598247,1581247,106000,185500,43600,121850
+4D1709DD0006,4,56,15,17,272000,1632582,1649582,1649582,1632582,106000,185500,43600,121850
+4D1709DD0007,3,56,15,17,272000,1683437,1700437,1700437,1683437,106000,185500,43600,121850
+4D1709DD0008,2,56,15,17,272000,1734298,1751298,1751298,1734298,106000,185500,43600,121850
+4D1709DD0009,1,56,15,17,272000,1785501,1802501,1802501,1785501,106000,185500,43600,121850

source/DeviceLibrary/acSingleStore/BoxBean.cs

@@ -28,6 +28,7 @@ namespace OnlineStore.DeviceLibrary
         private bool UseCompress_Axis = true;
         private bool UseCompress_Axis = true;
 
 
         public HumitureBean humBean = null;
         public HumitureBean humBean = null;
+        public LineConnect lineConnect = null;
         private System.Timers.Timer serverConnectTimer = new System.Timers.Timer();
         private System.Timers.Timer serverConnectTimer = new System.Timers.Timer();
         private System.Timers.Timer IoCheckTimer = new System.Timers.Timer();
         private System.Timers.Timer IoCheckTimer = new System.Timers.Timer();
         private System.Timers.Timer readDITimer = new System.Timers.Timer();
         private System.Timers.Timer readDITimer = new System.Timers.Timer();
@@ -51,13 +52,20 @@ namespace OnlineStore.DeviceLibrary
             readDITimer.Enabled = false;
             readDITimer.Enabled = false;
             readDITimer.Elapsed += ReadDITimer_Elapsed;
             readDITimer.Elapsed += ReadDITimer_Elapsed;
 
 
+            this.DeviceID = config.DeviceID;
+            this.baseConfig = config;
+            this.Config = config;
+            this.CID = config.CID;
             //添加调试 
             //添加调试 
-            IsDebug = ConfigAppSettings.GetIntValue(Setting_Init.IsInDebug).Equals(1);
+            IsDebug = config.ISDebug.Equals(1);
 
 
             UseCompress_Axis = true;
             UseCompress_Axis = true;
-            Name = ("料仓BOX_" + config.DeviceID + " ").ToUpper();
-            this.DeviceID = config.DeviceID;
-            this.Config = config;
+            Name = ("左侧BOX_"  + config.GetStoreId() + " ").ToUpper();
+            if (config.DeviceID.Equals(2))
+            { 
+                Name = ("右侧BOX_" + config.GetStoreId() + " ").ToUpper();
+            }
+      
             moveAxisList = new List<ConfigMoveAxis>();
             moveAxisList = new List<ConfigMoveAxis>();
             MoveAxisConfig();
             MoveAxisConfig();
             List<ACStorePosition> positionList = CSVPositionReader<ACStorePosition>.getPositionList();
             List<ACStorePosition> positionList = CSVPositionReader<ACStorePosition>.getPositionList();
@@ -72,19 +80,14 @@ namespace OnlineStore.DeviceLibrary
             }
             }
 
 
             humBean = new HumitureBean(config.Humiture_Port, Name);
             humBean = new HumitureBean(config.Humiture_Port, Name);
-
+            lineConnect = new LineConnect(config.GetStoreId(),config.CID);
             mainTimer.Enabled = false;
             mainTimer.Enabled = false;
             int isAuto = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun);
             int isAuto = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun);
             if (isAuto == 1)
             if (isAuto == 1)
             {
             {
                 mainTimer.Enabled = true;
                 mainTimer.Enabled = true;
             }
             }
-
-            Thread.Sleep(300);
-            //默认三个灯都亮
-            IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
-            IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
-            IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
+             
         }
         }
 
 
         private void IoCheckTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         private void IoCheckTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
@@ -92,7 +95,7 @@ namespace OnlineStore.DeviceLibrary
             //判断急停 
             //判断急停 
             if (storeRunStatus >= StoreRunStatus.HomeMoving)
             if (storeRunStatus >= StoreRunStatus.HomeMoving)
             {
             {
-                if (IOManager.IOValue(IO_Type.SuddenStop_BTN).Equals(IO_VALUE.LOW))
+                if (IOValue(IO_Type.SuddenStop_BTN).Equals(IO_VALUE.LOW))
                 {
                 {
                     if (isInSuddenDown.Equals(false))
                     if (isInSuddenDown.Equals(false))
                     {
                     {
@@ -100,7 +103,7 @@ namespace OnlineStore.DeviceLibrary
                         Task.Factory.StartNew(delegate
                         Task.Factory.StartNew(delegate
                         {
                         {
                             Thread.Sleep(100);
                             Thread.Sleep(100);
-                            if (IOManager.IOValue(IO_Type.SuddenStop_BTN).Equals(IO_VALUE.LOW))
+                            if (IOValue(IO_Type.SuddenStop_BTN).Equals(IO_VALUE.LOW))
                             {
                             {
                                 isInSuddenDown = true;
                                 isInSuddenDown = true;
                                 LogUtil.error(Name + "收到急停信号,报警急停");
                                 LogUtil.error(Name + "收到急停信号,报警急停");
@@ -119,7 +122,7 @@ namespace OnlineStore.DeviceLibrary
 
 
         private void ReadDITimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         private void ReadDITimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
         {
-            if (MoveInfo.MoveStep.Equals(StoreMoveStep.SC_03_MoveToHBag) && IOManager.IOValue(IO_Type.CheckPos).Equals(IO_VALUE.HIGH))
+            if (MoveInfo.MoveStep.Equals(StoreMoveStep.SC_03_MoveToHBag) && IOValue(IO_Type.CheckPos).Equals(IO_VALUE.HIGH))
             {
             {
                 reelIsExist = true;
                 reelIsExist = true;
             }
             }
@@ -152,13 +155,13 @@ namespace OnlineStore.DeviceLibrary
             alarmType = StoreAlarmType.None;
             alarmType = StoreAlarmType.None;
 
 
             //急停按钮和气压检测需要一起判断
             //急停按钮和气压检测需要一起判断
-            IO_VALUE suddenBtn = IOManager.IOValue(IO_Type.SuddenStop_BTN);
-            IO_VALUE airCheck = IOManager.IOValue(IO_Type.Airpressure_Check);
+            IO_VALUE suddenBtn = IOValue(IO_Type.SuddenStop_BTN);
+            IO_VALUE airCheck = IOValue(IO_Type.Airpressure_Check);
 
 
             if (suddenBtn.Equals(IO_VALUE.HIGH) && (airCheck.Equals(IO_VALUE.HIGH)))
             if (suddenBtn.Equals(IO_VALUE.HIGH) && (airCheck.Equals(IO_VALUE.HIGH)))
             {
             {
                 lastAirCloseTime = DateTime.Now;
                 lastAirCloseTime = DateTime.Now;
-                if (!RunAxis(true))
+                if (!OpenAllAxis(true))
                 {
                 {
                     return false;
                     return false;
                 }
                 }
@@ -168,7 +171,7 @@ namespace OnlineStore.DeviceLibrary
                 storeStatus = StoreStatus.ResetMove;
                 storeStatus = StoreStatus.ResetMove;
                 //启动温湿度服务器 
                 //启动温湿度服务器 
                 HumitureController.Init(Config.Humiture_Port);
                 HumitureController.Init(Config.Humiture_Port);
-                LineConnect.StartConnect();
+                lineConnect.StartConnect();
 
 
                 ReturnHome();
                 ReturnHome();
                 StartTime = DateTime.Now;
                 StartTime = DateTime.Now;
@@ -201,9 +204,9 @@ namespace OnlineStore.DeviceLibrary
             WarnMsg = "";
             WarnMsg = "";
             CurrInOutACount = 0;
             CurrInOutACount = 0;
             CurrInOutCount = 0;
             CurrInOutCount = 0;
-            IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
-            IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
-            IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
+            IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
+            IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
+            IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
             storeRunStatus = StoreRunStatus.HomeMoving;
             storeRunStatus = StoreRunStatus.HomeMoving;
             MoveInfo.NewMove(StoreMoveType.ReturnHome);
             MoveInfo.NewMove(StoreMoveType.ReturnHome);
 
 
@@ -227,9 +230,9 @@ namespace OnlineStore.DeviceLibrary
             CurrInOutCount = 0;
             CurrInOutCount = 0;
             CurrInOutACount = 0;
             CurrInOutACount = 0;
 
 
-            IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
-            IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
-            IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
+            IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
+            IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
+            IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
             //复位之前先停止运行
             //复位之前先停止运行
             if (isNeedClearAuto)
             if (isNeedClearAuto)
             {
             {
@@ -248,7 +251,7 @@ namespace OnlineStore.DeviceLibrary
             MoveInfo.NewMove(StoreMoveType.StoreReset);
             MoveInfo.NewMove(StoreMoveType.StoreReset);
             WarnMsg = "";
             WarnMsg = "";
 
 
-            if (!RunAxis(true))
+            if (!OpenAllAxis(true))
             ////打开四个轴
             ////打开四个轴
             //if (!OpenAllAxis())
             //if (!OpenAllAxis())
             {
             {
@@ -381,7 +384,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         private bool DoorIsOpen()
         private bool DoorIsOpen()
         {
         {
-            if (IOManager.IOValue(IO_Type.Door_Down).Equals(IO_VALUE.LOW) && IOManager.IOValue(IO_Type.Door_Up).Equals(IO_VALUE.HIGH))
+            if (IOValue(IO_Type.Door_Down).Equals(IO_VALUE.LOW) && IOValue(IO_Type.Door_Up).Equals(IO_VALUE.HIGH))
             {
             {
                 return true;
                 return true;
             }
             }
@@ -390,8 +393,8 @@ namespace OnlineStore.DeviceLibrary
         public void OpenDoor(bool IsWait = true)
         public void OpenDoor(bool IsWait = true)
         {
         {
             Thread.Sleep(60);
             Thread.Sleep(60);
-            IOManager.IOMove(IO_Type.Door_Down, IO_VALUE.LOW);
-            IOManager.IOMove(IO_Type.Door_Up, IO_VALUE.HIGH);
+            IOMove(IO_Type.Door_Down, IO_VALUE.LOW);
+            IOMove(IO_Type.Door_Up, IO_VALUE.HIGH);
             if (IsWait)
             if (IsWait)
             {
             {
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Door_Down, IO_VALUE.LOW));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Door_Down, IO_VALUE.LOW));
@@ -400,8 +403,8 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         public void CloseDoor(bool IsWait = true)
         public void CloseDoor(bool IsWait = true)
         {
         {
-            IOManager.IOMove(IO_Type.Door_Down, IO_VALUE.HIGH);
-            IOManager.IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
+            IOMove(IO_Type.Door_Down, IO_VALUE.HIGH);
+            IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
             if (IsWait)
             if (IsWait)
             {
             {
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Door_Down, IO_VALUE.HIGH));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Door_Down, IO_VALUE.HIGH));
@@ -411,7 +414,7 @@ namespace OnlineStore.DeviceLibrary
 
 
         #endregion
         #endregion
 
 
-        public bool RunAxis(bool isCheck)
+        public bool OpenAllAxis(bool isCheck)
         {
         {
             foreach (ConfigMoveAxis moveAxis in moveAxisList)
             foreach (ConfigMoveAxis moveAxis in moveAxisList)
             {
             {
@@ -426,7 +429,7 @@ namespace OnlineStore.DeviceLibrary
             //打开所有轴
             //打开所有轴
             if (isCheck)
             if (isCheck)
             {
             {
-                if (!OpenAllAxis())
+                if (!CheckAndOpenAxis())
                 {
                 {
                     return false;
                     return false;
                 }
                 }
@@ -437,7 +440,7 @@ namespace OnlineStore.DeviceLibrary
         /// 打开所有轴
         /// 打开所有轴
         /// </summary>
         /// </summary>
         /// <returns></returns>
         /// <returns></returns>
-        private bool OpenAllAxis()
+        private bool CheckAndOpenAxis()
         {
         {
             //判断轴是否正常
             //判断轴是否正常
             foreach (ConfigMoveAxis axis in moveAxisList)
             foreach (ConfigMoveAxis axis in moveAxisList)
@@ -518,7 +521,7 @@ namespace OnlineStore.DeviceLibrary
             TimeSpan span = DateTime.Now - StartTime;
             TimeSpan span = DateTime.Now - StartTime;
             IsRun = false;
             IsRun = false;
 
 
-            LineConnect.StopConnect();
+            lineConnect.StopConnect();
             IOManager.instance.CloseAllDO();
             IOManager.instance.CloseAllDO();
             if (UseCompress_Axis)
             if (UseCompress_Axis)
             {
             {
@@ -543,14 +546,14 @@ namespace OnlineStore.DeviceLibrary
             if (alarmType.Equals(StoreAlarmType.AxisAlarm) | alarmType.Equals(StoreAlarmType.AxisMoveError))
             if (alarmType.Equals(StoreAlarmType.AxisAlarm) | alarmType.Equals(StoreAlarmType.AxisMoveError))
             {
             {
                 LogUtil.error(Name + "轴报警，关闭刹车，停止运动，关闭轴，打开报警灯");
                 LogUtil.error(Name + "轴报警，关闭刹车，停止运动，关闭轴，打开报警灯");
-                //IOManager.IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
+                //IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
                 StopMove();
                 StopMove();
             }
             }
             else if (alarmType == StoreAlarmType.SuddenStop)
             else if (alarmType == StoreAlarmType.SuddenStop)
             {
             {
                 isInSuddenDown = true;
                 isInSuddenDown = true;
                 LogUtil.error(Name + "收到急停信号，关闭刹车，停止运动，关闭轴，打开报警灯 ");
                 LogUtil.error(Name + "收到急停信号，关闭刹车，停止运动，关闭轴，打开报警灯 ");
-                //IOManager.IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
+                //IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
                 MoveInfo.EndMove();
                 MoveInfo.EndMove();
                 StopMove();
                 StopMove();
                 storeStatus = StoreStatus.SuddenStop;
                 storeStatus = StoreStatus.SuddenStop;
@@ -559,7 +562,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 isNoAirCheck = true;
                 isNoAirCheck = true;
                 LogUtil.error(Name + " 未检测到气压信号 ,打开刹车，停止运动，关闭轴，打开报警灯 ");
                 LogUtil.error(Name + " 未检测到气压信号 ,打开刹车，停止运动，关闭轴，打开报警灯 ");
-                //IOManager.IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
+                //IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
                 MoveInfo.EndMove();
                 MoveInfo.EndMove();
                 StopMove();
                 StopMove();
                 storeStatus = StoreStatus.SuddenStop;
                 storeStatus = StoreStatus.SuddenStop;
@@ -585,7 +588,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             try
             try
             {
             {
-                if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
+                if (IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
                 {
                 {
                     StoreManager.checkWatch(doorCheckWatch, 1000, false);
                     StoreManager.checkWatch(doorCheckWatch, 1000, false);
                 }
                 }
@@ -623,102 +626,8 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.info("【" + info + "】 处理完成，耗时：" + stopwatch.Elapsed.ToString());
                 LogUtil.info("【" + info + "】 处理完成，耗时：" + stopwatch.Elapsed.ToString());
             }
             }
         }
         }
-        private void LedProcess()
-        {
-            try
-            {
-                //                机器状态 顶灯显示 
-                //                                              绿 黄  红
-                //机器复位中                             闪 灭   灭
-                //机器待机中                             亮 灭   灭
-                //机器出入库中                          闪 闪   灭
-                //温湿度超限报警中                   亮 闪   灭
-                //温湿度超限报警中超过30分钟  亮 闪   闪
-                //机器未启动                             灭 灭   灭
-                //机器设备故障(非温湿度)报警    亮   灭 闪
-
-                //报警时只需要亮红灯
-
-                DateTime time = DateTime.Now;
-                bool isTemp30M = false;
-                if (humBean.TempOrHumidityIsAlarm)
-                {
-                    TimeSpan span = DateTime.Now - humBean.TempAlarmTime;
-                    if (span.Minutes > 30)
-                    {
-                        isTemp30M = true;
-                    }
-                }
-                bool isNeedAlarmLed = false;
-                //报警灯
-                if (!alarmType.Equals(StoreAlarmType.None) || isTemp30M)
-                {
-                    isNeedAlarmLed = true;
-                }
-                if (isNeedAlarmLed && IOManager.IOValue(IO_Type.Alarm_HddLed).Equals(IO_VALUE.LOW))
-                {
-                    IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.HIGH);
-                }
-                else
-                {
-                    if (IOManager.IOValue(IO_Type.Alarm_HddLed).Equals(IO_VALUE.HIGH))
-                    {
-                        IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
-                    }
-                }
+      
 
 
-
-                //报警时绿灯和黄灯灭
-                if (isNeedAlarmLed)
-                {
-                    if (IOManager.IOValue(IO_Type.AutoRun_HddLed).Equals(IO_VALUE.HIGH))
-                    {
-                        IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
-                    }
-                    if (IOManager.IOValue(IO_Type.RunSign_HddLed).Equals(IO_VALUE.HIGH))
-                    {
-                        IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
-                    }
-                    return;
-                }
-
-                //绿灯闪
-                if ((MoveInfo.MoveType.Equals(StoreMoveType.InStore) || MoveInfo.MoveType.Equals(StoreMoveType.OutStore)
-                  || storeRunStatus.Equals(StoreRunStatus.HomeMoving) || storeRunStatus.Equals(StoreRunStatus.Reset))
-                  && IOManager.IOValue(IO_Type.AutoRun_HddLed).Equals(IO_VALUE.HIGH))
-                {
-                    IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
-                }
-                else
-                {
-                    //绿灯亮
-                    IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
-                }
-                //黄灯
-                if (MoveInfo.MoveType.Equals(StoreMoveType.InStore) || MoveInfo.MoveType.Equals(StoreMoveType.OutStore) || humBean.TempOrHumidityIsAlarm || isTemp30M)
-                {
-                    if (IOManager.IOValue(IO_Type.RunSign_HddLed).Equals(IO_VALUE.HIGH))
-                    {
-                        IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
-                    }
-                    else
-                    {
-                        IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.HIGH);
-                    }
-                }
-                else
-                {
-                    if (IOManager.IOValue(IO_Type.RunSign_HddLed).Equals(IO_VALUE.HIGH))
-                    {
-                        IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                LogUtil.error(Name + "灯处理定时器出错：" + ex.ToString());
-            }
-        }
         private IO_VALUE lastAutoRun = IO_VALUE.LOW;
         private IO_VALUE lastAutoRun = IO_VALUE.LOW;
         //   private IO_VALUE lastAirValue = IO_VALUE.LOW;
         //   private IO_VALUE lastAirValue = IO_VALUE.LOW;
         public void IoCheckProcess()
         public void IoCheckProcess()
@@ -727,7 +636,7 @@ namespace OnlineStore.DeviceLibrary
             if (storeRunStatus.Equals(StoreRunStatus.Wait))
             if (storeRunStatus.Equals(StoreRunStatus.Wait))
             {
             {
                 //取新的Io状态
                 //取新的Io状态
-                IO_VALUE autoSingle = IOManager.IOValue(IO_Type.Reset_BTN);
+                IO_VALUE autoSingle = IOValue(IO_Type.Reset_BTN);
                 if (ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun).Equals(1))
                 if (ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun).Equals(1))
                 {
                 {
                     if (autoSingle.Equals(IO_VALUE.HIGH) && lastAutoRun.Equals(IO_VALUE.LOW))
                     if (autoSingle.Equals(IO_VALUE.HIGH) && lastAutoRun.Equals(IO_VALUE.LOW))
@@ -750,8 +659,8 @@ namespace OnlineStore.DeviceLibrary
             else if (storeRunStatus >= StoreRunStatus.HomeMoving)
             else if (storeRunStatus >= StoreRunStatus.HomeMoving)
             {
             {
                 //取新的Io状态 
                 //取新的Io状态 
-                IO_VALUE suddenBtn = IOManager.IOValue(IO_Type.SuddenStop_BTN);
-                IO_VALUE resetBtn = IOManager.IOValue(IO_Type.Reset_BTN);
+                IO_VALUE suddenBtn = IOValue(IO_Type.SuddenStop_BTN);
+                IO_VALUE resetBtn = IOValue(IO_Type.Reset_BTN);
 
 
                 //急停按钮 
                 //急停按钮 
                 if (suddenBtn.Equals(IO_VALUE.LOW))
                 if (suddenBtn.Equals(IO_VALUE.LOW))
@@ -863,7 +772,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             try
             try
             {
             {
-                bool noInStore = LineConnect.WaitInStoreList.Count <= 0;
+                bool noInStore = lineConnect.WaitInStoreList.Count <= 0;
                 if (CurrInOutACount >= this.Config.Box_ResetACount && noInStore)
                 if (CurrInOutACount >= this.Config.Box_ResetACount && noInStore)
                 {
                 {
                     if (storeRunStatus < StoreRunStatus.Runing || MoveInfo.MoveType == StoreMoveType.InStore || MoveInfo.MoveType == StoreMoveType.OutStore)
                     if (storeRunStatus < StoreRunStatus.Runing || MoveInfo.MoveType == StoreMoveType.InStore || MoveInfo.MoveType == StoreMoveType.OutStore)
@@ -887,7 +796,7 @@ namespace OnlineStore.DeviceLibrary
                         LogUtil.info(Name + "已经累计出入库" + CurrInOutCount + "次，需要复位一下旋转轴");
                         LogUtil.info(Name + "已经累计出入库" + CurrInOutCount + "次，需要复位一下旋转轴");
                     }
                     }
                 }
                 }
-                else if (LineConnect.CanStartOut() || IsDebug)
+                else if (lineConnect.CanStartOut() || IsDebug)
                 {
                 {
                     InOutPosInfo currInOutFixture = null;
                     InOutPosInfo currInOutFixture = null;
                     lock (waitOutListLock)
                     lock (waitOutListLock)
@@ -978,7 +887,7 @@ namespace OnlineStore.DeviceLibrary
         public override void StopMove()
         public override void StopMove()
         {
         {
 
 
-            //IOManager.IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
+            //IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
             //运动版停止 
             //运动版停止 
             AxisManager.instance.SuddenStop(Config.Middle_Axis.DeviceName, Config.Middle_Axis.GetAxisValue());
             AxisManager.instance.SuddenStop(Config.Middle_Axis.DeviceName, Config.Middle_Axis.GetAxisValue());
             AxisManager.instance.SuddenStop(Config.UpDown_Axis.DeviceName, Config.UpDown_Axis.GetAxisValue());
             AxisManager.instance.SuddenStop(Config.UpDown_Axis.DeviceName, Config.UpDown_Axis.GetAxisValue());
@@ -988,8 +897,8 @@ namespace OnlineStore.DeviceLibrary
             CloseAllAxis();
             CloseAllAxis();
 
 
             LogUtil.info(Name + "StopMove");
             LogUtil.info(Name + "StopMove");
-            IOManager.IOMove(IO_Type.Door_Down, IO_VALUE.LOW);
-            IOManager.IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
+            IOMove(IO_Type.Door_Down, IO_VALUE.LOW);
+            IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
 
 
             isInPro = false;
             isInPro = false;
         }
         }
@@ -1114,7 +1023,7 @@ namespace OnlineStore.DeviceLibrary
         public void ReviceLineInStoreCMD(string posId, int plateH, int plateW, string message, string rfid)
         public void ReviceLineInStoreCMD(string posId, int plateH, int plateW, string message, string rfid)
         {
         {
             string logName = "流水线入库命令【 " + message + "】【" + posId + "】：";
             string logName = "流水线入库命令【 " + message + "】【" + posId + "】：";
-            if (!LineConnect.WaitInStoreList.Contains(posId))
+            if (!lineConnect.WaitInStoreList.Contains(posId))
             {
             {
                 LogUtil.error(logName + "库位未验证通过，重新验证库位");
                 LogUtil.error(logName + "库位未验证通过，重新验证库位");
                 bool result = ReviceLineCheckInStoreCMD(posId, plateH, plateW, message, rfid);
                 bool result = ReviceLineCheckInStoreCMD(posId, plateH, plateW, message, rfid);
@@ -1125,7 +1034,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else
             else
             {
             {
-                LineConnect.WaitInStoreList.Remove(posId);
+                lineConnect.WaitInStoreList.Remove(posId);
             }
             }
             //根据发送的posId获取位置列表
             //根据发送的posId获取位置列表
             ACStorePosition position = CSVPositionReader<ACStorePosition>.GetPositon(posId);
             ACStorePosition position = CSVPositionReader<ACStorePosition>.GetPositon(posId);
@@ -1176,16 +1085,16 @@ namespace OnlineStore.DeviceLibrary
             lastConTime = DateTime.Now;
             lastConTime = DateTime.Now;
             try
             try
             {
             {
-                if (LineConnect.IsConnect())
+                if (lineConnect.IsConnect())
                 {
                 {
-                    int hasTray = (int)IOManager.IOValue(IO_Type.TrayCheck_Door);
+                    int hasTray = (int)IOValue(IO_Type.TrayCheck_Door);
                     int ss = (int)storeStatus;
                     int ss = (int)storeStatus;
                     if (IsDebug)
                     if (IsDebug)
                     {
                     {
                         ss = (int)StoreStatus.Debugging;
                         ss = (int)StoreStatus.Debugging;
                     }
                     }
-                    StoreSendBean store = new StoreSendBean(Config.DeviceID, Config.CID, (int)ss, (int)storeRunStatus, hasTray, (int)alarmType);
-                    LineConnect.SendHeart(store);
+                    StoreSendBean store = lineConnect.GetBean(   (int)ss, (int)storeRunStatus, hasTray, (int)alarmType );
+                    lineConnect.SendHeart(store);
                 }
                 }
                 if (StoreManager.IsConnectServer)
                 if (StoreManager.IsConnectServer)
                 {
                 {
@@ -1198,10 +1107,10 @@ namespace OnlineStore.DeviceLibrary
                         LogUtil.error("定时给服务器发送消息出错：" + ex.ToString());
                         LogUtil.error("定时给服务器发送消息出错：" + ex.ToString());
                     }
                     }
                 }
                 }
-
+                humBean.HumidityProcess(this);
                 //HumitureController.QueryData();
                 //HumitureController.QueryData();
                 //HumidityProcess();
                 //HumidityProcess();
-                LedProcess();
+                //LedProcess();
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
@@ -1246,7 +1155,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             if (CodeMsg.Equals(""))
             if (CodeMsg.Equals(""))
             {
             {
-                if (storeRunStatus.Equals(StoreRunStatus.Runing) && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
+                if (storeRunStatus.Equals(StoreRunStatus.Runing) && IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                 {
                 {
                     boxStatus.msg = "叉子料盘检测有料，请检查";
                     boxStatus.msg = "叉子料盘检测有料，请检查";
                     lineOperation.msg = "叉子料盘检测有料，请检查";
                     lineOperation.msg = "叉子料盘检测有料，请检查";
@@ -1278,8 +1187,8 @@ namespace OnlineStore.DeviceLibrary
             //如果在空闲中，且有入库未完成，直接发送入库执行中 
             //如果在空闲中，且有入库未完成，直接发送入库执行中 
             if (boxStatus.status.Equals((int)StoreStatus.StoreOnline))
             if (boxStatus.status.Equals((int)StoreStatus.StoreOnline))
             {
             {
-                List<string> list = new List<string>(LineConnect.WaitInStoreList);
-                if (list.Count > 0 && (LineConnect.CanStartOut().Equals(false)))
+                List<string> list = new List<string>(lineConnect.WaitInStoreList);
+                if (list.Count > 0 && (lineConnect.CanStartOut().Equals(false)))
                 {
                 {
                     boxStatus.status = (int)StoreStatus.InStoreExecute;
                     boxStatus.status = (int)StoreStatus.InStoreExecute;
                 }
                 }
@@ -1423,7 +1332,7 @@ namespace OnlineStore.DeviceLibrary
                         LogUtil.error("验证出库【" + intouInfo.ToStr() + "】是否重复出错：" + ex.ToString());
                         LogUtil.error("验证出库【" + intouInfo.ToStr() + "】是否重复出错：" + ex.ToString());
                     }
                     }
 
 
-                    if (CanStarInOut() && (LineConnect.CanStartOut() || IsDebug))
+                    if (CanStarInOut() && (lineConnect.CanStartOut() || IsDebug))
                     {
                     {
                         bool result = StartOutStoreMove(new InOutParam(intouInfo));
                         bool result = StartOutStoreMove(new InOutParam(intouInfo));
                         if (!result)
                         if (!result)

source/DeviceLibrary/acSingleStore/BoxBean_Partial.cs

@@ -170,7 +170,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 else if (wait.WaitType == 2)
                 else if (wait.WaitType == 2)
                 {
                 {
-                    wait.IsEnd = IOManager.IOValue(wait.IoType).Equals(wait.IoValue);
+                    wait.IsEnd = IOValue(wait.IoType).Equals(wait.IoValue);
                     int timeOutMs = Config.IOSingle_TimerOut;
                     int timeOutMs = Config.IOSingle_TimerOut;
                     if (MoveInfo.MoveStep.Equals(StoreMoveStep.SO_28_WaitTake))
                     if (MoveInfo.MoveStep.Equals(StoreMoveStep.SO_28_WaitTake))
                     {
                     {
@@ -199,7 +199,7 @@ namespace OnlineStore.DeviceLibrary
                         isOk = false;
                         isOk = false;
                         break;
                         break;
                     }
                     }
-                    else if ((!wait.IsEnd) && MoveInfo.MoveStep.Equals(StoreMoveStep.SO_28_WaitTake) && LineConnect.CanReSend())
+                    else if ((!wait.IsEnd) && MoveInfo.MoveStep.Equals(StoreMoveStep.SO_28_WaitTake) && lineConnect.CanReSend())
                     {
                     {
                         //判断是否需要重发入库结束命令
                         //判断是否需要重发入库结束命令
                         SendOutStoreEnd(MoveInfo);
                         SendOutStoreEnd(MoveInfo);
@@ -216,7 +216,7 @@ namespace OnlineStore.DeviceLibrary
                             if (ww != null && ww.WaitType.Equals(2) && Config.DOList.ContainsKey(ww.IoType))
                             if (ww != null && ww.WaitType.Equals(2) && Config.DOList.ContainsKey(ww.IoType))
                             {
                             {
                                 isLog = true;
                                 isLog = true;
-                                IOManager.IOMove(ww.IoType, ww.IoValue);
+                                IOMove(ww.IoType, ww.IoValue);
                                 msg += ww.ToStr() + "，";
                                 msg += ww.ToStr() + "，";
                             }
                             }
                         }
                         }
@@ -298,7 +298,7 @@ namespace OnlineStore.DeviceLibrary
                     LogUtil.error(  Name + " 启动入库【" + posId + "】出错，找不到库位信息");
                     LogUtil.error(  Name + " 启动入库【" + posId + "】出错，找不到库位信息");
                     return;
                     return;
                 }
                 }
-                if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
+                if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                 {
                 {
                     LogUtil.error(  Name + " 启动入库【" + posId + "】出错，叉子料盘检测有料");
                     LogUtil.error(  Name + " 启动入库【" + posId + "】出错，叉子料盘检测有料");
                     return;
                     return;
@@ -315,7 +315,7 @@ namespace OnlineStore.DeviceLibrary
                 //StoreMove.WaitList.Add(WaitResultInfo.WaitTime(100));
                 //StoreMove.WaitList.Add(WaitResultInfo.WaitTime(100));
                 //StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
                 //StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
 
 
-                if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
+                if (IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
                 {
                 {
                     doorCheckWatch.Restart();
                     doorCheckWatch.Restart();
                 }
                 }
@@ -391,7 +391,7 @@ namespace OnlineStore.DeviceLibrary
             if (MoveInfo.MoveStep.Equals(StoreMoveStep.SI_00_TrayCheck))
             if (MoveInfo.MoveStep.Equals(StoreMoveStep.SI_00_TrayCheck))
             {
             {
                 //判断是否有料盘信号
                 //判断是否有料盘信号
-                if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH) && StoreManager.checkWatch(doorCheckWatch, 1000, false))
+                if (IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH) && StoreManager.checkWatch(doorCheckWatch, 1000, false))
                 {
                 {
                     SI_02_Move(moveP);
                     SI_02_Move(moveP);
                 }
                 }
@@ -420,7 +420,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.MoveStep == StoreMoveStep.SI_02_InOutAxisHome)
             else if (MoveInfo.MoveStep == StoreMoveStep.SI_02_InOutAxisHome)
             {
             {
-                if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
+                if (IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
                 {
                 {
                     string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
                     string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
                     CodeMsg = "入库[" + posId + "]叉子去取料前，未检测到进料口有料";
                     CodeMsg = "入库[" + posId + "]叉子去取料前，未检测到进料口有料";
@@ -476,7 +476,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.MoveStep == StoreMoveStep.SI_07_DeviceBackFromDoor)
             else if (MoveInfo.MoveStep == StoreMoveStep.SI_07_DeviceBackFromDoor)
             {
             {
-                if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
+                if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
                 {
                 {
                     string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
                     string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
                     CodeMsg = "入库[" + posId + "]叉子取料后退后，未检测到料叉有料";
                     CodeMsg = "入库[" + posId + "]叉子取料后退后，未检测到料叉有料";
@@ -498,8 +498,8 @@ namespace OnlineStore.DeviceLibrary
                 ACAxisMove(Config.Middle_Axis, moveP.Middle_P2, Config.MiddleAxis_P1_Speed);
                 ACAxisMove(Config.Middle_Axis, moveP.Middle_P2, Config.MiddleAxis_P1_Speed);
                 ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
                 ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
                 //关闭舱门 
                 //关闭舱门 
-                //IOManager.IOMove(IO_Type.Door_Down, IO_VALUE.HIGH);
-                //IOManager.IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
+                //IOMove(IO_Type.Door_Down, IO_VALUE.HIGH);
+                //IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
                 CloseDoor(false);
                 CloseDoor(false);
             }
             }
             else if (MoveInfo.MoveStep == StoreMoveStep.SI_09_MoveToBag)
             else if (MoveInfo.MoveStep == StoreMoveStep.SI_09_MoveToBag)
@@ -510,7 +510,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.MoveStep == StoreMoveStep.SI_10_LocationCylinder_Down)
             else if (MoveInfo.MoveStep == StoreMoveStep.SI_10_LocationCylinder_Down)
             {
             {
-                //IOManager.IOMove(IO_Type.LocationCylinder_Down, IO_VALUE.LOW);
+                //IOMove(IO_Type.LocationCylinder_Down, IO_VALUE.LOW);
                 InStoreLog("入库：SI_11 叉子进入库位中，进出轴至P3(库位取放料点) [" + moveP.InOut_P3 + "] ");
                 InStoreLog("入库：SI_11 叉子进入库位中，进出轴至P3(库位取放料点) [" + moveP.InOut_P3 + "] ");
                 MoveInfo.NextMoveStep(StoreMoveStep.SI_11_DeviceToBag);
                 MoveInfo.NextMoveStep(StoreMoveStep.SI_11_DeviceToBag);
                 ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
                 ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
@@ -590,7 +590,7 @@ namespace OnlineStore.DeviceLibrary
                     LogUtil.error(  Name + " 启动出库【" + posId + "】出错，找不到库位信息");
                     LogUtil.error(  Name + " 启动出库【" + posId + "】出错，找不到库位信息");
                     return false;
                     return false;
                 }
                 }
-                if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
+                if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                 {
                 {
                     LogUtil.error(  Name + " 启动出库【" + posId + "】出错，叉子料盘检测有料");
                     LogUtil.error(  Name + " 启动出库【" + posId + "】出错，叉子料盘检测有料");
                     return false;
                     return false;
@@ -666,7 +666,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.MoveStep == StoreMoveStep.SO_06_InoutToP1)
             else if (MoveInfo.MoveStep == StoreMoveStep.SO_06_InoutToP1)
             {
             {
-                if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
+                if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
                 {
                 {
                     string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
                     string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
                     CodeMsg = "出库[" + posId + "]叉子从库位退出后，未检测到料叉有料";
                     CodeMsg = "出库[" + posId + "]叉子从库位退出后，未检测到料叉有料";
@@ -782,7 +782,7 @@ namespace OnlineStore.DeviceLibrary
                 //OutStoreLog("出库：检测料仓门口料盘信号 ");
                 //OutStoreLog("出库：检测料仓门口料盘信号 ");
                 //StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
                 //StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
 
 
-                if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
+                if (IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
                 {
                 {
                     string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
                     string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.PosId : "";
                     string barcode = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.barcode : "";
                     string barcode = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.barcode : "";
@@ -864,13 +864,13 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         private void SendOutStoreEnd(StoreMoveInfo storeMove)
         private void SendOutStoreEnd(StoreMoveInfo storeMove)
         {
         {
-            int hasTray = (int)IOManager.IOValue(IO_Type.TrayCheck_Door);
+            int hasTray = (int)IOValue(IO_Type.TrayCheck_Door);
             int ss = (int)storeStatus;
             int ss = (int)storeStatus;
             if (IsDebug)
             if (IsDebug)
             {
             {
                 ss = (int)StoreStatus.Debugging;
                 ss = (int)StoreStatus.Debugging;
             }
             }
-            StoreSendBean store = new StoreSendBean(Config.DeviceID, Config.CID, (int)storeStatus, (int)storeRunStatus, hasTray, (int)alarmType);
+            StoreSendBean store = lineConnect.GetBean((int)storeStatus, (int)storeRunStatus, hasTray, (int)alarmType);
             store.data.Add(ParamDefine.posId, MoveInfo.MoveParam.PosInfo.PosId);
             store.data.Add(ParamDefine.posId, MoveInfo.MoveParam.PosInfo.PosId);
             store.data.Add(ParamDefine.plateH, MoveInfo.MoveParam.PosInfo.PlateH.ToString());
             store.data.Add(ParamDefine.plateH, MoveInfo.MoveParam.PosInfo.PlateH.ToString());
             store.data.Add(ParamDefine.plateW, MoveInfo.MoveParam.PosInfo.PlateW.ToString());
             store.data.Add(ParamDefine.plateW, MoveInfo.MoveParam.PosInfo.PlateW.ToString());
@@ -887,7 +887,7 @@ namespace OnlineStore.DeviceLibrary
             //store.urgentReel = storeMove.MoveParam.PosInfo.urgentReel;
             //store.urgentReel = storeMove.MoveParam.PosInfo.urgentReel;
             //store.rfid = storeMove.MoveParam.PosInfo.rfid;
             //store.rfid = storeMove.MoveParam.PosInfo.rfid;
             //store.rfidLoc = storeMove.MoveParam.PosInfo.rfidLoc;
             //store.rfidLoc = storeMove.MoveParam.PosInfo.rfidLoc;
-            LineConnect.OutStoreEnd(store);
+            lineConnect.OutStoreEnd(store);
         }
         }
 
 
         private void SO_53_InoutToP2()
         private void SO_53_InoutToP2()
@@ -917,10 +917,10 @@ namespace OnlineStore.DeviceLibrary
             //    return true;
             //    return true;
             //}
             //}
 
 
-            //if (IOManager.IOValue(IO_Type.LocationCylinder_Down).Equals(IO_VALUE.HIGH)
-            //    && IOManager.IOValue(IO_Type.LocationCylinder_Up).Equals(IO_VALUE.LOW)
-            //    && IOManager.IOValue(IO_Type.LocationCylinder2_Down).Equals(IO_VALUE.HIGH)
-            //    && IOManager.IOValue(IO_Type.LocationCylinder2_Up).Equals(IO_VALUE.LOW))
+            //if (IOValue(IO_Type.LocationCylinder_Down).Equals(IO_VALUE.HIGH)
+            //    && IOValue(IO_Type.LocationCylinder_Up).Equals(IO_VALUE.LOW)
+            //    && IOValue(IO_Type.LocationCylinder2_Down).Equals(IO_VALUE.HIGH)
+            //    && IOValue(IO_Type.LocationCylinder2_Up).Equals(IO_VALUE.LOW))
             //{
             //{
             //    return true;
             //    return true;
             //}
             //}

source/DeviceLibrary/acSingleStore/StoreBean.cs

 using Asa;
 using Asa;
+using HuichuanLibrary;
 using log4net;
 using log4net;
 using OnlineStore.Common;
 using OnlineStore.Common;
 using OnlineStore.LoadCSVLibrary;
 using OnlineStore.LoadCSVLibrary;
@@ -34,7 +35,8 @@ namespace OnlineStore.DeviceLibrary
                 lineConfig.IOSingle_TimerOut = 5000;
                 lineConfig.IOSingle_TimerOut = 5000;
             }
             }
             Init();
             Init();
-            InitTimer(); 
+            InitTimer();
+            this.baseConfig = lineConfig;
             this.Config = lineConfig;
             this.Config = lineConfig;
             this.DeviceID = lineConfig.DeviceID;
             this.DeviceID = lineConfig.DeviceID;
 
 
@@ -42,8 +44,10 @@ namespace OnlineStore.DeviceLibrary
             Name = (" Store_" + Config.CID + " ").ToUpper();
             Name = (" Store_" + Config.CID + " ").ToUpper();
             List<string> ioList = new List<string>();
             List<string> ioList = new List<string>();
 
 
+            HCBoardManager.InitConfig();
             IOManager.Init();
             IOManager.Init();
             AxisManager.Init();
             AxisManager.Init();
+            AxisManager.instance.OpenCard();
 
 
 
 
             foreach (BoxConfig config in configList.Values)
             foreach (BoxConfig config in configList.Values)
@@ -179,10 +183,23 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             try
             try
             {
             {
+                //                机器状态 顶灯显示 
+                //                                              绿 黄  红
+                //机器复位中                             闪 灭   灭
+                //机器待机中                             亮 灭   灭
+                //机器出入库中                          闪 闪   灭
+                //温湿度超限报警中                   亮 闪   灭
+                //温湿度超限报警中超过30分钟  亮 闪   闪
+                //机器未启动                             灭 灭   灭
+                //机器设备故障(非温湿度)报警    亮   灭 闪
+
+                //报警时只需要亮红灯
                 DateTime time = DateTime.Now;
                 DateTime time = DateTime.Now;
                 bool isNeedAlarmLed = false;
                 bool isNeedAlarmLed = false;
+                //bool isTemp30M = false;
                 bool isInOut = false;
                 bool isInOut = false;
-                StoreRunStatus runs = StoreRunStatus.Wait;
+                bool isReset = false;
+                //StoreRunStatus runs = StoreRunStatus.Wait;
 
 
                 foreach (BoxBean box in BoxMap.Values)
                 foreach (BoxBean box in BoxMap.Values)
                 {
                 {
@@ -190,18 +207,31 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         isNeedAlarmLed = true;
                         isNeedAlarmLed = true;
                     }
                     }
+                    if (box.humBean.TempOrHumidityIsAlarm)
+                    {
+                        TimeSpan span = DateTime.Now - box.humBean.TempAlarmTime;
+                        if (span.Minutes > 30)
+                        {
+                            //isTemp30M = true;
+                            isNeedAlarmLed = true;
+                        }
+                    }
                     if (box.MoveInfo.MoveType.Equals(StoreMoveType.InStore) || box.MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
                     if (box.MoveInfo.MoveType.Equals(StoreMoveType.InStore) || box.MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
                     {
                     {
                         isInOut = true;
                         isInOut = true;
                     }
                     }
-                    if (box.storeRunStatus > runs)
+                    if (box.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || box.storeRunStatus.Equals(StoreRunStatus.Reset))
                     {
                     {
-                        runs = box.storeRunStatus;
+                        isReset = true;
                     }
                     }
                 }
                 }
+                if (alarmType.Equals(StoreAlarmType.None).Equals(false) || isNoAirCheck || isInSuddenDown)
+                {
+                    isNeedAlarmLed = true;
+                }
 
 
                 //黄灯
                 //黄灯
-                if (runs.Equals(StoreRunStatus.HomeMoving) || runs.Equals(StoreRunStatus.Reset))
+                if (isReset)
                 {
                 {
                     //开机执行中时黄灯闪烁
                     //开机执行中时黄灯闪烁
                     if (IsDoValue(IO_Type.RunSign_HddLed, IO_VALUE.HIGH))
                     if (IsDoValue(IO_Type.RunSign_HddLed, IO_VALUE.HIGH))
@@ -220,10 +250,7 @@ namespace OnlineStore.DeviceLibrary
                         IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
                         IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
                     }
                     }
                 }
                 }
-                if (alarmType.Equals(StoreAlarmType.None).Equals(false) || isNoAirCheck || isInSuddenDown)
-                {
-                    isNeedAlarmLed = true;
-                }
+
                 //忙碌中，判断是否有移栽在出入库执行，绿灯闪烁
                 //忙碌中，判断是否有移栽在出入库执行，绿灯闪烁
                 if (isInOut)
                 if (isInOut)
                 {
                 {
@@ -252,24 +279,33 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
                         IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
                     }
                     }
+                    if (UseBuzzer)
+                    {
+                        if (IsDoValue(IO_Type.Alarm_Buzzer, IO_VALUE.LOW))
+                        {
+                            IOMove(IO_Type.Alarm_Buzzer, IO_VALUE.HIGH);
+                        }
+                    }
                 }
                 }
                 else if (IsDoValue(IO_Type.Alarm_HddLed, IO_VALUE.HIGH))
                 else if (IsDoValue(IO_Type.Alarm_HddLed, IO_VALUE.HIGH))
                 {
                 {
                     IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
                     IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
                 }
                 }
 
 
+                if ((!UseBuzzer) || (!isNeedAlarmLed))
+                {
+                    if (IsDoValue(IO_Type.Alarm_Buzzer, IO_VALUE.HIGH))
+                    {
+                        IOMove(IO_Type.Alarm_Buzzer, IO_VALUE.LOW);
+                    }
+                }
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
                 LogUtil.error(Name + "灯处理定时器出错：" + ex.ToString());
                 LogUtil.error(Name + "灯处理定时器出错：" + ex.ToString());
             }
             }
             Thread.Sleep(5);
             Thread.Sleep(5);
-        }
-
-        private bool IsDoValue(string ioType, IO_VALUE ioValue)
-        {
-            return IOValue(ioType).Equals(ioValue);
-        }
+        }  
         #endregion 
         #endregion 
 
 
         private IO_VALUE lastAutoRun = IO_VALUE.LOW;
         private IO_VALUE lastAutoRun = IO_VALUE.LOW;
@@ -309,7 +345,7 @@ namespace OnlineStore.DeviceLibrary
         private void AirCheckProcess()
         private void AirCheckProcess()
         {
         {
 
 
-            IO_VALUE currAirValue = IOManager.IOValue(IO_Type.Airpressure_Check);
+            IO_VALUE currAirValue = IOValue(IO_Type.Airpressure_Check);
             if (isInSuddenDown)
             if (isInSuddenDown)
             {
             {
                 return;
                 return;

source/DeviceLibrary/acSingleStore/StoreManager.cs

@@ -24,6 +24,7 @@ namespace OnlineStore.DeviceLibrary
         public static StoreConfig Config = null;
         public static StoreConfig Config = null;
         private static bool isInit = false;
         private static bool isInit = false;
         public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server).Equals("");
         public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server).Equals("");
+        public static Dictionary<int, BaseConfig> allConfigMap = new Dictionary<int, BaseConfig>();
         public StoreManager()
         public StoreManager()
         {
         {
         }
         }
@@ -50,6 +51,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             try
             try
             {
             {
+                allConfigMap = new Dictionary<int, BaseConfig>();
                 BaseConfig.SubDIList = new Dictionary<int, Dictionary<string, ConfigIO>>();
                 BaseConfig.SubDIList = new Dictionary<int, Dictionary<string, ConfigIO>>();
                 BaseConfig.SubDOList = new Dictionary<int, Dictionary<string, ConfigIO>>();
                 BaseConfig.SubDOList = new Dictionary<int, Dictionary<string, ConfigIO>>();
                 BaseConfig.ProIOIpMap = new Dictionary<string, string>();
                 BaseConfig.ProIOIpMap = new Dictionary<string, string>();
@@ -87,6 +89,7 @@ namespace OnlineStore.DeviceLibrary
                         boxConfig.SetIO(0);
                         boxConfig.SetIO(0);
                         boxConfig.SetIO(i);
                         boxConfig.SetIO(i);
                         BoxList.Add(i, boxConfig);
                         BoxList.Add(i, boxConfig);
+                        allConfigMap.Add(i, boxConfig);
                     }
                     }
                     string positionConfigFile = appPath + ConfigAppSettings.GetValue(Setting_Init.Store_Position_Config);
                     string positionConfigFile = appPath + ConfigAppSettings.GetValue(Setting_Init.Store_Position_Config);
                     if (count > 1 || (!File.Exists(positionConfigFile)))
                     if (count > 1 || (!File.Exists(positionConfigFile)))
@@ -171,16 +174,16 @@ namespace OnlineStore.DeviceLibrary
         //    }
         //    }
         //    return Store;
         //    return Store;
         //} 
         //} 
-        public static string GetLocationPosId(int storeId, int width)
+        public static string GetLocationPosId(int deviceID, int width)
         {
         {
-            if (storeId <= 0)
+            if (deviceID <= 0)
             {
             {
                 string config = ConfigAppSettings.GetValue(Setting_Init.Location_PosID_ + width);
                 string config = ConfigAppSettings.GetValue(Setting_Init.Location_PosID_ + width);
                 return config;
                 return config;
             }
             }
             else
             else
             {
             {
-                string config = ConfigAppSettings.GetValue(Setting_Init.Location_PosID_ +storeId+"_"+ width);
+                string config = ConfigAppSettings.GetValue(Setting_Init.Location_PosID_ +deviceID+"_"+ width);
                 return config;
                 return config;
             }
             }
         }
         }
@@ -224,7 +227,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     LogUtil.error("保存配置文件失败：" + configFile);
                     LogUtil.error("保存配置文件失败：" + configFile);
                 }
                 }
-                 
+                allConfigMap[storeConfig.DeviceID] = storeConfig;
                 Store.BoxConfigMap[storeConfig.DeviceID] = storeConfig;
                 Store.BoxConfigMap[storeConfig.DeviceID] = storeConfig;
                 Store.BoxMap[storeConfig.DeviceID].Config = storeConfig;
                 Store.BoxMap[storeConfig.DeviceID].Config = storeConfig;
                 Store.BoxMap[storeConfig.DeviceID].MoveAxisConfig();
                 Store.BoxMap[storeConfig.DeviceID].MoveAxisConfig();

source/DeviceLibrary/lineConnect/LineConnect.cs

@@ -2,7 +2,8 @@
 using OnlineStore.LoadCSVLibrary;
 using OnlineStore.LoadCSVLibrary;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
-using System.Linq; 
+using System.Linq;
+using System.Linq.Expressions;
 using System.Text;
 using System.Text;
 using System.Threading;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
@@ -11,10 +12,28 @@ namespace OnlineStore.DeviceLibrary
 {
 {
     public class LineConnect
     public class LineConnect
     {
     {
-        private static int ClientKeepSecond = 10;
-        private static TcpClient client = null;
-        public static  List<string> WaitInStoreList = new List<string>();
-        public static void StartConnect()
+        public static char cmd_spilt = ';';
+        public static string cmd_heart = "heart";
+        private static string cmd_outend = "outend";
+        private static string cmd_startIn = "starIn";
+        private static string cmd_updateDebug = "updateDebug";
+        public static string cmd_checStartIn = "cmd_checStartIn";
+
+        private int seq = 1;
+        private int ClientKeepSecond = 10;
+        private TcpClient client = null;
+        public List<string> WaitInStoreList = new List<string>();
+
+        private int StoreId = 0;
+        private string CID = "";
+
+        public LineConnect (int sId,string cid)
+        {
+            this.StoreId = sId;
+            this.CID = cid;
+        }
+
+        public void StartConnect()
         {
         {
             Task.Factory.StartNew(delegate
             Task.Factory.StartNew(delegate
             {
             {
@@ -22,7 +41,7 @@ namespace OnlineStore.DeviceLibrary
                 int linePort = ConfigAppSettings.GetIntValue(Setting_Init.LineServerPort);
                 int linePort = ConfigAppSettings.GetIntValue(Setting_Init.LineServerPort);
                 if (lineServer.Equals(""))
                 if (lineServer.Equals(""))
                 {
                 {
-                    LogUtil.error("未配置流水线地址，不需要连接");
+                    LogUtil.error("[" + CID + "]未配置流水线地址，不需要连接");
                     return;
                     return;
                 }
                 }
                 client = new TcpClient();
                 client = new TcpClient();
@@ -31,69 +50,69 @@ namespace OnlineStore.DeviceLibrary
             });
             });
         }
         }
 
 
-        public static void StopConnect()
+        public void StopConnect()
         {
         {
             if (client != null)
             if (client != null)
             {
             {
                 client.close();
                 client.close();
             }
             }
         }
         }
-        private static int seq = 1;
 
 
-        public static int nextSeq()
+        public int nextSeq()
         {
         {
             if (seq.Equals(Int32.MaxValue))
             if (seq.Equals(Int32.MaxValue))
             {
             {
-                LogUtil.info("seq当前值：" + seq + ",重置seq=0");
+                LogUtil.info("[" + CID + "]seq当前值：" + seq + ",重置seq=0");
                 seq = 0;
                 seq = 0;
             }
             }
             Interlocked.Increment(ref seq);
             Interlocked.Increment(ref seq);
             return seq;
             return seq;
         }
         }
 
 
-        public static void SendHeart(StoreSendBean store)
+        public void SendHeart(StoreSendBean store)
         {
         {
             if (client == null)
             if (client == null)
             {
             {
                 return;
                 return;
             }
             }
             try
             try
-            {
-                store.Cmd = cmd_heart; 
+            { 
+                store.Cmd = cmd_heart;
                 string heartMsg = ToParamStr(store);
                 string heartMsg = ToParamStr(store);
-                
+
                 client.send(heartMsg);
                 client.send(heartMsg);
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
             {
-                LogUtil.error("SendHeart 出错：" + ex.ToString());
+                LogUtil.error("["+CID+"]SendHeart 出错：" + ex.ToString());
             }
             }
         }
         }
-        private static  DateTime LastOutStoreEndTime = DateTime.Now;
-        public static void OutStoreEnd(StoreSendBean store)
+        private DateTime LastOutStoreEndTime = DateTime.Now;
+        public void OutStoreEnd(StoreSendBean store)
         {
         {
             if (client == null)
             if (client == null)
             {
             {
                 return;
                 return;
             }
             }
             try
             try
-            {
+            { 
                 LastOutStoreEndTime = DateTime.Now;
                 LastOutStoreEndTime = DateTime.Now;
-                store.Cmd = cmd_outend; 
+                store.Cmd = cmd_outend;
                 string msg = ToParamStr(store);
                 string msg = ToParamStr(store);
-                LogUtil.info("OutStoreEnd：" + msg);
+                LogUtil.info("[" + CID + "]OutStoreEnd：" + msg);
                 client.send(msg);
                 client.send(msg);
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
-                LogUtil.error("OutStoreEnd 出错：" + ex.ToString());
+                LogUtil.error("[" + CID + "]OutStoreEnd 出错：" + ex.ToString());
             }
             }
         }
         }
-        private static string ToParamStr(StoreSendBean store)
+        private string ToParamStr(StoreSendBean store)
         {
         {
-            return JsonHelper.SerializeObject(store)+"\r";
+            return JsonHelper.SerializeObject(store) + "\r";
         }
         }
-         
-        private static void HandlerMsg(string message)
+
+        private void HandlerMsg(string message)
         {
         {
             try
             try
             {
             {
@@ -106,16 +125,16 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 else
                 else
                 {
                 {
-                    string cmd = reviceInfo.Cmd; 
+                    string cmd = reviceInfo.Cmd;
                     CanOutStore = reviceInfo.CanOutStore.Equals(1);
                     CanOutStore = reviceInfo.CanOutStore.Equals(1);
                     LastUpdateTime = DateTime.Now;
                     LastUpdateTime = DateTime.Now;
                     if (cmd.Equals(cmd_startIn))
                     if (cmd.Equals(cmd_startIn))
                     {
                     {
-                        LogUtil.info("收到流水线入库消息：" + message);
+                        LogUtil.info("[" + CID + "]收到流水线入库消息：" + message);
 
 
                         //根据库位判断是哪个料仓
                         //根据库位判断是哪个料仓
-                         
-                        foreach(BoxBean box in StoreManager.Store.BoxMap.Values)
+
+                        foreach (BoxBean box in StoreManager.Store.BoxMap.Values)
                         {
                         {
                             if (box.PositionNumList.Contains(reviceInfo.PosId))
                             if (box.PositionNumList.Contains(reviceInfo.PosId))
                             {
                             {
@@ -129,14 +148,14 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         int isDebug = reviceInfo.IsDebug;
                         int isDebug = reviceInfo.IsDebug;
 
 
-                        LogUtil.info("收到流水线更改调试状态=" + isDebug);
+                        LogUtil.info("[" + CID + "]收到流水线更改调试状态=" + isDebug);
                         StoreManager.Store.IsDebug = isDebug.Equals(1) ? true : false;
                         StoreManager.Store.IsDebug = isDebug.Equals(1) ? true : false;
                         ConfigAppSettings.SaveValue(Setting_Init.IsInDebug, isDebug);
                         ConfigAppSettings.SaveValue(Setting_Init.IsInDebug, isDebug);
-                        LogUtil.info("切换调试状态= " + isDebug + ";");
+                        LogUtil.info("[" + CID + "]切换调试状态= " + isDebug + ";");
                     }
                     }
                     else if (cmd.Equals(cmd_checStartIn))
                     else if (cmd.Equals(cmd_checStartIn))
                     {
                     {
-                        LogUtil.info("收到流水线入库库位验证消息：" + message);
+                        LogUtil.info("[" + CID + "]收到流水线入库库位验证消息：" + message);
                         //if (LineConnect.WaitInStoreList.Contains(reviceInfo.PosId))
                         //if (LineConnect.WaitInStoreList.Contains(reviceInfo.PosId))
                         //{
                         //{
                         //    LogUtil.error(" LineConnect.WaitInStoreList已存在库位【" + reviceInfo.PosId + "】先移除在验证");
                         //    LogUtil.error(" LineConnect.WaitInStoreList已存在库位【" + reviceInfo.PosId + "】先移除在验证");
@@ -149,44 +168,38 @@ namespace OnlineStore.DeviceLibrary
                                 bool result = box.ReviceLineCheckInStoreCMD(reviceInfo.PosId, reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.WareCode, reviceInfo.rfid);
                                 bool result = box.ReviceLineCheckInStoreCMD(reviceInfo.PosId, reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.WareCode, reviceInfo.rfid);
                                 if (result && (!WaitInStoreList.Contains(reviceInfo.PosId)))
                                 if (result && (!WaitInStoreList.Contains(reviceInfo.PosId)))
                                 {
                                 {
-                                    LineConnect.WaitInStoreList.Add(reviceInfo.PosId);
+                                    WaitInStoreList.Add(reviceInfo.PosId);
                                 }
                                 }
                                 break;
                                 break;
                             }
                             }
                         }
                         }
                         //bool result = StoreManager.Store.ReviceLineCheckInStoreCMD(reviceInfo.PosId, reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.WareCode,reviceInfo.rfid);
                         //bool result = StoreManager.Store.ReviceLineCheckInStoreCMD(reviceInfo.PosId, reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.WareCode,reviceInfo.rfid);
-                     
+
                     }
                     }
 
 
                 }
                 }
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
-                LogUtil.error("处理流水线消息【"+ message +"】出错：" +ex.ToString() );
+                LogUtil.error("[" + CID + "]处理流水线消息【" + message + "】出错：" + ex.ToString());
             }
             }
-        } 
-        public static char cmd_spilt = ';';
-        public  static string cmd_heart = "heart";
-        private static string cmd_outend = "outend";
-        private static string cmd_startIn = "starIn";
-        private static string cmd_updateDebug = "updateDebug";
-        private static bool CanOutStore = false;
-        public static DateTime LastUpdateTime = new DateTime(0);
-        public static string cmd_checStartIn = "cmd_checStartIn";
-        public static bool IsConnect()
-        { 
+        }
+        private bool CanOutStore = false;
+        public DateTime LastUpdateTime = new DateTime(0);
+        public bool IsConnect()
+        {
             if (client == null)
             if (client == null)
             {
             {
                 return false;
                 return false;
             }
             }
-            if (client.IsRun()&& client.IsConnected())
+            if (client.IsRun() && client.IsConnected())
             {
             {
                 return true;
                 return true;
             }
             }
-            return false ;
+            return false;
         }
         }
 
 
-        public static bool CanStartOut()
+        public bool CanStartOut()
         {
         {
             TimeSpan span = DateTime.Now - LastUpdateTime;
             TimeSpan span = DateTime.Now - LastUpdateTime;
             if (span.TotalSeconds < ClientKeepSecond && CanOutStore)
             if (span.TotalSeconds < ClientKeepSecond && CanOutStore)
@@ -195,11 +208,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return false;
             return false;
         }
         }
-        /// <summary>
-        /// 是否可以重发消息
-        /// </summary>
-        /// <returns></returns>
-        public  static bool CanReSend()
+        public bool CanReSend()
         {
         {
             TimeSpan span = DateTime.Now - LastOutStoreEndTime;
             TimeSpan span = DateTime.Now - LastOutStoreEndTime;
             if (span.TotalSeconds > 8)
             if (span.TotalSeconds > 8)
@@ -208,6 +217,18 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return false;
             return false;
         }
         }
+
+
+        public StoreSendBean GetBean(int ss, int runs, int doorHasTray, int alarmType)
+        {
+            StoreSendBean bean = new StoreSendBean(ss, runs, doorHasTray, alarmType);
+            bean.StoreId = StoreId;
+            bean.Cid = CID;
+
+            bean.Seq = nextSeq();
+            bean.WaitInStoreList = new List<string>(WaitInStoreList);
+            return bean; 
+        }
     }
     }
     public class StoreReviceBean
     public class StoreReviceBean
     {
     {
@@ -222,21 +243,23 @@ namespace OnlineStore.DeviceLibrary
     }
     }
     public class StoreSendBean
     public class StoreSendBean
     {
     {
-        public StoreSendBean(int id, string cid, int ss, int runs, int doorHasTray, int alarmType)
+        public StoreSendBean(int ss, int runs, int doorHasTray, int alarmType)
         {
         {
-            this.StoreId = id;
-            this.Cid = cid;
+            this.StoreId = 0;
+            this.Cid = "";
             this.SStatus = ss;
             this.SStatus = ss;
             this.SRunStatus = runs;
             this.SRunStatus = runs;
             this.DoorHasTray = doorHasTray;
             this.DoorHasTray = doorHasTray;
             this.AlarmType = alarmType;
             this.AlarmType = alarmType;
-            this.Seq = LineConnect.nextSeq();
-            this.WaitInStoreList = new List<string>(LineConnect.WaitInStoreList);
+            //this.Seq = LineConnect.nextSeq();
+            //this.WaitInStoreList = new List<string>(LineConnect.WaitInStoreList);
+            this.Seq = 0;
+            this.WaitInStoreList = new List<string>();
             this.data = new Dictionary<string, string>();
             this.data = new Dictionary<string, string>();
-          //  WaitInStoreList.Add("1#AC1_1_1");
+            //  WaitInStoreList.Add("1#AC1_1_1");
 
 
         }
         }
-        public string Cmd =LineConnect. cmd_heart;
+        public string Cmd = LineConnect.cmd_heart;
         public int StoreId = 0;
         public int StoreId = 0;
         public string Cid = "";
         public string Cid = "";
         public int Seq = 0;
         public int Seq = 0;
@@ -248,33 +271,6 @@ namespace OnlineStore.DeviceLibrary
         public List<string> WaitInStoreList = new List<string>();
         public List<string> WaitInStoreList = new List<string>();
         public Dictionary<string, string> data = new Dictionary<string, string>();
         public Dictionary<string, string> data = new Dictionary<string, string>();
 
 
-        //public string PosId = "";
-        //public string PlateH = "0";
-        //public string PlateW = "0";
-        ///// <summary>
-        ///// urgentReel: true 表示紧急料,需要出到料串上
-        ///// </summary>
-        //public bool urgentReel = false;
-        ///// <summary>
-        ///// cutReel: true 表示分盘料,需要出到料串上
-        ///// </summary>
-        //public bool cutReel = false;
-        ///// <summary>
-        ///// smallReel: true  小料(7x8),放置到小料架上
-        ///// </summary>
-        //public bool smallReel = false;
-
-        ///// <summary>
-        ///// rfid: 分配的料架RFID
-        ///// </summary>
-        //public string rfid = "";
-        ///// <summary>
-        ///// rfidLoc: 料架的架位,值为 - 1时,可以自由分配皮带线, 
-        ///// 小料时,架位为1 - 46优先走1 / 2号皮带线,47 - 92优先走3 / 4号皮带线, 
-        ///// 70,71,72时只能分配到3 / 4号皮带线; 
-        ///// 大料时,架位1 - 6优先走1 / 2号皮带线, 7 - 12优先走3/ 4号皮带线
-        ///// </summary>
-        //public int rfidLoc = 0;
 
 
     }
     }
 }
 }

source/DeviceLibrary/store/KTK_Store.cs

@@ -423,23 +423,17 @@ namespace OnlineStore.DeviceLibrary
 
 
         public void IOMove(string IoType, IO_VALUE value)
         public void IOMove(string IoType, IO_VALUE value)
         {
         {
-            //IOManager.IOMove(IoType, value, baseConfig.DeviceID);
+            IOManager.IOMove(IoType, value, baseConfig.DeviceID);
         }
         }
         public IO_VALUE IOValue(string IoType)
         public IO_VALUE IOValue(string IoType)
         {
         {
-            //return IOManager.IOValue(IoType, baseConfig.DeviceID);
-            return IO_VALUE.LOW;
+             return IOManager.IOValue(IoType, baseConfig.DeviceID); 
         }
         }
-        /// <summary>
-        /// 阻塞等待IO信号，等到返回true,未等到返回false
-        /// </summary>c
-        protected bool WaitIo(string ioType, IO_VALUE value, int timeOut, string errName = "")
+
+        public  bool IsDoValue(string ioType, IO_VALUE ioValue)
         {
         {
-            //return WaitUtil.Wait(timeOut, delegate () {
-            //    return value.Equals(IOValue(ioType));
-            //}, errName);
-            return false;
-        }
+            return IOValue(ioType).Equals(ioValue);
+        } 
         public void LogInfo(string logInfo)
         public void LogInfo(string logInfo)
         {
         {
             LogUtil.info(Name + logInfo);
             LogUtil.info(Name + logInfo);

source/HCSingleStore/App.config

@@ -6,7 +6,6 @@
   <appSettings>
   <appSettings>
     <!--是否开机自动启动料仓-->
     <!--是否开机自动启动料仓-->
     <add key="App_AutoRun" value="1" />
     <add key="App_AutoRun" value="1" />
-    <add key="App_Title" value="AC_SA_料仓_左侧" />
     <!--   开始吹气的判断值（配置值=服务器发送的湿度值-开始吹气值）-->
     <!--   开始吹气的判断值（配置值=服务器发送的湿度值-开始吹气值）-->
     <add key="StartBlowValue" value="4" />
     <add key="StartBlowValue" value="4" />
     <!--   停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）-->
     <!--   停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）-->
@@ -20,7 +19,7 @@
     <add key="Store_ConfigPath" value="\StoreConfig\AC\StoreConfig.csv" />
     <add key="Store_ConfigPath" value="\StoreConfig\AC\StoreConfig.csv" />
     <add key="Box_ConfigPath" value="\StoreConfig\AC\BoxConfig.csv" />
     <add key="Box_ConfigPath" value="\StoreConfig\AC\BoxConfig.csv" />
     <add key="Store_Type" value="RC_AC_SA" />
     <add key="Store_Type" value="RC_AC_SA" />
-    <add key="Store_CID" value="line-ac1" />
+    <add key="Store_CID" value="D1" />
     <add key="Store_CID_1" value="line-ac-01" />
     <add key="Store_CID_1" value="line-ac-01" />
     <add key="Store_CID_2" value="line-ac-02" />
     <add key="Store_CID_2" value="line-ac-02" />
     <add key="Store_ID" value="7" />
     <add key="Store_ID" value="7" />

source/HCSingleStore/FormManager.cs

-using OnlineStore.DeviceLibrary;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace OnlineStore.ACSingleStore
-{
-   public class FormManager
-    {
-
-
-        //#03A9F4
-        //public static Color buttonColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-        //public static Color buttonColor = System.Drawing.SystemColors.ActiveCaption;
-        //public static Color buttonColor = System.Drawing.Color.FromArgb(((int)((0x00))), ((int)((0x66))), ((int)(0xFF)));
-        //private static string skinFileName = Application.StartupPath + @"\Skins\Wave.ssk";
-        //private static string skinFileName = Application.StartupPath + @"\Skins\DiamondBlue.ssk";
-
-        //public static string SkinFileName
-        //{
-        //    set
-        //    {
-        //    }
-        //    get
-        //    {
-        //        if (SkinsList.Count <= 0)
-        //        {
-        //            SkinsList = GetSkinList();
-        //        }
-        //        if (SkinsList.Count > 0 && index >= 0)
-        //        {
-        //            return SkinsList[index];
-        //        }
-        //        return skinFileName;
-        //    }
-        //}
-        //private static int index = -1;
-        //public static void DefaultSkin()
-        //{
-        //    index = -1;
-        //}
-        //public static void NextSkin()
-        //{
-        //    index++;
-        //    if (index >= SkinsList.Count)
-        //    {
-        //        index = 0;
-        //    }
-        //}
-        //public static List<string> SkinsList = new List<string>();
-        //private static List<string> GetSkinList()
-        //{
-        //    List<string> returnList = new System.Collections.Generic.List<string>();
-        //    string[] fileList = Directory.GetFiles(Application.StartupPath + @"\Skins");
-        //    foreach (string sr in fileList)
-        //    {
-        //        if (sr.Contains(".ssk"))
-        //        {
-        //            returnList.Add(sr);
-        //        }
-        //    }
-        //    return returnList;
-        //}
-         
-
-        private static FrmAxisDebug debug = null;
-        public static void ShowAxisDebug(BoxBean store)
-        {
-            if (debug == null)
-            {
-                debug = new FrmAxisDebug(store);
-                debug.Show();
-            }
-            else
-            { 
-                if (debug.IsDisposed)
-                {
-                    debug = new FrmAxisDebug(store);
-                    debug.Show();
-                }
-                else
-                {
-                    debug.Activate();
-                }
-            }
-        }
-        private static FrmIOStatus frmIo = null;
-        public static void ShowIOShow(BoxBean store)
-        {
-            if (frmIo == null)
-            {
-                frmIo = new FrmIOStatus(store);
-                frmIo.Show();
-            }
-            else
-            {
-                if (frmIo.IsDisposed)
-                {
-                    frmIo = new FrmIOStatus(store);
-                    frmIo.Show();
-                }
-                else
-                {
-                    frmIo.Activate();
-                }
-            }
-        }
-    }
-}

source/HCSingleStore/FrmBox.Designer.cs

@@ -26,8 +26,6 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBox));
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBox));
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.chbDebug = new System.Windows.Forms.CheckBox();
             this.chbDebug = new System.Windows.Forms.CheckBox();
-            this.btnStoreHome = new System.Windows.Forms.Button();
-            this.btnSotreReset = new System.Windows.Forms.Button();
             this.btnStoreStop = new System.Windows.Forms.Button();
             this.btnStoreStop = new System.Windows.Forms.Button();
             this.btnStoreStart = new System.Windows.Forms.Button();
             this.btnStoreStart = new System.Windows.Forms.Button();
             this.btnUpdown = new System.Windows.Forms.Button();
             this.btnUpdown = new System.Windows.Forms.Button();
@@ -35,16 +33,30 @@
             this.btnAxisOn = new System.Windows.Forms.Button();
             this.btnAxisOn = new System.Windows.Forms.Button();
             this.btnAxisP = new System.Windows.Forms.Button();
             this.btnAxisP = new System.Windows.Forms.Button();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabControl1 = new System.Windows.Forms.TabControl();
-            this.tabPage4 = new System.Windows.Forms.TabPage();
             this.tabPage3 = new System.Windows.Forms.TabPage();
             this.tabPage3 = new System.Windows.Forms.TabPage();
-            this.groupInout = new System.Windows.Forms.GroupBox();
             this.btnStartAutoCheck = new System.Windows.Forms.Button();
             this.btnStartAutoCheck = new System.Windows.Forms.Button();
-            this.btnCheckPos = new System.Windows.Forms.Button();
+            this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.btnOpenDo = new System.Windows.Forms.Button();
+            this.btnCloseDO = new System.Windows.Forms.Button();
+            this.txtDOIndex = new System.Windows.Forms.TextBox();
+            this.txtDoName = new System.Windows.Forms.TextBox();
+            this.btnOpenDoor = new System.Windows.Forms.Button();
+            this.label17 = new System.Windows.Forms.Label();
+            this.btnCloseDoor = new System.Windows.Forms.Button();
+            this.label14 = new System.Windows.Forms.Label();
+            this.txtWriteTime = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.cmbWriteIO = new System.Windows.Forms.ComboBox();
+            this.groupBox5 = new System.Windows.Forms.GroupBox();
+            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
             this.lblTemp = new System.Windows.Forms.Label();
             this.lblTemp = new System.Windows.Forms.Label();
-            this.lblMsg = new System.Windows.Forms.Label();
-            this.btnSavePosition = new System.Windows.Forms.Button();
+            this.groupBox6 = new System.Windows.Forms.GroupBox();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.groupInout = new System.Windows.Forms.GroupBox();
+            this.lblAutoMsg = new System.Windows.Forms.Label();
             this.btnStartAuTo = new System.Windows.Forms.Button();
             this.btnStartAuTo = new System.Windows.Forms.Button();
             this.label9 = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
+            this.btnSavePosition = new System.Windows.Forms.Button();
             this.txtJiange = new System.Windows.Forms.TextBox();
             this.txtJiange = new System.Windows.Forms.TextBox();
             this.txtComP1 = new System.Windows.Forms.TextBox();
             this.txtComP1 = new System.Windows.Forms.TextBox();
             this.txtInOutP2 = new System.Windows.Forms.TextBox();
             this.txtInOutP2 = new System.Windows.Forms.TextBox();
@@ -61,7 +73,6 @@
             this.txtUpDownP5 = new System.Windows.Forms.TextBox();
             this.txtUpDownP5 = new System.Windows.Forms.TextBox();
             this.txtUpDownP6 = new System.Windows.Forms.TextBox();
             this.txtUpDownP6 = new System.Windows.Forms.TextBox();
             this.cmbPosition = new System.Windows.Forms.ComboBox();
             this.cmbPosition = new System.Windows.Forms.ComboBox();
-            this.label21 = new System.Windows.Forms.Label();
             this.txtUpDownP3 = new System.Windows.Forms.TextBox();
             this.txtUpDownP3 = new System.Windows.Forms.TextBox();
             this.btnInStore = new System.Windows.Forms.Button();
             this.btnInStore = new System.Windows.Forms.Button();
             this.btnOutStore = new System.Windows.Forms.Button();
             this.btnOutStore = new System.Windows.Forms.Button();
@@ -82,6 +93,7 @@
             this.btnUpDownP6 = new System.Windows.Forms.Button();
             this.btnUpDownP6 = new System.Windows.Forms.Button();
             this.btnUpDownP3 = new System.Windows.Forms.Button();
             this.btnUpDownP3 = new System.Windows.Forms.Button();
             this.btnUpDownP4 = new System.Windows.Forms.Button();
             this.btnUpDownP4 = new System.Windows.Forms.Button();
+            this.btnCheckPos = new System.Windows.Forms.Button();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.button6 = new System.Windows.Forms.Button();
             this.button6 = new System.Windows.Forms.Button();
@@ -115,6 +127,9 @@
             this.lblThisSta = new System.Windows.Forms.Label();
             this.lblThisSta = new System.Windows.Forms.Label();
             this.tabControl1.SuspendLayout();
             this.tabControl1.SuspendLayout();
             this.tabPage3.SuspendLayout();
             this.tabPage3.SuspendLayout();
+            this.groupBox4.SuspendLayout();
+            this.groupBox5.SuspendLayout();
+            this.groupBox6.SuspendLayout();
             this.groupInout.SuspendLayout();
             this.groupInout.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox2.SuspendLayout();
@@ -132,7 +147,7 @@
             this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.chbDebug.AutoSize = true;
             this.chbDebug.AutoSize = true;
             this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbDebug.Location = new System.Drawing.Point(911, 31);
+            this.chbDebug.Location = new System.Drawing.Point(14, 83);
             this.chbDebug.Name = "chbDebug";
             this.chbDebug.Name = "chbDebug";
             this.chbDebug.Size = new System.Drawing.Size(93, 25);
             this.chbDebug.Size = new System.Drawing.Size(93, 25);
             this.chbDebug.TabIndex = 271;
             this.chbDebug.TabIndex = 271;
@@ -140,28 +155,6 @@
             this.chbDebug.UseVisualStyleBackColor = true;
             this.chbDebug.UseVisualStyleBackColor = true;
             this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
             this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
             // 
             // 
-            // btnStoreHome
-            // 
-            this.btnStoreHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStoreHome.Location = new System.Drawing.Point(361, 24);
-            this.btnStoreHome.Name = "btnStoreHome";
-            this.btnStoreHome.Size = new System.Drawing.Size(116, 39);
-            this.btnStoreHome.TabIndex = 3;
-            this.btnStoreHome.Text = "回待机位";
-            this.btnStoreHome.UseVisualStyleBackColor = true;
-            this.btnStoreHome.Click += new System.EventHandler(this.回待机点ToolStripMenuItem_Click);
-            // 
-            // btnSotreReset
-            // 
-            this.btnSotreReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnSotreReset.Location = new System.Drawing.Point(244, 24);
-            this.btnSotreReset.Name = "btnSotreReset";
-            this.btnSotreReset.Size = new System.Drawing.Size(116, 39);
-            this.btnSotreReset.TabIndex = 2;
-            this.btnSotreReset.Text = "复位";
-            this.btnSotreReset.UseVisualStyleBackColor = true;
-            this.btnSotreReset.Click += new System.EventHandler(this.复位ToolStripMenuItem_Click);
-            // 
             // btnStoreStop
             // btnStoreStop
             // 
             // 
             this.btnStoreStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnStoreStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
@@ -182,12 +175,12 @@
             this.btnStoreStart.TabIndex = 0;
             this.btnStoreStart.TabIndex = 0;
             this.btnStoreStart.Text = "启动调试";
             this.btnStoreStart.Text = "启动调试";
             this.btnStoreStart.UseVisualStyleBackColor = true;
             this.btnStoreStart.UseVisualStyleBackColor = true;
-            this.btnStoreStart.Click += new System.EventHandler(this.启动ToolStripMenuItem_Click);
+            this.btnStoreStart.Click += new System.EventHandler(this.btnStoreStart_Click);
             // 
             // 
             // btnUpdown
             // btnUpdown
             // 
             // 
             this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnUpdown.Location = new System.Drawing.Point(588, 287);
+            this.btnUpdown.Location = new System.Drawing.Point(591, 305);
             this.btnUpdown.Name = "btnUpdown";
             this.btnUpdown.Name = "btnUpdown";
             this.btnUpdown.Size = new System.Drawing.Size(118, 39);
             this.btnUpdown.Size = new System.Drawing.Size(118, 39);
             this.btnUpdown.TabIndex = 14;
             this.btnUpdown.TabIndex = 14;
@@ -198,29 +191,29 @@
             // btnAxisOff
             // btnAxisOff
             // 
             // 
             this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnAxisOff.Location = new System.Drawing.Point(717, 242);
+            this.btnAxisOff.Location = new System.Drawing.Point(720, 246);
             this.btnAxisOff.Name = "btnAxisOff";
             this.btnAxisOff.Name = "btnAxisOff";
             this.btnAxisOff.Size = new System.Drawing.Size(116, 39);
             this.btnAxisOff.Size = new System.Drawing.Size(116, 39);
             this.btnAxisOff.TabIndex = 11;
             this.btnAxisOff.TabIndex = 11;
-            this.btnAxisOff.Text = "料仓运转OFF";
+            this.btnAxisOff.Text = "关闭所有伺服";
             this.btnAxisOff.UseVisualStyleBackColor = true;
             this.btnAxisOff.UseVisualStyleBackColor = true;
             this.btnAxisOff.Click += new System.EventHandler(this.料仓运转OFFToolStripMenuItem_Click);
             this.btnAxisOff.Click += new System.EventHandler(this.料仓运转OFFToolStripMenuItem_Click);
             // 
             // 
             // btnAxisOn
             // btnAxisOn
             // 
             // 
             this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnAxisOn.Location = new System.Drawing.Point(588, 242);
+            this.btnAxisOn.Location = new System.Drawing.Point(591, 246);
             this.btnAxisOn.Name = "btnAxisOn";
             this.btnAxisOn.Name = "btnAxisOn";
             this.btnAxisOn.Size = new System.Drawing.Size(116, 39);
             this.btnAxisOn.Size = new System.Drawing.Size(116, 39);
             this.btnAxisOn.TabIndex = 10;
             this.btnAxisOn.TabIndex = 10;
-            this.btnAxisOn.Text = "料仓运转ON";
+            this.btnAxisOn.Text = "打开所有伺服";
             this.btnAxisOn.UseVisualStyleBackColor = true;
             this.btnAxisOn.UseVisualStyleBackColor = true;
             this.btnAxisOn.Click += new System.EventHandler(this.料仓运转ONToolStripMenuItem_Click);
             this.btnAxisOn.Click += new System.EventHandler(this.料仓运转ONToolStripMenuItem_Click);
             // 
             // 
             // btnAxisP
             // btnAxisP
             // 
             // 
             this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnAxisP.Location = new System.Drawing.Point(717, 287);
+            this.btnAxisP.Location = new System.Drawing.Point(720, 305);
             this.btnAxisP.Name = "btnAxisP";
             this.btnAxisP.Name = "btnAxisP";
             this.btnAxisP.Size = new System.Drawing.Size(116, 39);
             this.btnAxisP.Size = new System.Drawing.Size(116, 39);
             this.btnAxisP.TabIndex = 8;
             this.btnAxisP.TabIndex = 8;
@@ -233,46 +226,269 @@
             this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.tabControl1.Controls.Add(this.tabPage4);
             this.tabControl1.Controls.Add(this.tabPage3);
             this.tabControl1.Controls.Add(this.tabPage3);
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage1);
-            this.tabControl1.Location = new System.Drawing.Point(4, 145);
+            this.tabControl1.Location = new System.Drawing.Point(4, 129);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1083, 505);
+            this.tabControl1.Size = new System.Drawing.Size(1083, 518);
             this.tabControl1.TabIndex = 272;
             this.tabControl1.TabIndex = 272;
             // 
             // 
-            // tabPage4
-            // 
-            this.tabPage4.Location = new System.Drawing.Point(4, 29);
-            this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Size = new System.Drawing.Size(1075, 472);
-            this.tabPage4.TabIndex = 3;
-            this.tabPage4.Text = "  IO状态查看  ";
-            this.tabPage4.UseVisualStyleBackColor = true;
-            // 
             // tabPage3
             // tabPage3
             // 
             // 
+            this.tabPage3.Controls.Add(this.btnStartAutoCheck);
+            this.tabPage3.Controls.Add(this.groupBox4);
+            this.tabPage3.Controls.Add(this.groupBox5);
+            this.tabPage3.Controls.Add(this.lblTemp);
+            this.tabPage3.Controls.Add(this.groupBox6);
             this.tabPage3.Controls.Add(this.groupInout);
             this.tabPage3.Controls.Add(this.groupInout);
+            this.tabPage3.Controls.Add(this.btnCheckPos);
             this.tabPage3.Location = new System.Drawing.Point(4, 29);
             this.tabPage3.Location = new System.Drawing.Point(4, 29);
             this.tabPage3.Name = "tabPage3";
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(1075, 472);
+            this.tabPage3.Size = new System.Drawing.Size(1075, 485);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.TabIndex = 2;
-            this.tabPage3.Text = "  库位位置配置  ";
+            this.tabPage3.Text = "  库位操作   ";
             this.tabPage3.UseVisualStyleBackColor = true;
             this.tabPage3.UseVisualStyleBackColor = true;
             // 
             // 
+            // btnStartAutoCheck
+            // 
+            this.btnStartAutoCheck.BackColor = System.Drawing.SystemColors.Control;
+            this.btnStartAutoCheck.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnStartAutoCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnStartAutoCheck.Location = new System.Drawing.Point(652, 414);
+            this.btnStartAutoCheck.Name = "btnStartAutoCheck";
+            this.btnStartAutoCheck.Size = new System.Drawing.Size(105, 35);
+            this.btnStartAutoCheck.TabIndex = 274;
+            this.btnStartAutoCheck.Text = "开始自动盘点";
+            this.btnStartAutoCheck.UseVisualStyleBackColor = false;
+            this.btnStartAutoCheck.Click += new System.EventHandler(this.button1_Click_1);
+            // 
+            // groupBox4
+            // 
+            this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.groupBox4.Controls.Add(this.btnOpenDo);
+            this.groupBox4.Controls.Add(this.btnCloseDO);
+            this.groupBox4.Controls.Add(this.txtDOIndex);
+            this.groupBox4.Controls.Add(this.txtDoName);
+            this.groupBox4.Controls.Add(this.btnOpenDoor);
+            this.groupBox4.Controls.Add(this.label17);
+            this.groupBox4.Controls.Add(this.btnCloseDoor);
+            this.groupBox4.Controls.Add(this.label14);
+            this.groupBox4.Controls.Add(this.txtWriteTime);
+            this.groupBox4.Controls.Add(this.label5);
+            this.groupBox4.Controls.Add(this.cmbWriteIO);
+            this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBox4.Location = new System.Drawing.Point(532, 252);
+            this.groupBox4.Name = "groupBox4";
+            this.groupBox4.Size = new System.Drawing.Size(472, 138);
+            this.groupBox4.TabIndex = 108;
+            this.groupBox4.TabStop = false;
+            this.groupBox4.Text = "DO写入";
+            // 
+            // btnOpenDo
+            // 
+            this.btnOpenDo.BackColor = System.Drawing.Color.White;
+            this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnOpenDo.Location = new System.Drawing.Point(124, 88);
+            this.btnOpenDo.Name = "btnOpenDo";
+            this.btnOpenDo.Size = new System.Drawing.Size(91, 35);
+            this.btnOpenDo.TabIndex = 274;
+            this.btnOpenDo.Text = "打开";
+            this.btnOpenDo.UseVisualStyleBackColor = false;
+            this.btnOpenDo.Click += new System.EventHandler(this.btnOpenDo_Click);
+            // 
+            // btnCloseDO
+            // 
+            this.btnCloseDO.BackColor = System.Drawing.Color.White;
+            this.btnCloseDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnCloseDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnCloseDO.Location = new System.Drawing.Point(221, 88);
+            this.btnCloseDO.Name = "btnCloseDO";
+            this.btnCloseDO.Size = new System.Drawing.Size(91, 35);
+            this.btnCloseDO.TabIndex = 273;
+            this.btnCloseDO.Text = "关闭";
+            this.btnCloseDO.UseVisualStyleBackColor = false;
+            this.btnCloseDO.Click += new System.EventHandler(this.btnCloseDO_Click);
+            // 
+            // txtDOIndex
+            // 
+            this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtDOIndex.Location = new System.Drawing.Point(266, 55);
+            this.txtDOIndex.MaxLength = 10;
+            this.txtDOIndex.Name = "txtDOIndex";
+            this.txtDOIndex.Size = new System.Drawing.Size(46, 26);
+            this.txtDOIndex.TabIndex = 242;
+            this.txtDOIndex.Text = "0";
+            // 
+            // txtDoName
+            // 
+            this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtDoName.Location = new System.Drawing.Point(66, 56);
+            this.txtDoName.MaxLength = 10;
+            this.txtDoName.Name = "txtDoName";
+            this.txtDoName.Size = new System.Drawing.Size(141, 26);
+            this.txtDoName.TabIndex = 241;
+            this.txtDoName.Text = "0";
+            // 
+            // btnOpenDoor
+            // 
+            this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnOpenDoor.Location = new System.Drawing.Point(348, 52);
+            this.btnOpenDoor.Name = "btnOpenDoor";
+            this.btnOpenDoor.Size = new System.Drawing.Size(105, 35);
+            this.btnOpenDoor.TabIndex = 248;
+            this.btnOpenDoor.Text = "打开仓门";
+            this.btnOpenDoor.UseVisualStyleBackColor = true;
+            // 
+            // label17
+            // 
+            this.label17.AutoSize = true;
+            this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label17.Location = new System.Drawing.Point(19, 61);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(35, 17);
+            this.label17.TabIndex = 240;
+            this.label17.Text = "设备:";
+            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // btnCloseDoor
+            // 
+            this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnCloseDoor.Location = new System.Drawing.Point(348, 92);
+            this.btnCloseDoor.Name = "btnCloseDoor";
+            this.btnCloseDoor.Size = new System.Drawing.Size(105, 35);
+            this.btnCloseDoor.TabIndex = 249;
+            this.btnCloseDoor.Text = "关闭仓门";
+            this.btnCloseDoor.UseVisualStyleBackColor = true;
+            // 
+            // label14
+            // 
+            this.label14.AutoSize = true;
+            this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label14.Location = new System.Drawing.Point(219, 61);
+            this.label14.Name = "label14";
+            this.label14.Size = new System.Drawing.Size(35, 17);
+            this.label14.TabIndex = 239;
+            this.label14.Text = "地址:";
+            this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // txtWriteTime
+            // 
+            this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtWriteTime.Location = new System.Drawing.Point(70, 92);
+            this.txtWriteTime.MaxLength = 10;
+            this.txtWriteTime.Name = "txtWriteTime";
+            this.txtWriteTime.Size = new System.Drawing.Size(50, 26);
+            this.txtWriteTime.TabIndex = 238;
+            this.txtWriteTime.Text = "0";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.label5.Location = new System.Drawing.Point(6, 97);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(60, 17);
+            this.label5.TabIndex = 237;
+            this.label5.Text = "定时(ms):";
+            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // cmbWriteIO
+            // 
+            this.cmbWriteIO.DisplayMember = "ProName";
+            this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cmbWriteIO.FormattingEnabled = true;
+            this.cmbWriteIO.Location = new System.Drawing.Point(14, 22);
+            this.cmbWriteIO.Name = "cmbWriteIO";
+            this.cmbWriteIO.Size = new System.Drawing.Size(298, 28);
+            this.cmbWriteIO.TabIndex = 234;
+            this.cmbWriteIO.ValueMember = "ProName";
+            this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged);
+            // 
+            // groupBox5
+            // 
+            this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.groupBox5.Controls.Add(this.tableLayoutPanel2);
+            this.groupBox5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBox5.Location = new System.Drawing.Point(775, 3);
+            this.groupBox5.Name = "groupBox5";
+            this.groupBox5.Size = new System.Drawing.Size(229, 242);
+            this.groupBox5.TabIndex = 107;
+            this.groupBox5.TabStop = false;
+            this.groupBox5.Text = "DO列表";
+            // 
+            // tableLayoutPanel2
+            // 
+            this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tableLayoutPanel2.ColumnCount = 1;
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
+            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
+            this.tableLayoutPanel2.RowCount = 2;
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(218, 222);
+            this.tableLayoutPanel2.TabIndex = 103;
+            // 
+            // lblTemp
+            // 
+            this.lblTemp.AutoSize = true;
+            this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblTemp.ForeColor = System.Drawing.Color.Black;
+            this.lblTemp.Location = new System.Drawing.Point(805, 424);
+            this.lblTemp.Name = "lblTemp";
+            this.lblTemp.Size = new System.Drawing.Size(159, 20);
+            this.lblTemp.TabIndex = 270;
+            this.lblTemp.Text = "当前温度--，当前湿度--";
+            // 
+            // groupBox6
+            // 
+            this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.groupBox6.Controls.Add(this.tableLayoutPanel1);
+            this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBox6.Location = new System.Drawing.Point(532, 3);
+            this.groupBox6.Name = "groupBox6";
+            this.groupBox6.Size = new System.Drawing.Size(229, 242);
+            this.groupBox6.TabIndex = 106;
+            this.groupBox6.TabStop = false;
+            this.groupBox6.Text = "DI列表";
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tableLayoutPanel1.ColumnCount = 1;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 2;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 222);
+            this.tableLayoutPanel1.TabIndex = 102;
+            // 
             // groupInout
             // groupInout
             // 
             // 
             this.groupInout.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             this.groupInout.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupInout.Controls.Add(this.btnStartAutoCheck);
-            this.groupInout.Controls.Add(this.btnCheckPos);
-            this.groupInout.Controls.Add(this.lblTemp);
-            this.groupInout.Controls.Add(this.lblMsg);
-            this.groupInout.Controls.Add(this.btnSavePosition);
+            this.groupInout.Controls.Add(this.lblAutoMsg);
             this.groupInout.Controls.Add(this.btnStartAuTo);
             this.groupInout.Controls.Add(this.btnStartAuTo);
             this.groupInout.Controls.Add(this.label9);
             this.groupInout.Controls.Add(this.label9);
+            this.groupInout.Controls.Add(this.btnSavePosition);
             this.groupInout.Controls.Add(this.txtJiange);
             this.groupInout.Controls.Add(this.txtJiange);
             this.groupInout.Controls.Add(this.txtComP1);
             this.groupInout.Controls.Add(this.txtComP1);
             this.groupInout.Controls.Add(this.txtInOutP2);
             this.groupInout.Controls.Add(this.txtInOutP2);
@@ -289,7 +505,6 @@
             this.groupInout.Controls.Add(this.txtUpDownP5);
             this.groupInout.Controls.Add(this.txtUpDownP5);
             this.groupInout.Controls.Add(this.txtUpDownP6);
             this.groupInout.Controls.Add(this.txtUpDownP6);
             this.groupInout.Controls.Add(this.cmbPosition);
             this.groupInout.Controls.Add(this.cmbPosition);
-            this.groupInout.Controls.Add(this.label21);
             this.groupInout.Controls.Add(this.txtUpDownP3);
             this.groupInout.Controls.Add(this.txtUpDownP3);
             this.groupInout.Controls.Add(this.btnInStore);
             this.groupInout.Controls.Add(this.btnInStore);
             this.groupInout.Controls.Add(this.btnOutStore);
             this.groupInout.Controls.Add(this.btnOutStore);
@@ -313,78 +528,28 @@
             this.groupInout.Enabled = false;
             this.groupInout.Enabled = false;
             this.groupInout.Location = new System.Drawing.Point(3, 3);
             this.groupInout.Location = new System.Drawing.Point(3, 3);
             this.groupInout.Name = "groupInout";
             this.groupInout.Name = "groupInout";
-            this.groupInout.Size = new System.Drawing.Size(1065, 413);
+            this.groupInout.Size = new System.Drawing.Size(514, 465);
             this.groupInout.TabIndex = 100;
             this.groupInout.TabIndex = 100;
             this.groupInout.TabStop = false;
             this.groupInout.TabStop = false;
             this.groupInout.Text = "料仓操作";
             this.groupInout.Text = "料仓操作";
             // 
             // 
-            // btnStartAutoCheck
-            // 
-            this.btnStartAutoCheck.BackColor = System.Drawing.SystemColors.Control;
-            this.btnStartAutoCheck.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStartAutoCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStartAutoCheck.Location = new System.Drawing.Point(641, 18);
-            this.btnStartAutoCheck.Name = "btnStartAutoCheck";
-            this.btnStartAutoCheck.Size = new System.Drawing.Size(105, 38);
-            this.btnStartAutoCheck.TabIndex = 274;
-            this.btnStartAutoCheck.Text = "开始自动盘点";
-            this.btnStartAutoCheck.UseVisualStyleBackColor = false;
-            this.btnStartAutoCheck.Click += new System.EventHandler(this.button1_Click_1);
+            // lblAutoMsg
             // 
             // 
-            // btnCheckPos
-            // 
-            this.btnCheckPos.BackColor = System.Drawing.SystemColors.Control;
-            this.btnCheckPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnCheckPos.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCheckPos.Location = new System.Drawing.Point(533, 18);
-            this.btnCheckPos.Name = "btnCheckPos";
-            this.btnCheckPos.Size = new System.Drawing.Size(105, 38);
-            this.btnCheckPos.TabIndex = 273;
-            this.btnCheckPos.Text = "盘点测试";
-            this.btnCheckPos.UseVisualStyleBackColor = false;
-            this.btnCheckPos.Click += new System.EventHandler(this.btnCheckPos_Click);
-            // 
-            // lblTemp
-            // 
-            this.lblTemp.AutoSize = true;
-            this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblTemp.ForeColor = System.Drawing.Color.Black;
-            this.lblTemp.Location = new System.Drawing.Point(802, 31);
-            this.lblTemp.Name = "lblTemp";
-            this.lblTemp.Size = new System.Drawing.Size(159, 20);
-            this.lblTemp.TabIndex = 270;
-            this.lblTemp.Text = "当前温度--，当前湿度--";
-            // 
-            // lblMsg
-            // 
-            this.lblMsg.AutoSize = true;
-            this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblMsg.ForeColor = System.Drawing.Color.Green;
-            this.lblMsg.Location = new System.Drawing.Point(210, 70);
-            this.lblMsg.Name = "lblMsg";
-            this.lblMsg.Size = new System.Drawing.Size(135, 20);
-            this.lblMsg.TabIndex = 223;
-            this.lblMsg.Text = "没有开启自动出入库";
-            // 
-            // btnSavePosition
-            // 
-            this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control;
-            this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSavePosition.Location = new System.Drawing.Point(533, 111);
-            this.btnSavePosition.Name = "btnSavePosition";
-            this.btnSavePosition.Size = new System.Drawing.Size(107, 38);
-            this.btnSavePosition.TabIndex = 217;
-            this.btnSavePosition.Text = "保存位置";
-            this.btnSavePosition.UseVisualStyleBackColor = false;
-            this.btnSavePosition.Click += new System.EventHandler(this.btnSavePosition_Click);
+            this.lblAutoMsg.AutoSize = true;
+            this.lblAutoMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblAutoMsg.ForeColor = System.Drawing.Color.Green;
+            this.lblAutoMsg.Location = new System.Drawing.Point(120, 76);
+            this.lblAutoMsg.Name = "lblAutoMsg";
+            this.lblAutoMsg.Size = new System.Drawing.Size(135, 20);
+            this.lblAutoMsg.TabIndex = 223;
+            this.lblAutoMsg.Text = "没有开启自动出入库";
             // 
             // 
             // btnStartAuTo
             // btnStartAuTo
             // 
             // 
             this.btnStartAuTo.BackColor = System.Drawing.SystemColors.Control;
             this.btnStartAuTo.BackColor = System.Drawing.SystemColors.Control;
             this.btnStartAuTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnStartAuTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStartAuTo.Location = new System.Drawing.Point(381, 61);
+            this.btnStartAuTo.Location = new System.Drawing.Point(281, 67);
             this.btnStartAuTo.Name = "btnStartAuTo";
             this.btnStartAuTo.Name = "btnStartAuTo";
             this.btnStartAuTo.Size = new System.Drawing.Size(105, 38);
             this.btnStartAuTo.Size = new System.Drawing.Size(105, 38);
             this.btnStartAuTo.TabIndex = 222;
             this.btnStartAuTo.TabIndex = 222;
@@ -396,15 +561,28 @@
             // 
             // 
             this.label9.AutoSize = true;
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(14, 72);
+            this.label9.Location = new System.Drawing.Point(11, 78);
             this.label9.Name = "label9";
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(83, 17);
+            this.label9.Size = new System.Drawing.Size(59, 17);
             this.label9.TabIndex = 220;
             this.label9.TabIndex = 220;
-            this.label9.Text = "入库间隔仓位:";
+            this.label9.Text = "间隔仓位:";
+            // 
+            // btnSavePosition
+            // 
+            this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control;
+            this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSavePosition.Location = new System.Drawing.Point(392, 67);
+            this.btnSavePosition.Name = "btnSavePosition";
+            this.btnSavePosition.Size = new System.Drawing.Size(105, 38);
+            this.btnSavePosition.TabIndex = 217;
+            this.btnSavePosition.Text = "保存位置";
+            this.btnSavePosition.UseVisualStyleBackColor = false;
+            this.btnSavePosition.Click += new System.EventHandler(this.btnSavePosition_Click);
             // 
             // 
             // txtJiange
             // txtJiange
             // 
             // 
-            this.txtJiange.Location = new System.Drawing.Point(103, 67);
+            this.txtJiange.Location = new System.Drawing.Point(76, 73);
             this.txtJiange.Name = "txtJiange";
             this.txtJiange.Name = "txtJiange";
             this.txtJiange.Size = new System.Drawing.Size(40, 26);
             this.txtJiange.Size = new System.Drawing.Size(40, 26);
             this.txtJiange.TabIndex = 221;
             this.txtJiange.TabIndex = 221;
@@ -417,7 +595,7 @@
             this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtComP1.Location = new System.Drawing.Point(154, 359);
+            this.txtComP1.Location = new System.Drawing.Point(154, 411);
             this.txtComP1.MaxLength = 20;
             this.txtComP1.MaxLength = 20;
             this.txtComP1.Name = "txtComP1";
             this.txtComP1.Name = "txtComP1";
             this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -432,7 +610,7 @@
             this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtInOutP2.Location = new System.Drawing.Point(396, 320);
+            this.txtInOutP2.Location = new System.Drawing.Point(403, 330);
             this.txtInOutP2.MaxLength = 20;
             this.txtInOutP2.MaxLength = 20;
             this.txtInOutP2.Name = "txtInOutP2";
             this.txtInOutP2.Name = "txtInOutP2";
             this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -447,7 +625,7 @@
             this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtInOutP1.Location = new System.Drawing.Point(153, 320);
+            this.txtInOutP1.Location = new System.Drawing.Point(153, 330);
             this.txtInOutP1.MaxLength = 20;
             this.txtInOutP1.MaxLength = 20;
             this.txtInOutP1.Name = "txtInOutP1";
             this.txtInOutP1.Name = "txtInOutP1";
             this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -462,7 +640,7 @@
             this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtMiddleP1.Location = new System.Drawing.Point(154, 281);
+            this.txtMiddleP1.Location = new System.Drawing.Point(154, 291);
             this.txtMiddleP1.MaxLength = 20;
             this.txtMiddleP1.MaxLength = 20;
             this.txtMiddleP1.Name = "txtMiddleP1";
             this.txtMiddleP1.Name = "txtMiddleP1";
             this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -477,7 +655,7 @@
             this.txtUpDownP7.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP7.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP7.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtUpDownP7.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP7.Location = new System.Drawing.Point(154, 201);
+            this.txtUpDownP7.Location = new System.Drawing.Point(154, 211);
             this.txtUpDownP7.MaxLength = 20;
             this.txtUpDownP7.MaxLength = 20;
             this.txtUpDownP7.Name = "txtUpDownP7";
             this.txtUpDownP7.Name = "txtUpDownP7";
             this.txtUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -492,7 +670,7 @@
             this.txtUpDownP8.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP8.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP8.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtUpDownP8.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP8.Location = new System.Drawing.Point(154, 241);
+            this.txtUpDownP8.Location = new System.Drawing.Point(154, 251);
             this.txtUpDownP8.MaxLength = 20;
             this.txtUpDownP8.MaxLength = 20;
             this.txtUpDownP8.Name = "txtUpDownP8";
             this.txtUpDownP8.Name = "txtUpDownP8";
             this.txtUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -507,7 +685,7 @@
             this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP1.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtUpDownP1.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP1.Location = new System.Drawing.Point(154, 121);
+            this.txtUpDownP1.Location = new System.Drawing.Point(154, 131);
             this.txtUpDownP1.MaxLength = 20;
             this.txtUpDownP1.MaxLength = 20;
             this.txtUpDownP1.Name = "txtUpDownP1";
             this.txtUpDownP1.Name = "txtUpDownP1";
             this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -522,7 +700,7 @@
             this.txtUpDownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP2.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtUpDownP2.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP2.Location = new System.Drawing.Point(154, 161);
+            this.txtUpDownP2.Location = new System.Drawing.Point(154, 171);
             this.txtUpDownP2.MaxLength = 20;
             this.txtUpDownP2.MaxLength = 20;
             this.txtUpDownP2.Name = "txtUpDownP2";
             this.txtUpDownP2.Name = "txtUpDownP2";
             this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -537,7 +715,7 @@
             this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtComP3.Location = new System.Drawing.Point(642, 359);
+            this.txtComP3.Location = new System.Drawing.Point(403, 370);
             this.txtComP3.MaxLength = 20;
             this.txtComP3.MaxLength = 20;
             this.txtComP3.Name = "txtComP3";
             this.txtComP3.Name = "txtComP3";
             this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -552,7 +730,7 @@
             this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtComP2.Location = new System.Drawing.Point(396, 359);
+            this.txtComP2.Location = new System.Drawing.Point(403, 411);
             this.txtComP2.MaxLength = 20;
             this.txtComP2.MaxLength = 20;
             this.txtComP2.Name = "txtComP2";
             this.txtComP2.Name = "txtComP2";
             this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -567,7 +745,7 @@
             this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtInOutP3.Location = new System.Drawing.Point(642, 320);
+            this.txtInOutP3.Location = new System.Drawing.Point(154, 370);
             this.txtInOutP3.MaxLength = 20;
             this.txtInOutP3.MaxLength = 20;
             this.txtInOutP3.Name = "txtInOutP3";
             this.txtInOutP3.Name = "txtInOutP3";
             this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -582,7 +760,7 @@
             this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtMiddleP2.Location = new System.Drawing.Point(396, 281);
+            this.txtMiddleP2.Location = new System.Drawing.Point(403, 291);
             this.txtMiddleP2.MaxLength = 20;
             this.txtMiddleP2.MaxLength = 20;
             this.txtMiddleP2.Name = "txtMiddleP2";
             this.txtMiddleP2.Name = "txtMiddleP2";
             this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -597,7 +775,7 @@
             this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP5.Location = new System.Drawing.Point(396, 201);
+            this.txtUpDownP5.Location = new System.Drawing.Point(403, 211);
             this.txtUpDownP5.MaxLength = 20;
             this.txtUpDownP5.MaxLength = 20;
             this.txtUpDownP5.Name = "txtUpDownP5";
             this.txtUpDownP5.Name = "txtUpDownP5";
             this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -612,7 +790,7 @@
             this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP6.Location = new System.Drawing.Point(396, 241);
+            this.txtUpDownP6.Location = new System.Drawing.Point(403, 251);
             this.txtUpDownP6.MaxLength = 20;
             this.txtUpDownP6.MaxLength = 20;
             this.txtUpDownP6.Name = "txtUpDownP6";
             this.txtUpDownP6.Name = "txtUpDownP6";
             this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -625,26 +803,12 @@
             this.cmbPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.cmbPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.cmbPosition.FormattingEnabled = true;
             this.cmbPosition.FormattingEnabled = true;
-            this.cmbPosition.Location = new System.Drawing.Point(76, 23);
+            this.cmbPosition.Location = new System.Drawing.Point(7, 23);
             this.cmbPosition.Name = "cmbPosition";
             this.cmbPosition.Name = "cmbPosition";
-            this.cmbPosition.Size = new System.Drawing.Size(189, 28);
+            this.cmbPosition.Size = new System.Drawing.Size(248, 28);
             this.cmbPosition.TabIndex = 174;
             this.cmbPosition.TabIndex = 174;
             this.cmbPosition.SelectedIndexChanged += new System.EventHandler(this.cmbPosition_SelectedIndexChanged);
             this.cmbPosition.SelectedIndexChanged += new System.EventHandler(this.cmbPosition_SelectedIndexChanged);
             // 
             // 
-            // label21
-            // 
-            this.label21.AutoSize = true;
-            this.label21.Cursor = System.Windows.Forms.Cursors.Default;
-            this.label21.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label21.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.label21.Location = new System.Drawing.Point(11, 29);
-            this.label21.Name = "label21";
-            this.label21.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.label21.Size = new System.Drawing.Size(59, 17);
-            this.label21.TabIndex = 172;
-            this.label21.Text = "选择仓位:";
-            this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
             // txtUpDownP3
             // txtUpDownP3
             // 
             // 
             this.txtUpDownP3.AcceptsReturn = true;
             this.txtUpDownP3.AcceptsReturn = true;
@@ -652,7 +816,7 @@
             this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP3.Location = new System.Drawing.Point(396, 121);
+            this.txtUpDownP3.Location = new System.Drawing.Point(403, 131);
             this.txtUpDownP3.MaxLength = 20;
             this.txtUpDownP3.MaxLength = 20;
             this.txtUpDownP3.Name = "txtUpDownP3";
             this.txtUpDownP3.Name = "txtUpDownP3";
             this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -665,7 +829,7 @@
             this.btnInStore.BackColor = System.Drawing.SystemColors.Control;
             this.btnInStore.BackColor = System.Drawing.SystemColors.Control;
             this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnInStore.Location = new System.Drawing.Point(273, 18);
+            this.btnInStore.Location = new System.Drawing.Point(281, 18);
             this.btnInStore.Name = "btnInStore";
             this.btnInStore.Name = "btnInStore";
             this.btnInStore.Size = new System.Drawing.Size(105, 38);
             this.btnInStore.Size = new System.Drawing.Size(105, 38);
             this.btnInStore.TabIndex = 102;
             this.btnInStore.TabIndex = 102;
@@ -678,7 +842,7 @@
             this.btnOutStore.BackColor = System.Drawing.SystemColors.Control;
             this.btnOutStore.BackColor = System.Drawing.SystemColors.Control;
             this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnOutStore.Location = new System.Drawing.Point(381, 18);
+            this.btnOutStore.Location = new System.Drawing.Point(392, 18);
             this.btnOutStore.Name = "btnOutStore";
             this.btnOutStore.Name = "btnOutStore";
             this.btnOutStore.Size = new System.Drawing.Size(105, 38);
             this.btnOutStore.Size = new System.Drawing.Size(105, 38);
             this.btnOutStore.TabIndex = 101;
             this.btnOutStore.TabIndex = 101;
@@ -693,7 +857,7 @@
             this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText;
             this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP4.Location = new System.Drawing.Point(396, 161);
+            this.txtUpDownP4.Location = new System.Drawing.Point(403, 171);
             this.txtUpDownP4.MaxLength = 20;
             this.txtUpDownP4.MaxLength = 20;
             this.txtUpDownP4.Name = "txtUpDownP4";
             this.txtUpDownP4.Name = "txtUpDownP4";
             this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -710,7 +874,7 @@
             this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnComP1.ForeColor = System.Drawing.Color.Purple;
             this.btnComP1.ForeColor = System.Drawing.Color.Purple;
             this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnComP1.Location = new System.Drawing.Point(10, 354);
+            this.btnComP1.Location = new System.Drawing.Point(10, 406);
             this.btnComP1.Name = "btnComP1";
             this.btnComP1.Name = "btnComP1";
             this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnComP1.Size = new System.Drawing.Size(140, 33);
             this.btnComP1.Size = new System.Drawing.Size(140, 33);
@@ -729,7 +893,7 @@
             this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
             this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
             this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnInOutP2.Location = new System.Drawing.Point(252, 315);
+            this.btnInOutP2.Location = new System.Drawing.Point(259, 325);
             this.btnInOutP2.Name = "btnInOutP2";
             this.btnInOutP2.Name = "btnInOutP2";
             this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnInOutP2.Size = new System.Drawing.Size(140, 33);
             this.btnInOutP2.Size = new System.Drawing.Size(140, 33);
@@ -748,7 +912,7 @@
             this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
             this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
             this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnInOutP1.Location = new System.Drawing.Point(10, 315);
+            this.btnInOutP1.Location = new System.Drawing.Point(10, 325);
             this.btnInOutP1.Name = "btnInOutP1";
             this.btnInOutP1.Name = "btnInOutP1";
             this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnInOutP1.Size = new System.Drawing.Size(140, 33);
             this.btnInOutP1.Size = new System.Drawing.Size(140, 33);
@@ -767,7 +931,7 @@
             this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
             this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
             this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnMiddleP1.Location = new System.Drawing.Point(10, 276);
+            this.btnMiddleP1.Location = new System.Drawing.Point(10, 286);
             this.btnMiddleP1.Name = "btnMiddleP1";
             this.btnMiddleP1.Name = "btnMiddleP1";
             this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnMiddleP1.Size = new System.Drawing.Size(140, 33);
             this.btnMiddleP1.Size = new System.Drawing.Size(140, 33);
@@ -786,7 +950,7 @@
             this.btnUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP7.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP7.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.btnUpDownP7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnUpDownP7.Location = new System.Drawing.Point(10, 196);
+            this.btnUpDownP7.Location = new System.Drawing.Point(10, 206);
             this.btnUpDownP7.Name = "btnUpDownP7";
             this.btnUpDownP7.Name = "btnUpDownP7";
             this.btnUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP7.Size = new System.Drawing.Size(140, 33);
             this.btnUpDownP7.Size = new System.Drawing.Size(140, 33);
@@ -805,7 +969,7 @@
             this.btnUpDownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP8.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP8.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.btnUpDownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnUpDownP8.Location = new System.Drawing.Point(10, 236);
+            this.btnUpDownP8.Location = new System.Drawing.Point(10, 246);
             this.btnUpDownP8.Name = "btnUpDownP8";
             this.btnUpDownP8.Name = "btnUpDownP8";
             this.btnUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP8.Size = new System.Drawing.Size(140, 33);
             this.btnUpDownP8.Size = new System.Drawing.Size(140, 33);
@@ -824,7 +988,7 @@
             this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnUpDownP1.Location = new System.Drawing.Point(10, 116);
+            this.btnUpDownP1.Location = new System.Drawing.Point(10, 126);
             this.btnUpDownP1.Name = "btnUpDownP1";
             this.btnUpDownP1.Name = "btnUpDownP1";
             this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP1.Size = new System.Drawing.Size(140, 33);
             this.btnUpDownP1.Size = new System.Drawing.Size(140, 33);
@@ -843,7 +1007,7 @@
             this.btnUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP2.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP2.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnUpDownP2.Location = new System.Drawing.Point(10, 156);
+            this.btnUpDownP2.Location = new System.Drawing.Point(10, 166);
             this.btnUpDownP2.Name = "btnUpDownP2";
             this.btnUpDownP2.Name = "btnUpDownP2";
             this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP2.Size = new System.Drawing.Size(140, 33);
             this.btnUpDownP2.Size = new System.Drawing.Size(140, 33);
@@ -861,7 +1025,7 @@
             this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnComP3.ForeColor = System.Drawing.Color.Purple;
             this.btnComP3.ForeColor = System.Drawing.Color.Purple;
-            this.btnComP3.Location = new System.Drawing.Point(498, 354);
+            this.btnComP3.Location = new System.Drawing.Point(259, 365);
             this.btnComP3.Name = "btnComP3";
             this.btnComP3.Name = "btnComP3";
             this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnComP3.Size = new System.Drawing.Size(140, 33);
             this.btnComP3.Size = new System.Drawing.Size(140, 33);
@@ -879,7 +1043,7 @@
             this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnComP2.ForeColor = System.Drawing.Color.Purple;
             this.btnComP2.ForeColor = System.Drawing.Color.Purple;
-            this.btnComP2.Location = new System.Drawing.Point(252, 354);
+            this.btnComP2.Location = new System.Drawing.Point(259, 406);
             this.btnComP2.Name = "btnComP2";
             this.btnComP2.Name = "btnComP2";
             this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnComP2.Size = new System.Drawing.Size(140, 33);
             this.btnComP2.Size = new System.Drawing.Size(140, 33);
@@ -897,7 +1061,7 @@
             this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
             this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
-            this.btnInOutP3.Location = new System.Drawing.Point(498, 315);
+            this.btnInOutP3.Location = new System.Drawing.Point(10, 365);
             this.btnInOutP3.Name = "btnInOutP3";
             this.btnInOutP3.Name = "btnInOutP3";
             this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnInOutP3.Size = new System.Drawing.Size(140, 33);
             this.btnInOutP3.Size = new System.Drawing.Size(140, 33);
@@ -915,7 +1079,7 @@
             this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
             this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.btnMiddleP2.Location = new System.Drawing.Point(252, 276);
+            this.btnMiddleP2.Location = new System.Drawing.Point(259, 286);
             this.btnMiddleP2.Name = "btnMiddleP2";
             this.btnMiddleP2.Name = "btnMiddleP2";
             this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnMiddleP2.Size = new System.Drawing.Size(140, 33);
             this.btnMiddleP2.Size = new System.Drawing.Size(140, 33);
@@ -933,7 +1097,7 @@
             this.btnUpDownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnUpDownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP5.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP5.ForeColor = System.Drawing.Color.Red;
-            this.btnUpDownP5.Location = new System.Drawing.Point(252, 196);
+            this.btnUpDownP5.Location = new System.Drawing.Point(259, 206);
             this.btnUpDownP5.Name = "btnUpDownP5";
             this.btnUpDownP5.Name = "btnUpDownP5";
             this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP5.Size = new System.Drawing.Size(140, 33);
             this.btnUpDownP5.Size = new System.Drawing.Size(140, 33);
@@ -951,7 +1115,7 @@
             this.btnUpDownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnUpDownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP6.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP6.ForeColor = System.Drawing.Color.Red;
-            this.btnUpDownP6.Location = new System.Drawing.Point(252, 236);
+            this.btnUpDownP6.Location = new System.Drawing.Point(259, 246);
             this.btnUpDownP6.Name = "btnUpDownP6";
             this.btnUpDownP6.Name = "btnUpDownP6";
             this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP6.Size = new System.Drawing.Size(140, 33);
             this.btnUpDownP6.Size = new System.Drawing.Size(140, 33);
@@ -969,7 +1133,7 @@
             this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP3.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP3.ForeColor = System.Drawing.Color.Red;
-            this.btnUpDownP3.Location = new System.Drawing.Point(252, 116);
+            this.btnUpDownP3.Location = new System.Drawing.Point(259, 126);
             this.btnUpDownP3.Name = "btnUpDownP3";
             this.btnUpDownP3.Name = "btnUpDownP3";
             this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP3.Size = new System.Drawing.Size(140, 33);
             this.btnUpDownP3.Size = new System.Drawing.Size(140, 33);
@@ -987,7 +1151,7 @@
             this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnUpDownP4.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP4.ForeColor = System.Drawing.Color.Red;
-            this.btnUpDownP4.Location = new System.Drawing.Point(252, 156);
+            this.btnUpDownP4.Location = new System.Drawing.Point(259, 166);
             this.btnUpDownP4.Name = "btnUpDownP4";
             this.btnUpDownP4.Name = "btnUpDownP4";
             this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.btnUpDownP4.Size = new System.Drawing.Size(140, 33);
             this.btnUpDownP4.Size = new System.Drawing.Size(140, 33);
@@ -997,6 +1161,19 @@
             this.btnUpDownP4.UseVisualStyleBackColor = false;
             this.btnUpDownP4.UseVisualStyleBackColor = false;
             this.btnUpDownP4.Click += new System.EventHandler(this.btnUpDownP4_Click);
             this.btnUpDownP4.Click += new System.EventHandler(this.btnUpDownP4_Click);
             // 
             // 
+            // btnCheckPos
+            // 
+            this.btnCheckPos.BackColor = System.Drawing.SystemColors.Control;
+            this.btnCheckPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnCheckPos.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnCheckPos.Location = new System.Drawing.Point(541, 414);
+            this.btnCheckPos.Name = "btnCheckPos";
+            this.btnCheckPos.Size = new System.Drawing.Size(105, 35);
+            this.btnCheckPos.TabIndex = 273;
+            this.btnCheckPos.Text = "盘点测试";
+            this.btnCheckPos.UseVisualStyleBackColor = false;
+            this.btnCheckPos.Click += new System.EventHandler(this.btnCheckPos_Click);
+            // 
             // tabPage1
             // tabPage1
             // 
             // 
             this.tabPage1.Controls.Add(this.groupBox2);
             this.tabPage1.Controls.Add(this.groupBox2);
@@ -1006,10 +1183,10 @@
             this.tabPage1.Controls.Add(this.btnAxisOn);
             this.tabPage1.Controls.Add(this.btnAxisOn);
             this.tabPage1.Controls.Add(this.btnAxisOff);
             this.tabPage1.Controls.Add(this.btnAxisOff);
             this.tabPage1.Controls.Add(this.btnAxisP);
             this.tabPage1.Controls.Add(this.btnAxisP);
-            this.tabPage1.Location = new System.Drawing.Point(4, 29);
+            this.tabPage1.Location = new System.Drawing.Point(4, 26);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(1075, 472);
+            this.tabPage1.Size = new System.Drawing.Size(1075, 488);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "     伺服调试       ";
             this.tabPage1.Text = "     伺服调试       ";
             this.tabPage1.UseVisualStyleBackColor = true;
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -1019,7 +1196,7 @@
             this.groupBox2.Controls.Add(this.button6);
             this.groupBox2.Controls.Add(this.button6);
             this.groupBox2.Controls.Add(this.button3);
             this.groupBox2.Controls.Add(this.button3);
             this.groupBox2.Controls.Add(this.button5);
             this.groupBox2.Controls.Add(this.button5);
-            this.groupBox2.Location = new System.Drawing.Point(578, 149);
+            this.groupBox2.Location = new System.Drawing.Point(581, 153);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Size = new System.Drawing.Size(476, 78);
             this.groupBox2.Size = new System.Drawing.Size(476, 78);
             this.groupBox2.TabIndex = 276;
             this.groupBox2.TabIndex = 276;
@@ -1064,7 +1241,7 @@
             // 
             // 
             this.axisMoveControl1.Location = new System.Drawing.Point(4, 6);
             this.axisMoveControl1.Location = new System.Drawing.Point(4, 6);
             this.axisMoveControl1.Name = "axisMoveControl1";
             this.axisMoveControl1.Name = "axisMoveControl1";
-            this.axisMoveControl1.Size = new System.Drawing.Size(562, 429);
+            this.axisMoveControl1.Size = new System.Drawing.Size(565, 404);
             this.axisMoveControl1.TabIndex = 218;
             this.axisMoveControl1.TabIndex = 218;
             // 
             // 
             // groupBox1
             // groupBox1
@@ -1089,7 +1266,7 @@
             this.groupBox1.Controls.Add(this.label43);
             this.groupBox1.Controls.Add(this.label43);
             this.groupBox1.Controls.Add(this.label42);
             this.groupBox1.Controls.Add(this.label42);
             this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBox1.Location = new System.Drawing.Point(578, 6);
+            this.groupBox1.Location = new System.Drawing.Point(581, 10);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Size = new System.Drawing.Size(476, 136);
             this.groupBox1.Size = new System.Drawing.Size(476, 136);
             this.groupBox1.TabIndex = 217;
             this.groupBox1.TabIndex = 217;
@@ -1267,17 +1444,15 @@
             this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox3.Controls.Add(this.lblMoveEquipInfo);
             this.groupBox3.Controls.Add(this.lblMoveEquipInfo);
-            this.groupBox3.Controls.Add(this.btnStoreHome);
             this.groupBox3.Controls.Add(this.btnCon);
             this.groupBox3.Controls.Add(this.btnCon);
             this.groupBox3.Controls.Add(this.chbDebug);
             this.groupBox3.Controls.Add(this.chbDebug);
-            this.groupBox3.Controls.Add(this.btnSotreReset);
             this.groupBox3.Controls.Add(this.lblWarnMsg);
             this.groupBox3.Controls.Add(this.lblWarnMsg);
             this.groupBox3.Controls.Add(this.btnStoreStop);
             this.groupBox3.Controls.Add(this.btnStoreStop);
             this.groupBox3.Controls.Add(this.lblThisSta);
             this.groupBox3.Controls.Add(this.lblThisSta);
             this.groupBox3.Controls.Add(this.btnStoreStart);
             this.groupBox3.Controls.Add(this.btnStoreStart);
             this.groupBox3.Location = new System.Drawing.Point(4, 2);
             this.groupBox3.Location = new System.Drawing.Point(4, 2);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(1083, 137);
+            this.groupBox3.Size = new System.Drawing.Size(1083, 125);
             this.groupBox3.TabIndex = 268;
             this.groupBox3.TabIndex = 268;
             this.groupBox3.TabStop = false;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "设备状态";
             this.groupBox3.Text = "设备状态";
@@ -1287,16 +1462,17 @@
             this.lblMoveEquipInfo.AutoSize = true;
             this.lblMoveEquipInfo.AutoSize = true;
             this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Green;
             this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Green;
-            this.lblMoveEquipInfo.Location = new System.Drawing.Point(728, 36);
+            this.lblMoveEquipInfo.Location = new System.Drawing.Point(895, 35);
             this.lblMoveEquipInfo.Name = "lblMoveEquipInfo";
             this.lblMoveEquipInfo.Name = "lblMoveEquipInfo";
-            this.lblMoveEquipInfo.Size = new System.Drawing.Size(0, 17);
+            this.lblMoveEquipInfo.Size = new System.Drawing.Size(107, 17);
             this.lblMoveEquipInfo.TabIndex = 274;
             this.lblMoveEquipInfo.TabIndex = 274;
+            this.lblMoveEquipInfo.Text = "移栽状态:不可出库";
             // 
             // 
             // btnCon
             // btnCon
             // 
             // 
             this.btnCon.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCon.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCon.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnCon.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnCon.Location = new System.Drawing.Point(902, 80);
+            this.btnCon.Location = new System.Drawing.Point(902, 76);
             this.btnCon.Name = "btnCon";
             this.btnCon.Name = "btnCon";
             this.btnCon.Size = new System.Drawing.Size(175, 39);
             this.btnCon.Size = new System.Drawing.Size(175, 39);
             this.btnCon.TabIndex = 273;
             this.btnCon.TabIndex = 273;
@@ -1306,11 +1482,11 @@
             // 
             // 
             // lblWarnMsg
             // lblWarnMsg
             // 
             // 
-            this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
             this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
-            this.lblWarnMsg.Location = new System.Drawing.Point(10, 73);
+            this.lblWarnMsg.Location = new System.Drawing.Point(131, 68);
             this.lblWarnMsg.Name = "lblWarnMsg";
             this.lblWarnMsg.Name = "lblWarnMsg";
-            this.lblWarnMsg.Size = new System.Drawing.Size(869, 52);
+            this.lblWarnMsg.Size = new System.Drawing.Size(765, 51);
             this.lblWarnMsg.TabIndex = 224;
             this.lblWarnMsg.TabIndex = 224;
             this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // 
@@ -1319,11 +1495,12 @@
             this.lblThisSta.AutoSize = true;
             this.lblThisSta.AutoSize = true;
             this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblThisSta.ForeColor = System.Drawing.Color.Green;
             this.lblThisSta.ForeColor = System.Drawing.Color.Green;
-            this.lblThisSta.Location = new System.Drawing.Point(483, 36);
+            this.lblThisSta.Location = new System.Drawing.Point(249, 35);
             this.lblThisSta.Name = "lblThisSta";
             this.lblThisSta.Name = "lblThisSta";
             this.lblThisSta.Size = new System.Drawing.Size(56, 17);
             this.lblThisSta.Size = new System.Drawing.Size(56, 17);
             this.lblThisSta.TabIndex = 216;
             this.lblThisSta.TabIndex = 216;
             this.lblThisSta.Text = "等待启动";
             this.lblThisSta.Text = "等待启动";
+            this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
             // 
             // FrmBox
             // FrmBox
             // 
             // 
@@ -1343,6 +1520,11 @@
             this.Shown += new System.EventHandler(this.FrmStoreBox_Shown);
             this.Shown += new System.EventHandler(this.FrmStoreBox_Shown);
             this.tabControl1.ResumeLayout(false);
             this.tabControl1.ResumeLayout(false);
             this.tabPage3.ResumeLayout(false);
             this.tabPage3.ResumeLayout(false);
+            this.tabPage3.PerformLayout();
+            this.groupBox4.ResumeLayout(false);
+            this.groupBox4.PerformLayout();
+            this.groupBox5.ResumeLayout(false);
+            this.groupBox6.ResumeLayout(false);
             this.groupInout.ResumeLayout(false);
             this.groupInout.ResumeLayout(false);
             this.groupInout.PerformLayout();
             this.groupInout.PerformLayout();
             this.tabPage1.ResumeLayout(false);
             this.tabPage1.ResumeLayout(false);
@@ -1365,7 +1547,6 @@
         public System.Windows.Forms.Button btnUpDownP3;
         public System.Windows.Forms.Button btnUpDownP3;
         public System.Windows.Forms.TextBox txtUpDownP4;
         public System.Windows.Forms.TextBox txtUpDownP4;
         public System.Windows.Forms.Button btnUpDownP4;
         public System.Windows.Forms.Button btnUpDownP4;
-        public System.Windows.Forms.Label label21;
         private System.Windows.Forms.ComboBox cmbPosition;
         private System.Windows.Forms.ComboBox cmbPosition;
         private System.Windows.Forms.Label label43;
         private System.Windows.Forms.Label label43;
         private System.Windows.Forms.Label label42;
         private System.Windows.Forms.Label label42;
@@ -1412,7 +1593,7 @@
         private System.Windows.Forms.TextBox txtJiange;
         private System.Windows.Forms.TextBox txtJiange;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Button btnStartAuTo;
         private System.Windows.Forms.Button btnStartAuTo;
-        private System.Windows.Forms.Label lblMsg;
+        private System.Windows.Forms.Label lblAutoMsg;
         private System.Windows.Forms.TextBox txtMiddleTarget;
         private System.Windows.Forms.TextBox txtMiddleTarget;
         private System.Windows.Forms.TextBox txtInoutTarget;
         private System.Windows.Forms.TextBox txtInoutTarget;
         private System.Windows.Forms.TextBox txtUpdownTarget;
         private System.Windows.Forms.TextBox txtUpdownTarget;
@@ -1422,8 +1603,6 @@
         private System.Windows.Forms.Label lblTemp;
         private System.Windows.Forms.Label lblTemp;
         private System.Windows.Forms.TabControl tabControl1;
         private System.Windows.Forms.TabControl tabControl1;
         private System.Windows.Forms.TabPage tabPage1;
         private System.Windows.Forms.TabPage tabPage1;
-        private System.Windows.Forms.Button btnStoreHome;
-        private System.Windows.Forms.Button btnSotreReset;
         private System.Windows.Forms.Button btnStoreStop;
         private System.Windows.Forms.Button btnStoreStop;
         private System.Windows.Forms.Button btnAxisP;
         private System.Windows.Forms.Button btnAxisP;
         private System.Windows.Forms.Button btnAxisOff;
         private System.Windows.Forms.Button btnAxisOff;
@@ -1443,9 +1622,24 @@
         private System.Windows.Forms.Button button3;
         private System.Windows.Forms.Button button3;
         private System.Windows.Forms.Button button5;
         private System.Windows.Forms.Button button5;
         private System.Windows.Forms.TabPage tabPage3;
         private System.Windows.Forms.TabPage tabPage3;
-        private System.Windows.Forms.TabPage tabPage4;
         private AutoCountClient.AxisMoveControl axisMoveControl1;
         private AutoCountClient.AxisMoveControl axisMoveControl1;
         private System.Windows.Forms.Label lblMoveEquipInfo;
         private System.Windows.Forms.Label lblMoveEquipInfo;
+        private System.Windows.Forms.GroupBox groupBox4;
+        private System.Windows.Forms.Button btnOpenDo;
+        private System.Windows.Forms.Button btnCloseDO;
+        private System.Windows.Forms.TextBox txtDOIndex;
+        private System.Windows.Forms.TextBox txtDoName;
+        private System.Windows.Forms.TextBox txtWriteTime;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.ComboBox cmbWriteIO;
+        private System.Windows.Forms.Button btnCloseDoor;
+        private System.Windows.Forms.Button btnOpenDoor;
+        private System.Windows.Forms.GroupBox groupBox5;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
+        private System.Windows.Forms.GroupBox groupBox6;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Label label17;
+        private System.Windows.Forms.Label label14;
     }
     }
 }
 }
 
 

source/HCSingleStore/FrmBox.cs

@@ -21,10 +21,8 @@ using UserFromControl;
 namespace OnlineStore.ACSingleStore
 namespace OnlineStore.ACSingleStore
 {
 {
     public partial class FrmBox : FrmBase
     public partial class FrmBox : FrmBase
-    {
-
-        public  BoxBean boxBean;
-        //public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+    { 
+        public  BoxBean boxBean; 
         public FrmBox()
         public FrmBox()
         {
         {
             Control.CheckForIllegalCrossThreadCalls = false;
             Control.CheckForIllegalCrossThreadCalls = false;
@@ -36,13 +34,11 @@ namespace OnlineStore.ACSingleStore
 
 
         private void FrmTest_Load(object sender, EventArgs e)
         private void FrmTest_Load(object sender, EventArgs e)
         {
         {
-            string version = GetVersion(true );
              
              
             LoadStore();
             LoadStore();
 
 
             chbDebug.Checked = boxBean.IsDebug;
             chbDebug.Checked = boxBean.IsDebug;
-            this.ShowInTaskbar = true;
-            this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title)+"_"+boxBean.DeviceID;
+            this.ShowInTaskbar = true; 
             groupBox3.Text = "设备["+boxBean.CID+"]状态";
             groupBox3.Text = "设备["+boxBean.CID+"]状态";
          
          
             this.Opacity = 1; 
             this.Opacity = 1; 
@@ -98,26 +94,57 @@ namespace OnlineStore.ACSingleStore
                 txtInOutP2.Text = ktkPosition.InOutAxis_DoorPosition_P2.ToString();
                 txtInOutP2.Text = ktkPosition.InOutAxis_DoorPosition_P2.ToString();
                 //txtUpDownP1.Text = ktkPosition.UpDownAxis_DoorOPosition_P1.ToString(); 
                 //txtUpDownP1.Text = ktkPosition.UpDownAxis_DoorOPosition_P1.ToString(); 
             }
             }
-            FrmIOStatus frmIo = new FrmIOStatus(boxBean);
-            AddForm(frmIo);
+
+            LoadIOList();
             timer1.Enabled = true;
             timer1.Enabled = true;
         }
         }
-        private void AddForm(  Form form)
-        {  
-            tabPage4.AutoScroll = true;
-            // lineTabPage.Tag = lineBean;
-            Panel linePan = new Panel();
-            linePan.Dock = DockStyle.Fill;
-            linePan.AutoScroll = true;
-            tabPage4.Controls.Add(linePan);
-            form.FormBorderStyle = FormBorderStyle.None;
-            form.TopLevel = false;
-            linePan.Controls.Add(form);
-            form.Dock = DockStyle.Fill;
-            //linePan.Anchor = ((AnchorStyles)((AnchorStyles.Top | AnchorStyles.Right | AnchorStyles.Bottom | AnchorStyles.Left)));
-            //form.Anchor = ((AnchorStyles)((AnchorStyles.Top | AnchorStyles.Right | AnchorStyles.Bottom | AnchorStyles.Left)));
-            form.Show(); 
+        private Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>();
+        private Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
+        private void LoadIOList()
+        {
+            int roleindex = 0;
+            this.tableLayoutPanel1.RowStyles.Clear();
+            this.tableLayoutPanel1.RowCount = boxBean.Config.DIList.Count;
+            foreach (ConfigIO ioValue in boxBean.Config.DIList.Values)
+            {
+                this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
+                IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
+                control.Click += Control_Click;
+                this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
+                roleindex++;
+                DIControlList.Add(ioValue.ProName, control);
+            }
+
+            tableLayoutPanel2.RowStyles.Clear();
+            this.tableLayoutPanel2.RowCount = boxBean.Config.DOList.Count;
+            roleindex = 0;
+            foreach (ConfigIO ioValue in boxBean.Config.DOList.Values)
+            {
+                this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
+                IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
+                control.Click += Control_Click;
+                this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
+                roleindex++;
+                DOControlList.Add(ioValue.ProName, control);
+            }
+            this.SuspendLayout();    //此处为不闪屏，一定要有的！ 
+            cmbWriteIO.Items.Clear();
+            cmbWriteIO.DataSource = new List<ConfigIO>(boxBean.Config.DOList.Values);
+            cmbWriteIO.ValueMember = "ProName";
+            cmbWriteIO.DisplayMember = "DisplayStr";
+        }
+        private void Control_Click(object sender, EventArgs e)
+        {
+            IOTextControl control = (IOTextControl)sender;
+            string name = control.Name.Substring(3, control.Name.Length - 3);
+            List<string> keyList = new List<string>(DOControlList.Keys);
+            int index = keyList.IndexOf(name);
+            if (index >= 0)
+            {
+                cmbWriteIO.SelectedIndex = index;
+            }
         }
         }
+      
         #endregion
         #endregion
 
 
           
           
@@ -131,14 +158,18 @@ namespace OnlineStore.ACSingleStore
             preOpen = isOpen;
             preOpen = isOpen;
 
 
             btnOutStore.Enabled = isOpen;
             btnOutStore.Enabled = isOpen;
-            btnInStore.Enabled = isOpen; 
-       
-            btnStoreStart.Enabled = !isOpen;
-            btnSotreReset.Enabled = isOpen;
+            btnInStore.Enabled = isOpen;  
             btnStoreStop.Enabled = isOpen;
             btnStoreStop.Enabled = isOpen;
-
+            if (isOpen)
+            {
+                btnStoreStart.Text = "复位";
+            }
+            else
+            {
+                btnStoreStart.Text = "启动调试";
+            }
         }
         }
-       
+
         private void timer1_Tick(object sender, EventArgs e)
         private void timer1_Tick(object sender, EventArgs e)
         {
         {
             if (!this.Visible)
             if (!this.Visible)
@@ -146,6 +177,8 @@ namespace OnlineStore.ACSingleStore
                 return;
                 return;
             }
             }
 
 
+            ReadIOList();
+
             if (chbDebug.Checked.Equals(boxBean.IsDebug).Equals(false))
             if (chbDebug.Checked.Equals(boxBean.IsDebug).Equals(false))
             {
             {
                 LoadOk = false;
                 LoadOk = false;
@@ -153,18 +186,14 @@ namespace OnlineStore.ACSingleStore
                 LoadOk = true;
                 LoadOk = true;
             }
             }
             lblTemp.Text = boxBean.humBean.currTempStr;
             lblTemp.Text = boxBean.humBean.currTempStr;
-            lblMoveEquipInfo.Text = "移栽状态："+(LineConnect.CanStartOut() ? "可出库":"不可出库" )+"  "+LineConnect.LastUpdateTime.ToLongTimeString()+"" ;
-            //忙碌状态不读取状态
-            if (!boxBean.storeRunStatus.Equals(StoreRunStatus.Busy))
-            {
-            }
-
+            lblMoveEquipInfo.Text = "移栽状态：" + (boxBean.lineConnect.CanStartOut() ? "可出库" : "不可出库") + "  " + boxBean.lineConnect.LastUpdateTime.ToLongTimeString() + "";
+        
             //ReadPosistion();
             //ReadPosistion();
             if (boxBean.storeRunStatus > StoreRunStatus.Wait)
             if (boxBean.storeRunStatus > StoreRunStatus.Wait)
             {
             {
                 if (boxBean.OutCheckAlarm())
                 if (boxBean.OutCheckAlarm())
                 {
                 {
-                    btnCon.Visible = true ;
+                    btnCon.Visible = true;
                 }
                 }
                 if (btnStoreStart.Enabled.Equals(true))
                 if (btnStoreStart.Enabled.Equals(true))
                 {
                 {
@@ -172,50 +201,39 @@ namespace OnlineStore.ACSingleStore
                 }
                 }
 
 
                 lblThisSta.Text = boxBean.GetRunStr();
                 lblThisSta.Text = boxBean.GetRunStr();
-               
-                //复位按钮状态显示
-                if (btnSotreReset.Enabled == false)
+
+                //复位按钮状态显示 
+                if (boxBean.storeRunStatus > StoreRunStatus.Wait)
                 {
                 {
-                    if ((boxBean.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || boxBean.storeRunStatus.Equals(StoreRunStatus.Reset))
-                        && boxBean.alarmType.Equals(StoreAlarmType.None))
+                    if (btnStoreStart.Text.Equals("启用调试"))
                     {
                     {
-                    }
-                    else
-                    {
-                        if (btnSotreReset.Enabled.Equals(false))
-                        {
-                            btnSotreReset.Enabled = true;
-                        }
+                        btnStoreStart.Text = "复位";
                     }
                     }
                 }
                 }
                 else
                 else
                 {
                 {
-                    if ((boxBean.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || boxBean.storeRunStatus.Equals(StoreRunStatus.Reset))
-                        && boxBean.alarmType.Equals(StoreAlarmType.None))
+                    if (btnStoreStart.Text.Equals("复位"))
                     {
                     {
-                        if (btnStoreStart.Enabled)
-                        {
-                            btnStoreStart.Enabled = false;
-                            btnSotreReset.Enabled = false;
-                        }
+                        btnStoreStart.Text = "启用调试";
                     }
                     }
                 }
                 }
+
                 lblWarnMsg.Text = boxBean.WarnMsg;
                 lblWarnMsg.Text = boxBean.WarnMsg;
 
 
-         
+
                 //如果不在出入库中，且叉子上有信号，需要提示检查叉子
                 //如果不在出入库中，且叉子上有信号，需要提示检查叉子
-                if (boxBean.storeRunStatus.Equals(StoreRunStatus.Runing) && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
+                if (boxBean.storeRunStatus.Equals(StoreRunStatus.Runing) && boxBean.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                 {
                 {
                     lblWarnMsg.Text = lblWarnMsg.Text + "   叉子料盘检测有料，请检查";
                     lblWarnMsg.Text = lblWarnMsg.Text + "   叉子料盘检测有料，请检查";
                 }
                 }
-               
+
                 if (boxBean.humBean.TempOrHumidityIsAlarm)
                 if (boxBean.humBean.TempOrHumidityIsAlarm)
                 {
                 {
                     lblWarnMsg.Text = lblWarnMsg.Text + "   温湿度报警[" + boxBean.humBean.TempAlarmTime.ToLongTimeString() + "]";
                     lblWarnMsg.Text = lblWarnMsg.Text + "   温湿度报警[" + boxBean.humBean.TempAlarmTime.ToLongTimeString() + "]";
                 }
                 }
                 if (lblWarnMsg.Text.Equals(""))
                 if (lblWarnMsg.Text.Equals(""))
                 {
                 {
-                    List<string> list = new List<string>(LineConnect.WaitInStoreList);
+                    List<string> list = new List<string>(boxBean.lineConnect.WaitInStoreList);
                     if (list.Count > 0)
                     if (list.Count > 0)
                     {
                     {
                         string msg = "等待入库：";
                         string msg = "等待入库：";
@@ -229,11 +247,8 @@ namespace OnlineStore.ACSingleStore
                 if (boxBean.autoNext)
                 if (boxBean.autoNext)
                 {
                 {
                     string msg = boxBean.autoMsg;
                     string msg = boxBean.autoMsg;
-                    lblMsg.Text = msg;
-                    //if (btnStartAuTo.Text.Equals("开始自动出入库"))
-                    //{
-                    //    btnStartAuTo.Text = "停止自动出入库";
-                    //}
+                    lblAutoMsg.Text = msg;
+
                     try
                     try
                     {
                     {
                         msg = msg.Replace("自动出库：", "");
                         msg = msg.Replace("自动出库：", "");
@@ -273,10 +288,33 @@ namespace OnlineStore.ACSingleStore
                 lblWarnMsg.Text = "";
                 lblWarnMsg.Text = "";
                 btnStartAuTo.Text = "开始自动出入库";
                 btnStartAuTo.Text = "开始自动出入库";
                 btnCon.Visible = false;
                 btnCon.Visible = false;
-            } 
+            }
+        }
+        private void ReadIOList()
+        {
+            foreach (string key in DIControlList.Keys)
+            {
+                IOTextControl control = DIControlList[key];
+                int iov = (int)boxBean.IOValue(key);
+                if (iov != control.IOValue)
+                {
+                    control.IOValue = iov;
+                    control.ShowData();
+                }
+            }
+            foreach (string key in this.DOControlList.Keys)
+            {
+                IOTextControl control = DOControlList[key];
+                int iov = (int)IOManager.DOValue(key,boxBean.DeviceID);
+                if (iov != control.IOValue)
+                {
+                    control.IOValue = iov;
+                    control.ShowData();
+                }
+            }
+
         }
         }
 
 
-      
         private void ReadA(ConfigMoveAxis axis,TextBox lblActual, TextBox lblTarget,TextBox lblT )
         private void ReadA(ConfigMoveAxis axis,TextBox lblActual, TextBox lblTarget,TextBox lblT )
         {
         {
            
            
@@ -287,8 +325,7 @@ namespace OnlineStore.ACSingleStore
                 lblTarget.Text = string.Format("{0:d}", tP);
                 lblTarget.Text = string.Format("{0:d}", tP);
                 int aP = AxisManager.instance.GetActualtPosition(axis.DeviceName, axis.GetAxisValue());
                 int aP = AxisManager.instance.GetActualtPosition(axis.DeviceName, axis.GetAxisValue());
                 lblActual.Text = string.Format("{0:d}", aP);
                 lblActual.Text = string.Format("{0:d}", aP);
-                lblT.Text = axis.TargetPosition.ToString();
-             
+                lblT.Text = axis.TargetPosition.ToString(); 
             }
             }
         }
         }
      
      
@@ -303,6 +340,7 @@ namespace OnlineStore.ACSingleStore
         }
         }
         private void btnOutStore_Click(object sender, EventArgs e)
         private void btnOutStore_Click(object sender, EventArgs e)
         {
         {
+            LogUtil.info(boxBean.Name + "点击：出库测试");
             if (boxBean.storeRunStatus >= StoreRunStatus.HomeMoving)
             if (boxBean.storeRunStatus >= StoreRunStatus.HomeMoving)
             {
             {
                 string selectPositionNum = cmbPosition.Text;
                 string selectPositionNum = cmbPosition.Text;
@@ -319,6 +357,7 @@ namespace OnlineStore.ACSingleStore
         {
         {
             if (boxBean.storeRunStatus >= StoreRunStatus.HomeMoving)
             if (boxBean.storeRunStatus >= StoreRunStatus.HomeMoving)
             {
             {
+                LogUtil.info(boxBean.Name + "点击：入库测试");
                 string selectPositionNum = cmbPosition.Text;
                 string selectPositionNum = cmbPosition.Text;
                 LineMoveP ktk = LoadPostion();
                 LineMoveP ktk = LoadPostion();
                 boxBean.StartInStoreMove(new InOutParam(new InOutPosInfo( "", selectPositionNum), ktk));
                 boxBean.StartInStoreMove(new InOutParam(new InOutPosInfo( "", selectPositionNum), ktk));
@@ -387,6 +426,7 @@ namespace OnlineStore.ACSingleStore
         
         
         private void btnSavePosition_Click(object sender, EventArgs e)
         private void btnSavePosition_Click(object sender, EventArgs e)
         {
         {
+            LogUtil.info(boxBean.Name + "点击：保存位置");
             //料仓格子位置保存
             //料仓格子位置保存
             string selectPositionNum = cmbPosition.Text;
             string selectPositionNum = cmbPosition.Text;
             ACStorePosition ktkPosition = CSVPositionReader<ACStorePosition>.GetPositon(selectPositionNum);
             ACStorePosition ktkPosition = CSVPositionReader<ACStorePosition>.GetPositon(selectPositionNum);
@@ -495,6 +535,7 @@ namespace OnlineStore.ACSingleStore
         } 
         } 
         private void AxisABSMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed)
         private void AxisABSMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed)
         {
         {
+            LogUtil.info(boxBean.Name + " 点击点位运动：" + moveAxis.DisplayStr + " [" + targetPosition + "] [" + targetSpeed + "] ");
             moveAxis.TargetPosition = targetPosition; 
             moveAxis.TargetPosition = targetPosition; 
             AxisManager.instance.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
             AxisManager.instance.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
         }
         }
@@ -646,7 +687,8 @@ namespace OnlineStore.ACSingleStore
 
 
         private void button1_Click(object sender, EventArgs e)
         private void button1_Click(object sender, EventArgs e)
         {
         {
-            FormManager.ShowAxisDebug(boxBean);
+            FrmAxisDebug frm = new FrmAxisDebug(boxBean);
+            frm.ShowDialog();
         }
         }
 
 
         private void btnStartAuTo_Click(object sender, EventArgs e)
         private void btnStartAuTo_Click(object sender, EventArgs e)
@@ -690,58 +732,44 @@ namespace OnlineStore.ACSingleStore
         {
         {
             button1_Click(null, null);
             button1_Click(null, null);
         } 
         } 
-        private void 启动ToolStripMenuItem_Click(object sender, EventArgs e)
+        private void btnStoreStart_Click(object sender, EventArgs e)
         {
         {
-            boxBean.StartRun();
-            if (boxBean.storeRunStatus >= StoreRunStatus.HomeMoving)
+            if (boxBean.storeRunStatus > StoreRunStatus.Wait)
+            {
+                LogUtil.info(boxBean.Name + "点击：启用调试");
+                boxBean.StartRun();
+                if (boxBean.storeRunStatus >= StoreRunStatus.HomeMoving)
+                {
+                    StoreOpenStatus(true);
+                }
+            }
+            else
             {
             {
-                StoreOpenStatus(true);
+                LogUtil.info(boxBean.Name + "点击：复位");
+                this.boxBean.Reset(); 
             }
             }
         }
         }
 
 
         private void 停止ToolStripMenuItem_Click(object sender, EventArgs e)
         private void 停止ToolStripMenuItem_Click(object sender, EventArgs e)
         {
         {
+            LogUtil.info(boxBean.Name + "点击：停止");
             StopMove();
             StopMove();
-        }
-
-        private void 复位ToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            this.boxBean.Reset();
-            btnSotreReset.Enabled = false; 
         } 
         } 
         private void 料仓运转ONToolStripMenuItem_Click(object sender, EventArgs e)
         private void 料仓运转ONToolStripMenuItem_Click(object sender, EventArgs e)
         {
         {
+            LogUtil.info(boxBean.Name + "打开所有伺服");
             this.Enabled = false;
             this.Enabled = false;
-            boxBean.RunAxis(false );
+            boxBean.OpenAllAxis(false );
             this.Enabled = true;
             this.Enabled = true;
-            LogUtil.info("料仓运转ON完成");
+            LogUtil.info(boxBean.Name + "打开所有伺服 完成");
         } 
         } 
 
 
         private void 料仓运转OFFToolStripMenuItem_Click(object sender, EventArgs e)
         private void 料仓运转OFFToolStripMenuItem_Click(object sender, EventArgs e)
         {
         {
+            LogUtil.info(boxBean.Name + "关闭所有伺服");
             boxBean.CloseAllAxis();
             boxBean.CloseAllAxis();
-            LogUtil.info("料仓运转OFF完成");
-        } 
-
-        private void 回待机点ToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (boxBean.storeRunStatus >= StoreRunStatus.HomeMoving)
-            {
-                if (boxBean.MoveInfo.MoveType.Equals(StoreMoveType.None) && boxBean.alarmType.Equals(StoreAlarmType.None))
-                {
-                    boxBean.MoveToP1();
-                }
-                else
-                {
-                    MessageBox.Show("无报警，无出入库或者重置操作时，才可以回待机点！");
-                }
-            }
-            else
-            {
-                MessageBox.Show("请先启动料仓！");
-            }
-        }
-         
+            LogUtil.info(boxBean.Name + "关闭所有伺服 完成");
+        }  
         private void FrmStoreBox_Shown(object sender, EventArgs e)
         private void FrmStoreBox_Shown(object sender, EventArgs e)
         { 
         { 
             this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
             this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
@@ -776,7 +804,7 @@ namespace OnlineStore.ACSingleStore
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
-                LogUtil.error( "出错：" + ex.StackTrace);
+                LogUtil.error(boxBean.Name + "出错：" + ex.StackTrace);
             }
             }
         }
         }
         private void ExitApp()
         private void ExitApp()
@@ -793,11 +821,6 @@ namespace OnlineStore.ACSingleStore
                 }
                 }
                 axisMoveControl1.StopTimer( );
                 axisMoveControl1.StopTimer( );
                 StoreOpenStatus(false);
                 StoreOpenStatus(false);
-                //IOManager.instance.CloseAllDO();
-                //IOManager.instance.CloseAllConnection();
-
-                //AxisManager.instance.CloseAllPort();
-                //System.Environment.Exit(System.Environment.ExitCode);
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
@@ -812,25 +835,25 @@ namespace OnlineStore.ACSingleStore
 
 
         private void button3_Click(object sender, EventArgs e)
         private void button3_Click(object sender, EventArgs e)
         {
         {
-            LineConnect.StartConnect();
+            boxBean.lineConnect.StartConnect();
         }
         }
 
 
         private void button5_Click(object sender, EventArgs e)
         private void button5_Click(object sender, EventArgs e)
         {
         {
-            LineConnect.StopConnect();
+            boxBean.lineConnect.StopConnect();
         }
         }
 
 
         private void button6_Click(object sender, EventArgs e)
         private void button6_Click(object sender, EventArgs e)
         {
         {
-            if (LineConnect.IsConnect())
+            if (boxBean.lineConnect.IsConnect())
             {
             {
-                int hasTray = (int)IOManager.IOValue(IO_Type.TrayCheck_Door);
+                int hasTray = (int)boxBean.IOValue(IO_Type.TrayCheck_Door);
                 StoreStatus ss = StoreStatus.StoreOnline;
                 StoreStatus ss = StoreStatus.StoreOnline;
                 if (boxBean.IsDebug)
                 if (boxBean.IsDebug)
                 {
                 {
                     ss = StoreStatus.Debugging;
                     ss = StoreStatus.Debugging;
                 }
                 }
-                StoreSendBean bean = new StoreSendBean(StoreManager.Config.DeviceID, StoreManager.Config.CID, (int)ss, (int)StoreRunStatus.Runing, hasTray, (int)StoreAlarmType.None);
+                StoreSendBean bean =  boxBean.lineConnect.GetBean((int)ss, (int)StoreRunStatus.Runing, hasTray, (int)StoreAlarmType.None);
                 //bean.data.Add(ParamDefine.posId, cmbPosition.Text);
                 //bean.data.Add(ParamDefine.posId, cmbPosition.Text);
                 //bean.data.Add(ParamDefine.plateH, "8");
                 //bean.data.Add(ParamDefine.plateH, "8");
                 //bean.data.Add(ParamDefine.plateW, "7");
                 //bean.data.Add(ParamDefine.plateW, "7");
@@ -840,7 +863,7 @@ namespace OnlineStore.ACSingleStore
                 //bean.data.Add(ParamDefine.rfid, "E99");
                 //bean.data.Add(ParamDefine.rfid, "E99");
                 //bean.data.Add(ParamDefine.rfidLoc, 72.ToString());
                 //bean.data.Add(ParamDefine.rfidLoc, 72.ToString());
                 //bean.data.Add(ParamDefine.barcode, "code");
                 //bean.data.Add(ParamDefine.barcode, "code");
-                LineConnect.SendHeart(bean);
+                boxBean.lineConnect.SendHeart(bean);
             }
             }
         }
         }
 
 
@@ -859,8 +882,9 @@ namespace OnlineStore.ACSingleStore
                     if (result.Equals(DialogResult.Yes))
                     if (result.Equals(DialogResult.Yes))
                     {
                     {
                         boxBean.IsDebug = true;
                         boxBean.IsDebug = true;
-                        ConfigAppSettings.SaveValue(Setting_Init.IsInDebug, 1);
-                        LogUtil.info("用户切换到调试状态 ");
+                        boxBean.Config.ISDebug = 1;
+                        StoreManager.UpdateBoxConfig(boxBean.Config);
+                        LogUtil.info(boxBean.Name+"用户切换到调试状态 ");
                     }
                     }
                 }
                 }
             }
             }
@@ -871,9 +895,10 @@ namespace OnlineStore.ACSingleStore
                     DialogResult result = MessageBox.Show("是否切换到正常工作状态？", "是否确认切换", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
                     DialogResult result = MessageBox.Show("是否切换到正常工作状态？", "是否确认切换", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
                     if (result.Equals(DialogResult.Yes))
                     if (result.Equals(DialogResult.Yes))
                     {
                     {
-                        boxBean.IsDebug = false ;
-                        ConfigAppSettings.SaveValue(Setting_Init.IsInDebug, 0);
-                        LogUtil.info("用户切换到正常工作状态 ");
+                        boxBean.IsDebug = false;
+                        boxBean.Config.ISDebug = 0;
+                        StoreManager.UpdateBoxConfig(boxBean.Config);
+                        LogUtil.info(boxBean.Name + "用户切换到正常工作状态 ");
                     }
                     }
                 }
                 }
             }
             }
@@ -891,7 +916,7 @@ namespace OnlineStore.ACSingleStore
             {
             {
                 string ioIP = boxBean.Config.DIList[IO_Type.CheckPos].IO_IP;
                 string ioIP = boxBean.Config.DIList[IO_Type.CheckPos].IO_IP;
                 int ioIndex = boxBean.Config.DIList[IO_Type.CheckPos].GetIOAddr(); 
                 int ioIndex = boxBean.Config.DIList[IO_Type.CheckPos].GetIOAddr(); 
-                FrmPositionTool frm = new FrmPositionTool(boxBean.Config.UpDown_Axis, ioIP, ioIndex);
+                FrmPositionTool frm = new FrmPositionTool(boxBean.Config.UpDown_Axis, ioIP, ioIndex,boxBean.Name);
                 frm.ShowDialog();
                 frm.ShowDialog();
             }
             }
             else
             else
@@ -971,5 +996,68 @@ namespace OnlineStore.ACSingleStore
             btnCon.Visible = false;
             btnCon.Visible = false;
             boxBean.ContinueOut();
             boxBean.ContinueOut();
         }
         }
+
+        private ConfigIO GetSelectDO()
+        {
+            string text = cmbWriteIO.SelectedValue.ToString();
+            if (boxBean.Config.DOList.ContainsKey(text))
+            {
+                ConfigIO io = boxBean.Config.DOList[text];
+                return io;
+            }
+            return null;
+        }
+        IOTextControl selectControl = null;
+        private void cmbWriteIO_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (cmbWriteIO.SelectedIndex >= 0)
+            {
+                ConfigIO io = GetSelectDO();
+                if (io != null)
+                {
+                    // txtIp.Text = io.DeviceName;
+                    txtDOIndex.Text = io.GetIOAddr().ToString();
+                    txtDoName.Text = io.IO_IP;
+                    IOTextControl newControl = DOControlList[io.ProName];
+                    selectControl = newControl;
+                }
+            }
+        }
+        private void WriteDO(IO_VALUE value)
+        {
+            string deviceName = txtDoName.Text;
+            int index = FormUtil.GetIntValue(txtDOIndex);
+            //   IO_VALUE value = checkBox1.Checked ? IO_VALUE.HIGH : IO_VALUE.LOW;
+            int time = FormUtil.GetIntValue(txtWriteTime);
+            int slaveId = 0;
+            if (time > 0)
+            {
+                IOManager.instance.WriteSingleDO(deviceName, (byte)slaveId, (ushort)index, (IO_VALUE)value, time);
+            }
+            else
+            {
+                IOManager.instance.WriteSingleDO(deviceName, (byte)slaveId, (ushort)index, (IO_VALUE)value);
+            }
+        }
+        private void btnOpenDo_Click(object sender, EventArgs e)
+        {
+            WriteDO(IO_VALUE.HIGH);
+        }
+
+        private void btnCloseDO_Click(object sender, EventArgs e)
+        {
+            WriteDO(IO_VALUE.LOW);
+        }
+
+        private void btnOpenDoor_Click(object sender, EventArgs e)
+        {
+            boxBean.OpenDoor(false);
+        }
+        private void btnCloseDoor_Click(object sender, EventArgs e)
+        {
+            boxBean.CloseDoor(false);
+        }
+
+
     }
     }
 }
 }

source/HCSingleStore/FrmIDConfig.Designer.cs

@@ -37,8 +37,9 @@
             this.txtLineAddr = new System.Windows.Forms.TextBox();
             this.txtLineAddr = new System.Windows.Forms.TextBox();
             this.txthttpAddr = new System.Windows.Forms.TextBox();
             this.txthttpAddr = new System.Windows.Forms.TextBox();
             this.btnReset = new System.Windows.Forms.Button();
             this.btnReset = new System.Windows.Forms.Button();
-            this.chbDebug = new System.Windows.Forms.CheckBox();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.lblRightCid = new System.Windows.Forms.Label();
+            this.lblLeftCid = new System.Windows.Forms.Label();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.cmbPosition15 = new System.Windows.Forms.ComboBox();
             this.cmbPosition15 = new System.Windows.Forms.ComboBox();
             this.label6 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
@@ -73,18 +74,18 @@
             // 
             // 
             this.label1.AutoSize = true;
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(20, 118);
+            this.label1.Location = new System.Drawing.Point(55, 121);
             this.label1.Name = "label1";
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(104, 17);
+            this.label1.Size = new System.Drawing.Size(65, 17);
             this.label1.TabIndex = 0;
             this.label1.TabIndex = 0;
-            this.label1.Text = "请选择料仓编号：";
+            this.label1.Text = "料仓CID：";
             // 
             // 
             // btnNext
             // btnNext
             // 
             // 
             this.btnNext.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.btnNext.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnNext.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnNext.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnNext.Location = new System.Drawing.Point(280, 167);
+            this.btnNext.Location = new System.Drawing.Point(332, 190);
             this.btnNext.Name = "btnNext";
             this.btnNext.Name = "btnNext";
             this.btnNext.Size = new System.Drawing.Size(120, 45);
             this.btnNext.Size = new System.Drawing.Size(120, 45);
             this.btnNext.TabIndex = 275;
             this.btnNext.TabIndex = 275;
@@ -96,9 +97,9 @@
             // 
             // 
             this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnBack.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnBack.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnBack.Location = new System.Drawing.Point(379, 538);
+            this.btnBack.Location = new System.Drawing.Point(344, 576);
             this.btnBack.Name = "btnBack";
             this.btnBack.Name = "btnBack";
-            this.btnBack.Size = new System.Drawing.Size(183, 45);
+            this.btnBack.Size = new System.Drawing.Size(120, 45);
             this.btnBack.TabIndex = 274;
             this.btnBack.TabIndex = 274;
             this.btnBack.Text = "取消/返回";
             this.btnBack.Text = "取消/返回";
             this.btnBack.UseVisualStyleBackColor = false;
             this.btnBack.UseVisualStyleBackColor = false;
@@ -111,7 +112,7 @@
             this.cmbId.FormattingEnabled = true;
             this.cmbId.FormattingEnabled = true;
             this.cmbId.Location = new System.Drawing.Point(128, 114);
             this.cmbId.Location = new System.Drawing.Point(128, 114);
             this.cmbId.Name = "cmbId";
             this.cmbId.Name = "cmbId";
-            this.cmbId.Size = new System.Drawing.Size(285, 29);
+            this.cmbId.Size = new System.Drawing.Size(111, 29);
             this.cmbId.TabIndex = 276;
             this.cmbId.TabIndex = 276;
             this.cmbId.SelectedIndexChanged += new System.EventHandler(this.cmbId_SelectedIndexChanged);
             this.cmbId.SelectedIndexChanged += new System.EventHandler(this.cmbId_SelectedIndexChanged);
             // 
             // 
@@ -119,7 +120,7 @@
             // 
             // 
             this.label2.AutoSize = true;
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(20, 30);
+            this.label2.Location = new System.Drawing.Point(19, 30);
             this.label2.Name = "label2";
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(104, 17);
             this.label2.Size = new System.Drawing.Size(104, 17);
             this.label2.TabIndex = 277;
             this.label2.TabIndex = 277;
@@ -129,7 +130,7 @@
             // 
             // 
             this.label3.AutoSize = true;
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(44, 73);
+            this.label3.Location = new System.Drawing.Point(43, 73);
             this.label3.Name = "label3";
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(80, 17);
             this.label3.Size = new System.Drawing.Size(80, 17);
             this.label3.TabIndex = 278;
             this.label3.TabIndex = 278;
@@ -166,21 +167,10 @@
             this.btnReset.UseVisualStyleBackColor = false;
             this.btnReset.UseVisualStyleBackColor = false;
             this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
             this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
             // 
             // 
-            // chbDebug
-            // 
-            this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.chbDebug.AutoSize = true;
-            this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbDebug.Location = new System.Drawing.Point(125, 178);
-            this.chbDebug.Name = "chbDebug";
-            this.chbDebug.Size = new System.Drawing.Size(93, 25);
-            this.chbDebug.TabIndex = 282;
-            this.chbDebug.Text = "调试状态";
-            this.chbDebug.UseVisualStyleBackColor = true;
-            // 
             // groupBox1
             // groupBox1
             // 
             // 
-            this.groupBox1.Controls.Add(this.chbDebug);
+            this.groupBox1.Controls.Add(this.lblRightCid);
+            this.groupBox1.Controls.Add(this.lblLeftCid);
             this.groupBox1.Controls.Add(this.label1);
             this.groupBox1.Controls.Add(this.label1);
             this.groupBox1.Controls.Add(this.btnReset);
             this.groupBox1.Controls.Add(this.btnReset);
             this.groupBox1.Controls.Add(this.btnNext);
             this.groupBox1.Controls.Add(this.btnNext);
@@ -191,10 +181,34 @@
             this.groupBox1.Controls.Add(this.label3);
             this.groupBox1.Controls.Add(this.label3);
             this.groupBox1.Location = new System.Drawing.Point(12, 6);
             this.groupBox1.Location = new System.Drawing.Point(12, 6);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(550, 236);
+            this.groupBox1.Size = new System.Drawing.Size(550, 262);
             this.groupBox1.TabIndex = 283;
             this.groupBox1.TabIndex = 283;
             this.groupBox1.TabStop = false;
             this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "料仓配置";
+            this.groupBox1.Text = "料仓地址配置";
+            // 
+            // lblRightCid
+            // 
+            this.lblRightCid.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.lblRightCid.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.lblRightCid.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblRightCid.Location = new System.Drawing.Point(126, 203);
+            this.lblRightCid.Name = "lblRightCid";
+            this.lblRightCid.Size = new System.Drawing.Size(147, 32);
+            this.lblRightCid.TabIndex = 284;
+            this.lblRightCid.Text = "右侧：";
+            this.lblRightCid.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // lblLeftCid
+            // 
+            this.lblLeftCid.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.lblLeftCid.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.lblLeftCid.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblLeftCid.Location = new System.Drawing.Point(126, 158);
+            this.lblLeftCid.Name = "lblLeftCid";
+            this.lblLeftCid.Size = new System.Drawing.Size(145, 30);
+            this.lblLeftCid.TabIndex = 283;
+            this.lblLeftCid.Text = "左侧：";
+            this.lblLeftCid.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // 
             // groupBox2
             // groupBox2
             // 
             // 
@@ -330,7 +344,7 @@
             this.btnSavePosID.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.btnSavePosID.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.btnSavePosID.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnSavePosID.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnSavePosID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSavePosID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSavePosID.Location = new System.Drawing.Point(35, 538);
+            this.btnSavePosID.Location = new System.Drawing.Point(104, 576);
             this.btnSavePosID.Name = "btnSavePosID";
             this.btnSavePosID.Name = "btnSavePosID";
             this.btnSavePosID.Size = new System.Drawing.Size(120, 45);
             this.btnSavePosID.Size = new System.Drawing.Size(120, 45);
             this.btnSavePosID.TabIndex = 277;
             this.btnSavePosID.TabIndex = 277;
@@ -342,7 +356,7 @@
             // 
             // 
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage2);
             this.tabControl1.Controls.Add(this.tabPage2);
-            this.tabControl1.Location = new System.Drawing.Point(12, 248);
+            this.tabControl1.Location = new System.Drawing.Point(12, 277);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
             this.tabControl1.SelectedIndex = 0;
             this.tabControl1.Size = new System.Drawing.Size(550, 261);
             this.tabControl1.Size = new System.Drawing.Size(550, 261);
@@ -503,7 +517,7 @@
             // 
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(614, 668);
+            this.ClientSize = new System.Drawing.Size(589, 654);
             this.Controls.Add(this.btnSavePosID);
             this.Controls.Add(this.btnSavePosID);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.btnBack);
             this.Controls.Add(this.btnBack);
@@ -537,7 +551,6 @@
         private System.Windows.Forms.TextBox txtLineAddr;
         private System.Windows.Forms.TextBox txtLineAddr;
         private System.Windows.Forms.TextBox txthttpAddr;
         private System.Windows.Forms.TextBox txthttpAddr;
         private System.Windows.Forms.Button btnReset;
         private System.Windows.Forms.Button btnReset;
-        private System.Windows.Forms.CheckBox chbDebug;
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.ComboBox cmbPosition7;
         private System.Windows.Forms.ComboBox cmbPosition7;
@@ -561,5 +574,7 @@
         public System.Windows.Forms.Label label9;
         public System.Windows.Forms.Label label9;
         private System.Windows.Forms.ComboBox cmbBox2_7;
         private System.Windows.Forms.ComboBox cmbBox2_7;
         public System.Windows.Forms.Label label10;
         public System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label lblRightCid;
+        private System.Windows.Forms.Label lblLeftCid;
     }
     }
 }
 }
\ No newline at end of file

source/HCSingleStore/FrmIDConfig.cs

@@ -18,7 +18,13 @@ namespace OnlineStore.ACSingleStore
     {
     {
         public delegate void PwdOK(int type);
         public delegate void PwdOK(int type);
         public event PwdOK PwdOKFun;
         public event PwdOK PwdOKFun;
-        private int StoreId = 0;
+       
+        private string cid = "";
+        private string cid1 = "";
+        private string cid2 = "";
+        private int LeftId = 0;
+        private int RightId = 0;
+
         public FrmIdConfig()
         public FrmIdConfig()
         {
         {
             //StoreId = storeId;
             //StoreId = storeId;
@@ -32,22 +38,34 @@ namespace OnlineStore.ACSingleStore
 
 
         private void LoadData()
         private void LoadData()
         {
         {
+
+            cid = StoreManager.Config.CID;
+            cid1 = StoreManager.Store.BoxMap[1].CID;
+            cid2 = StoreManager.Store.BoxMap[2].CID;
+            LeftId = StoreManager.Store.BoxConfigMap[1].GetStoreId();
+            RightId = StoreManager.Store.BoxConfigMap[2].GetStoreId();
+
             this.DialogResult = DialogResult.None;
             this.DialogResult = DialogResult.None;
             txthttpAddr.Text = ConfigAppSettings.GetValue(Setting_Init.http_server);
             txthttpAddr.Text = ConfigAppSettings.GetValue(Setting_Init.http_server);
             txtLineAddr.Text = ConfigAppSettings.GetValue(Setting_Init.LineServerIp);
             txtLineAddr.Text = ConfigAppSettings.GetValue(Setting_Init.LineServerIp);
             cmbId.Items.Clear();
             cmbId.Items.Clear();
+            int index = 0;
             for (int i = 1; i <= 12; i++)
             for (int i = 1; i <= 12; i++)
             {
             {
-                cmbId.Items.Add("D"+i);
+                string n = "D" + i;
+                cmbId.Items.Add(n);
+                if (cid.Equals(n))
+                {
+                    index = i - 1;
+                }
 
 
             }
             }
-            if (StoreId > 0 && StoreId <= cmbId.Items.Count)
-            {
-                cmbId.SelectedIndex = StoreId - 1;
-            }
-            chbDebug.Checked = StoreManager.Store.IsDebug;
-
+            cmbId.SelectedIndex = index;
+           
             LoadPos();
             LoadPos();
+            lblLeftCid.Text = "左侧 : " + cid1;
+            lblRightCid.Text = "右侧 : " + cid2;
+             
         }
         }
 
 
          private List<string> allList1 = new List<string>();
          private List<string> allList1 = new List<string>();
@@ -90,9 +108,36 @@ namespace OnlineStore.ACSingleStore
 
 
         private void btnNext_Click(object sender, EventArgs e)
         private void btnNext_Click(object sender, EventArgs e)
         {
         {
-           
+            SaveConfig();
         }
         }
+        private void SaveConfig()
+        {
+            //int index = cmbId.SelectedIndex + 1;
+            DialogResult result = MessageBox.Show("更改料仓为[" + cid + "]，左侧CID ["+cid1+"]，右侧ICID ["+cid2+"] \r\n 重启客户端后生效", "确认提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
+            if (result.Equals(DialogResult.OK))
+            {
+                //string storeCID = "line-ac-" + index.ToString().PadLeft(2, '0');
+                ConfigAppSettings.SaveValue(Setting_Init.Store_CID, cid);
+                ConfigAppSettings.SaveValue(Setting_Init.Store_CID + "_1", cid1);
+                ConfigAppSettings.SaveValue(Setting_Init.Store_CID + "_2", cid2);
+
 
 
+                //如果总配置文件存在，保存到总的配置文件
+                string filePath1 = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.Store_Position_Config).Replace(".csv", "_1.csv");
+                LoadCSVLibrary.CSVPositionReader<ACStorePosition>.UpdatePostion(filePath1, LeftId);
+                string filePath2 = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.Store_Position_Config).Replace(".csv", "_2.csv");
+                LoadCSVLibrary.CSVPositionReader<ACStorePosition>.UpdatePostion(filePath2, RightId);
+
+                string httpstr = txthttpAddr.Text.Trim();
+                ConfigAppSettings.SaveValue(Setting_Init.http_server, httpstr);
+                string lineStr = txtLineAddr.Text.Trim();
+                ConfigAppSettings.SaveValue(Setting_Init.LineServerIp, lineStr); 
+
+                LogUtil.info("更改料仓为[" + cid + "]，左侧CID [" + cid1 + "]，右侧ICID [" + cid2 + "]，http_server ["+httpstr+"] ,LineServerIp ["+lineStr+"] ");
+                MessageBox.Show("保存成功，请重启客户端");
+                this.DialogResult = DialogResult.OK;
+            }
+        }
         private void btnBack_Click(object sender, EventArgs e)
         private void btnBack_Click(object sender, EventArgs e)
         {
         {
             this.DialogResult = DialogResult.Cancel;
             this.DialogResult = DialogResult.Cancel;
@@ -152,10 +197,12 @@ namespace OnlineStore.ACSingleStore
 
 
         private void btnSavePosID_Click(object sender, EventArgs e)
         private void btnSavePosID_Click(object sender, EventArgs e)
         {
         {
+            SavePosition();
         }
         }
 
 
         private void SaveP(int storeId, ComboBox box, int width)
         private void SaveP(int storeId, ComboBox box, int width)
         {
         {
+            string key = Setting_Init.Location_PosID_ + storeId + "_" + width;
             if (storeId.Equals(1))
             if (storeId.Equals(1))
             {
             {
                 string value = box.Text;
                 string value = box.Text;
@@ -168,7 +215,8 @@ namespace OnlineStore.ACSingleStore
                 {
                 {
                     value = "";
                     value = "";
                 }
                 }
-                ConfigAppSettings.SaveValue(Setting_Init.Location_PosID_ + storeId + "_" + width, value);
+                ConfigAppSettings.SaveValue(key, value);
+                LogUtil.info("更改配置：【" + key + "】=【" + value + "】");
             }
             }
             else if (storeId.Equals(2))
             else if (storeId.Equals(2))
             {
             {
@@ -182,41 +230,39 @@ namespace OnlineStore.ACSingleStore
                 {
                 {
                     value = "";
                     value = "";
                 }
                 }
-                ConfigAppSettings.SaveValue(Setting_Init.Location_PosID_ + storeId + "_" + width, value);
+                ConfigAppSettings.SaveValue(key, value);
+                LogUtil.info("更改配置：【" + key + "】=【" + value + "】");
             }
             }
         }
         }
-
         private void cmbId_SelectedIndexChanged(object sender, EventArgs e)
         private void cmbId_SelectedIndexChanged(object sender, EventArgs e)
         {
         {
-
-        }
-
-        private void SaveConfig()
-        {
-            int index = cmbId.SelectedIndex + 1;
-            DialogResult result = MessageBox.Show("更改料仓编号为[" + index + "],需要重启客户端", "确认提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Asterisk);
-            if (result.Equals(DialogResult.OK))
+            int index = cmbId.SelectedIndex;
+            if (index >= 0)
             {
             {
-                //  < add key = "Store_CID" value = "line-ac-01" />
-                //  <add key ="Store_ID" value ="1"/>
-                string storeCID = "line-ac-" + index.ToString().PadLeft(2, '0');
-                string storeId = index.ToString();
-                ConfigAppSettings.SaveValue(Setting_Init.Store_CID, storeCID);
-                ConfigAppSettings.SaveValue(Setting_Init.Store_ID, storeId);
-                //如果总配置文件存在，保存到总的配置文件
-                string filePath = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.Store_Position_Config);
-                LoadCSVLibrary.CSVPositionReader<ACStorePosition>.UpdatePostion(filePath, index);
+                int num = index + 1;
+                cid = "D" + num;
+                if (num <= 6)
+                {
+                    LeftId = num * 2 - 1;
+                    RightId = num * 2;
+                    cid1 = "line-ac-" + (LeftId).ToString().PadLeft(2, '0');
+                    cid2 = "line-ac-" + (RightId).ToString().PadLeft(2, '0');
+                }
+                else
+                {
+                    LeftId = num * 2;
+                    RightId = num * 2 - 1;
 
 
-                string httpstr = txthttpAddr.Text.Trim();
-                ConfigAppSettings.SaveValue(Setting_Init.http_server, httpstr);
-                string lineStr = txtLineAddr.Text.Trim();
-                ConfigAppSettings.SaveValue(Setting_Init.LineServerIp, lineStr);
-                StoreManager.Store.IsDebug = chbDebug.Checked;
-                ConfigAppSettings.SaveValue(Setting_Init.IsInDebug, chbDebug.Checked ? 1 : 0);
-                MessageBox.Show("保存成功，请重启客户端");
-                this.DialogResult = DialogResult.OK;
+                    cid1 = "line-ac-" + (num * 2 ).ToString().PadLeft(2, '0');
+                    cid2 = "line-ac-" + (num * 2 - 1).ToString().PadLeft(2, '0');
+                }
+
+                lblLeftCid.Text = "左侧 : " + cid1;
+                lblRightCid.Text = "右侧 : " + cid2;
             }
             }
         }
         }
+
+     
         private void SavePosition()
         private void SavePosition()
         {
         {
 
 

source/HCSingleStore/FrmIOStatus.Designer.cs

-namespace OnlineStore.ACSingleStore
-{
-    partial class FrmIOStatus
-    {
-        /// <summary>
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        #region Windows 窗体设计器生成的代码
-         
-        /// <summary>
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.btnOpenDo = new System.Windows.Forms.Button();
-            this.btnWriteSingleDO = new System.Windows.Forms.Button();
-            this.txtDOIndex = new System.Windows.Forms.TextBox();
-            this.txtDoName = new System.Windows.Forms.TextBox();
-            this.label17 = new System.Windows.Forms.Label();
-            this.label14 = new System.Windows.Forms.Label();
-            this.txtWriteTime = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.cmbWriteIO = new System.Windows.Forms.ComboBox();
-            this.btnCloseDoor = new System.Windows.Forms.Button();
-            this.btnOpenDoor = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
-            this.chbAutoRead = new System.Windows.Forms.CheckBox();
-            this.groupBox4 = new System.Windows.Forms.GroupBox();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.groupBox3 = new System.Windows.Forms.GroupBox();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.groupBox1.SuspendLayout();
-            this.groupBox4.SuspendLayout();
-            this.groupBox3.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // timer1
-            // 
-            this.timer1.Interval = 1000;
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.groupBox1.Controls.Add(this.btnOpenDo);
-            this.groupBox1.Controls.Add(this.btnWriteSingleDO);
-            this.groupBox1.Controls.Add(this.txtDOIndex);
-            this.groupBox1.Controls.Add(this.txtDoName);
-            this.groupBox1.Controls.Add(this.label17);
-            this.groupBox1.Controls.Add(this.label14);
-            this.groupBox1.Controls.Add(this.txtWriteTime);
-            this.groupBox1.Controls.Add(this.label5);
-            this.groupBox1.Controls.Add(this.cmbWriteIO);
-            this.groupBox1.Controls.Add(this.btnCloseDoor);
-            this.groupBox1.Controls.Add(this.btnOpenDoor);
-            this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBox1.Location = new System.Drawing.Point(485, 12);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(385, 365);
-            this.groupBox1.TabIndex = 105;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "DO写入";
-            // 
-            // btnOpenDo
-            // 
-            this.btnOpenDo.BackColor = System.Drawing.Color.White;
-            this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnOpenDo.Location = new System.Drawing.Point(124, 88);
-            this.btnOpenDo.Name = "btnOpenDo";
-            this.btnOpenDo.Size = new System.Drawing.Size(100, 35);
-            this.btnOpenDo.TabIndex = 274;
-            this.btnOpenDo.Text = "打开";
-            this.btnOpenDo.UseVisualStyleBackColor = false;
-            this.btnOpenDo.Click += new System.EventHandler(this.btnOpenDo_Click);
-            // 
-            // btnWriteSingleDO
-            // 
-            this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
-            this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnWriteSingleDO.Location = new System.Drawing.Point(228, 88);
-            this.btnWriteSingleDO.Name = "btnWriteSingleDO";
-            this.btnWriteSingleDO.Size = new System.Drawing.Size(100, 35);
-            this.btnWriteSingleDO.TabIndex = 273;
-            this.btnWriteSingleDO.Text = "关闭";
-            this.btnWriteSingleDO.UseVisualStyleBackColor = false;
-            this.btnWriteSingleDO.Click += new System.EventHandler(this.btnWriteSingleDO_Click);
-            // 
-            // txtDOIndex
-            // 
-            this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtDOIndex.Location = new System.Drawing.Point(277, 56);
-            this.txtDOIndex.MaxLength = 10;
-            this.txtDOIndex.Name = "txtDOIndex";
-            this.txtDOIndex.Size = new System.Drawing.Size(46, 26);
-            this.txtDOIndex.TabIndex = 242;
-            this.txtDOIndex.Text = "0";
-            // 
-            // txtDoName
-            // 
-            this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtDoName.Location = new System.Drawing.Point(72, 56);
-            this.txtDoName.MaxLength = 10;
-            this.txtDoName.Name = "txtDoName";
-            this.txtDoName.Size = new System.Drawing.Size(141, 26);
-            this.txtDoName.TabIndex = 241;
-            this.txtDoName.Text = "0";
-            // 
-            // label17
-            // 
-            this.label17.AutoSize = true;
-            this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label17.Location = new System.Drawing.Point(19, 61);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(46, 17);
-            this.label17.TabIndex = 240;
-            this.label17.Text = "设备IP:";
-            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label14
-            // 
-            this.label14.AutoSize = true;
-            this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label14.Location = new System.Drawing.Point(226, 61);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(44, 17);
-            this.label14.TabIndex = 239;
-            this.label14.Text = "地址：";
-            this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // txtWriteTime
-            // 
-            this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtWriteTime.Location = new System.Drawing.Point(70, 92);
-            this.txtWriteTime.MaxLength = 10;
-            this.txtWriteTime.Name = "txtWriteTime";
-            this.txtWriteTime.Size = new System.Drawing.Size(50, 26);
-            this.txtWriteTime.TabIndex = 238;
-            this.txtWriteTime.Text = "0";
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label5.Location = new System.Drawing.Point(6, 97);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(60, 17);
-            this.label5.TabIndex = 237;
-            this.label5.Text = "定时(ms):";
-            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // cmbWriteIO
-            // 
-            this.cmbWriteIO.DisplayMember = "ProName";
-            this.cmbWriteIO.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
-            this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cmbWriteIO.FormattingEnabled = true;
-            this.cmbWriteIO.Location = new System.Drawing.Point(22, 22);
-            this.cmbWriteIO.Name = "cmbWriteIO";
-            this.cmbWriteIO.Size = new System.Drawing.Size(307, 27);
-            this.cmbWriteIO.TabIndex = 234;
-            this.cmbWriteIO.ValueMember = "ProName";
-            this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
-            this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged);
-            // 
-            // btnCloseDoor
-            // 
-            this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCloseDoor.Location = new System.Drawing.Point(203, 146);
-            this.btnCloseDoor.Name = "btnCloseDoor";
-            this.btnCloseDoor.Size = new System.Drawing.Size(120, 35);
-            this.btnCloseDoor.TabIndex = 249;
-            this.btnCloseDoor.Text = "关闭仓门";
-            this.btnCloseDoor.UseVisualStyleBackColor = true;
-            this.btnCloseDoor.Click += new System.EventHandler(this.btnCloseDoor_Click);
-            // 
-            // btnOpenDoor
-            // 
-            this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnOpenDoor.Location = new System.Drawing.Point(56, 146);
-            this.btnOpenDoor.Name = "btnOpenDoor";
-            this.btnOpenDoor.Size = new System.Drawing.Size(120, 35);
-            this.btnOpenDoor.TabIndex = 248;
-            this.btnOpenDoor.Text = "打开仓门";
-            this.btnOpenDoor.UseVisualStyleBackColor = true;
-            this.btnOpenDoor.Click += new System.EventHandler(this.btnOpenDoor_Click);
-            // 
-            // button1
-            // 
-            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button1.Location = new System.Drawing.Point(655, 404);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(120, 35);
-            this.button1.TabIndex = 254;
-            this.button1.Text = "关闭";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // chbAutoRead
-            // 
-            this.chbAutoRead.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.chbAutoRead.AutoSize = true;
-            this.chbAutoRead.Checked = true;
-            this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbAutoRead.Location = new System.Drawing.Point(530, 409);
-            this.chbAutoRead.Name = "chbAutoRead";
-            this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
-            this.chbAutoRead.TabIndex = 244;
-            this.chbAutoRead.Text = "自动读取";
-            this.chbAutoRead.UseVisualStyleBackColor = true;
-            // 
-            // groupBox4
-            // 
-            this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.groupBox4.Controls.Add(this.tableLayoutPanel2);
-            this.groupBox4.Location = new System.Drawing.Point(247, 8);
-            this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(229, 446);
-            this.groupBox4.TabIndex = 104;
-            this.groupBox4.TabStop = false;
-            this.groupBox4.Text = "DO列表";
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.tableLayoutPanel2.ColumnCount = 1;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 2;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(218, 426);
-            this.tableLayoutPanel2.TabIndex = 103;
-            // 
-            // groupBox3
-            // 
-            this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.groupBox3.Controls.Add(this.tableLayoutPanel1);
-            this.groupBox3.Location = new System.Drawing.Point(12, 8);
-            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(229, 446);
-            this.groupBox3.TabIndex = 103;
-            this.groupBox3.TabStop = false;
-            this.groupBox3.Text = "DI列表";
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.tableLayoutPanel1.ColumnCount = 1;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 2;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 426);
-            this.tableLayoutPanel1.TabIndex = 102;
-            // 
-            // FrmIOStatus
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(888, 464);
-            this.Controls.Add(this.button1);
-            this.Controls.Add(this.groupBox1);
-            this.Controls.Add(this.groupBox4);
-            this.Controls.Add(this.groupBox3);
-            this.Controls.Add(this.chbAutoRead);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FrmIOStatus";
-            this.Text = "IO查看";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
-            this.Load += new System.EventHandler(this.FrmStoreIOStatus_Load);
-            this.Shown += new System.EventHandler(this.FrmIOStatus_Shown);
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            this.groupBox4.ResumeLayout(false);
-            this.groupBox3.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Timer timer1;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.GroupBox groupBox3;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-        private System.Windows.Forms.GroupBox groupBox4;
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.TextBox txtDOIndex;
-        private System.Windows.Forms.Label label17;
-        private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.TextBox txtWriteTime;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.ComboBox cmbWriteIO;
-        private System.Windows.Forms.CheckBox chbAutoRead;
-        private System.Windows.Forms.TextBox txtDoName;
-        private System.Windows.Forms.Button btnCloseDoor;
-        private System.Windows.Forms.Button btnOpenDoor;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Button btnOpenDo;
-        private System.Windows.Forms.Button btnWriteSingleDO;
-    }
-}
-

source/HCSingleStore/FrmIOStatus.cs

-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.IO;
-using System.Runtime.InteropServices;
-using OnlineStore.DeviceLibrary;
-using log4net;
-using System.Reflection;
-using UserFromControl;
-using OnlineStore.LoadCSVLibrary;
-using OnlineStore.Common;
-
-
-namespace OnlineStore.ACSingleStore
-{
-    public partial class FrmIOStatus : FrmBase
-    {
-        private int StoreId = 1;
-        private BoxBean boxBean;
-        //public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public FrmIOStatus()
-        {
-            Control.CheckForIllegalCrossThreadCalls = false;
-            InitializeComponent();
-        }
-        public FrmIOStatus(BoxBean store)
-        {
-            Control.CheckForIllegalCrossThreadCalls = false;
-            InitializeComponent();
-
-            this.boxBean = store;
-            this.StoreId = store.DeviceID;
-            LoadIOList();
-        }
-
-        Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>();
-        Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
-        private void LoadIOList()
-        {
-            int roleindex = 0;
-            this.tableLayoutPanel1.RowStyles.Clear();
-            this.tableLayoutPanel1.RowCount = boxBean.Config.DIList.Count;
-            foreach (ConfigIO ioValue in boxBean.Config.DIList.Values)
-            {
-                this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
-                IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
-                this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
-                roleindex++;
-                DIControlList.Add(ioValue.ProName, control);
-            }
-
-            tableLayoutPanel2.RowStyles.Clear();
-            this.tableLayoutPanel2.RowCount = boxBean.Config.DOList.Count;
-            roleindex = 0;
-            foreach (ConfigIO ioValue in boxBean.Config.DOList.Values)
-            {
-                this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
-                IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
-                this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
-                roleindex++;
-                DOControlList.Add(ioValue.ProName, control);
-            }
-            this.SuspendLayout();    //此处为不闪屏，一定要有的！ 
-
-            cmbWriteIO.DataSource = new List<ConfigIO>(boxBean.Config.DOList.Values);
-            cmbWriteIO.ValueMember = "ProName";
-            cmbWriteIO.DisplayMember = "DisplayStr"; 
-        }
-
-        private void timer1_Tick(object sender, EventArgs e)
-        {
-            if (chbAutoRead.Checked)
-            {
-                ReadIOList();
-            }
-        }
-
-        private void FrmTest_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            //KNDAIManager.NeedShow = false;
-            try
-            {
-                if (this.timer1.Enabled)
-                {
-                    this.timer1.Enabled = false;
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.StackTrace, "Exception(异常)", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                LogUtil.error( ex.StackTrace);
-            }
-        }
-      
-
-        private ConfigIO GetSelectDO()
-        {
-            string text = cmbWriteIO.SelectedValue.ToString();
-            if (boxBean.Config.DOList.ContainsKey(text))
-            {
-                ConfigIO io = boxBean.Config.DOList[text];
-                return io;
-            }
-            return null;
-        }
-        IOTextControl selectControl = null;
-        private void cmbWriteIO_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (cmbWriteIO.SelectedIndex >= 0)
-            {
-                ConfigIO io = GetSelectDO();
-                if (io != null)
-                {
-                    // txtIp.Text = io.DeviceName;
-                    txtDOIndex.Text = io.GetIOAddr().ToString();
-                    txtDoName.Text = io.IO_IP; 
-                    IOTextControl newControl = DOControlList[io.ProName];
-                    selectControl = newControl;
-                }
-            }
-        }
-
-        private void FrmStoreIOStatus_Load(object sender, EventArgs e)
-        {
-            //KNDAIManager.NeedShow = true;
-        }
-
-        private void cmbWriteIO_DrawItem(object sender, DrawItemEventArgs e)
-        {
-            if (e.Index < 0)
-            {
-                return;
-            }
-            e.DrawBackground();
-            e.DrawFocusRectangle();
-            if (cmbWriteIO.Items.Count > e.Index)
-            {
-                ConfigIO io = (ConfigIO)cmbWriteIO.Items[e.Index];
-                e.Graphics.DrawString(io.DisplayStr, e.Font, new SolidBrush(e.ForeColor), e.Bounds.X, e.Bounds.Y + 3);
-            }
-        }
-         
-
-        private void btnReadIO_Click(object sender, EventArgs e)
-        {
-            ReadIOList();
-        }
-
-        private void ReadIOList()
-        {
-            foreach (string key in DIControlList.Keys)
-            {
-                IOTextControl control = DIControlList[key];
-                int iov = (int)IOManager.IOValue(key);
-                if (iov != control.IOValue)
-                {
-                    control.IOValue = iov;
-                    control.ShowData();
-                }
-            } foreach (string key in this.DOControlList.Keys)
-            {
-                IOTextControl control = DOControlList[key];
-                int iov = (int)IOManager.DOValue(key);
-                if (iov != control.IOValue)
-                {
-                    control.IOValue = iov;
-                    control.ShowData();
-                }
-            }
-             
-        } 
-        private void btnOpenDoor_Click(object sender, EventArgs e)
-        { 
-            boxBean.OpenDoor(false);
-        } 
-        private void btnCloseDoor_Click(object sender, EventArgs e)
-        { 
-            boxBean.CloseDoor(false);
-        }
-
-
-        private void FrmIOStatus_Shown(object sender, EventArgs e)
-        { 
-            timer1.Start();
-        }
-
-        private void button1_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-
-        private void btnOpenDo_Click(object sender, EventArgs e)
-        {
-            WriteDO(IO_VALUE.HIGH);
-        }
-        private void btnWriteSingleDO_Click(object sender, EventArgs e)
-        {
-            WriteDO(IO_VALUE.LOW);
-        }
-        private void WriteDO(IO_VALUE value)
-        {
-            string deviceName = txtDoName.Text;
-            int index = FormUtil.GetIntValue(txtDOIndex);
-            //   IO_VALUE value = checkBox1.Checked ? IO_VALUE.HIGH : IO_VALUE.LOW;
-            int time = FormUtil.GetIntValue(txtWriteTime);
-            int slaveId = 0;
-            if (time > 0)
-            {
-                IOManager.instance.WriteSingleDO(deviceName, (byte)slaveId, (ushort)index, (IO_VALUE)value, time);
-            }
-            else
-            {
-                IOManager.instance.WriteSingleDO(deviceName, (byte)slaveId, (ushort)index, (IO_VALUE)value);
-            }
-        }
-    }
-}

source/HCSingleStore/FrmIOStatus.resx

-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 11</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
-  </metadata>
-</root>
\ No newline at end of file

source/HCSingleStore/FrmStore.Designer.cs

@@ -37,8 +37,6 @@
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.btnCopyLog = new System.Windows.Forms.Button();
-            this.btnClearLog = new System.Windows.Forms.Button();
             this.logBox = new System.Windows.Forms.RichTextBox();
             this.logBox = new System.Windows.Forms.RichTextBox();
             this.lblWarnMsg = new System.Windows.Forms.Label();
             this.lblWarnMsg = new System.Windows.Forms.Label();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
@@ -67,6 +65,10 @@
             this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
             this.版本号ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.版本号ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
+            this.复制日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
+            this.清空日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
             this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -102,8 +104,6 @@
             this.tabPage1.Controls.Add(this.lblServerMsg);
             this.tabPage1.Controls.Add(this.lblServerMsg);
             this.tabPage1.Controls.Add(this.groupBox4);
             this.tabPage1.Controls.Add(this.groupBox4);
             this.tabPage1.Controls.Add(this.groupBox3);
             this.tabPage1.Controls.Add(this.groupBox3);
-            this.tabPage1.Controls.Add(this.btnCopyLog);
-            this.tabPage1.Controls.Add(this.btnClearLog);
             this.tabPage1.Controls.Add(this.logBox);
             this.tabPage1.Controls.Add(this.logBox);
             this.tabPage1.Location = new System.Drawing.Point(4, 29);
             this.tabPage1.Location = new System.Drawing.Point(4, 29);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Name = "tabPage1";
@@ -173,30 +173,6 @@
             this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 114);
             this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 114);
             this.tableLayoutPanel1.TabIndex = 102;
             this.tableLayoutPanel1.TabIndex = 102;
             // 
             // 
-            // btnCopyLog
-            // 
-            this.btnCopyLog.BackColor = System.Drawing.Color.White;
-            this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnCopyLog.Location = new System.Drawing.Point(14, 584);
-            this.btnCopyLog.Name = "btnCopyLog";
-            this.btnCopyLog.Size = new System.Drawing.Size(105, 35);
-            this.btnCopyLog.TabIndex = 191;
-            this.btnCopyLog.Text = "复制日志";
-            this.btnCopyLog.UseVisualStyleBackColor = false;
-            this.btnCopyLog.Click += new System.EventHandler(this.btnCopyLog_Click);
-            // 
-            // btnClearLog
-            // 
-            this.btnClearLog.BackColor = System.Drawing.Color.White;
-            this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnClearLog.Location = new System.Drawing.Point(125, 584);
-            this.btnClearLog.Name = "btnClearLog";
-            this.btnClearLog.Size = new System.Drawing.Size(105, 35);
-            this.btnClearLog.TabIndex = 190;
-            this.btnClearLog.Text = "清空日志";
-            this.btnClearLog.UseVisualStyleBackColor = false;
-            this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
-            // 
             // logBox
             // logBox
             // 
             // 
             this.logBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             this.logBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -391,7 +367,11 @@
             this.帮助ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.帮助ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripMenuItem3,
             this.toolStripMenuItem3,
             this.toolStripSeparator9,
             this.toolStripSeparator9,
-            this.版本号ToolStripMenuItem});
+            this.版本号ToolStripMenuItem,
+            this.toolStripSeparator13,
+            this.复制日志ToolStripMenuItem,
+            this.toolStripSeparator12,
+            this.清空日志ToolStripMenuItem});
             this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem";
             this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem";
             this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(69, 25);
             this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(69, 25);
             this.帮助ToolStripMenuItem.Text = " 系统  ";
             this.帮助ToolStripMenuItem.Text = " 系统  ";
@@ -399,22 +379,46 @@
             // toolStripMenuItem3
             // toolStripMenuItem3
             // 
             // 
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(144, 26);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(180, 26);
             this.toolStripMenuItem3.Text = "料仓配置";
             this.toolStripMenuItem3.Text = "料仓配置";
             this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
             this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
             // 
             // 
             // toolStripSeparator9
             // toolStripSeparator9
             // 
             // 
             this.toolStripSeparator9.Name = "toolStripSeparator9";
             this.toolStripSeparator9.Name = "toolStripSeparator9";
-            this.toolStripSeparator9.Size = new System.Drawing.Size(141, 6);
+            this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
             // 
             // 
             // 版本号ToolStripMenuItem
             // 版本号ToolStripMenuItem
             // 
             // 
             this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
             this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
-            this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
+            this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.版本号ToolStripMenuItem.Text = "关于软件";
             this.版本号ToolStripMenuItem.Text = "关于软件";
             this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
             this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
             // 
             // 
+            // toolStripSeparator13
+            // 
+            this.toolStripSeparator13.Name = "toolStripSeparator13";
+            this.toolStripSeparator13.Size = new System.Drawing.Size(177, 6);
+            // 
+            // 复制日志ToolStripMenuItem
+            // 
+            this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem";
+            this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.复制日志ToolStripMenuItem.Text = "复制日志";
+            this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator12
+            // 
+            this.toolStripSeparator12.Name = "toolStripSeparator12";
+            this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6);
+            // 
+            // 清空日志ToolStripMenuItem
+            // 
+            this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem";
+            this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.清空日志ToolStripMenuItem.Text = "清空日志";
+            this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click);
+            // 
             // notifyIcon1
             // notifyIcon1
             // 
             // 
             this.notifyIcon1.ContextMenuStrip = this.contextMenuStrip1;
             this.notifyIcon1.ContextMenuStrip = this.contextMenuStrip1;
@@ -503,8 +507,6 @@
         private System.Windows.Forms.ToolStripMenuItem 复位RToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 复位RToolStripMenuItem;
         internal System.Windows.Forms.RichTextBox logBox;
         internal System.Windows.Forms.RichTextBox logBox;
         private System.Windows.Forms.Timer timer1;
         private System.Windows.Forms.Timer timer1;
-        private System.Windows.Forms.Button btnCopyLog;
-        private System.Windows.Forms.Button btnClearLog;
         private System.Windows.Forms.ToolStripMenuItem 设置TToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 设置TToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 版本号ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 版本号ToolStripMenuItem;
         private System.Windows.Forms.TabPage tabPage1;
         private System.Windows.Forms.TabPage tabPage1;
@@ -533,6 +535,10 @@
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
         private System.Windows.Forms.ToolStripMenuItem 开启DEBUG日志ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 开启DEBUG日志ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 板卡调试ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 板卡调试ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
+        private System.Windows.Forms.ToolStripMenuItem 复制日志ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
+        private System.Windows.Forms.ToolStripMenuItem 清空日志ToolStripMenuItem;
     }
     }
 }
 }
 
 

source/HCSingleStore/FrmStore.cs

@@ -19,7 +19,7 @@ using UserFromControl;
 
 
 namespace OnlineStore.ACSingleStore
 namespace OnlineStore.ACSingleStore
 {
 {
-    internal partial class FrmStore : Form
+    internal partial class FrmStore : FrmBase
     { 
     { 
         public static StoreBean store = null;
         public static StoreBean store = null;
         private List<TabPage> tabPageList = new List<TabPage>();
         private List<TabPage> tabPageList = new List<TabPage>();
@@ -36,8 +36,8 @@ namespace OnlineStore.ACSingleStore
 
 
 
 
         private void FrmMain_Load(object sender, EventArgs e)
         private void FrmMain_Load(object sender, EventArgs e)
-        { 
-            FrmBase.GetVersion();
+        {
+            string version = GetVersion(true);
             store = StoreManager.InitStore();
             store = StoreManager.InitStore();
             if (store == null)
             if (store == null)
             {
             {
@@ -45,14 +45,8 @@ namespace OnlineStore.ACSingleStore
                 return;
                 return;
             }
             }
             LoadIOList();
             LoadIOList();
-            foreach (BoxBean box in store.BoxMap.Values)
-            {
-                FrmBox frm = new FrmBox();
-                frm.boxBean = box;
-                AddForm(box.Name, frm);
-            }
-             
-            this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title); 
+          
+            this.Text = "环形线料仓-" + store.Config.CID;
             int autoValue = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun);
             int autoValue = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun);
             if (autoValue.Equals(1))
             if (autoValue.Equals(1))
             {
             {
@@ -70,8 +64,16 @@ namespace OnlineStore.ACSingleStore
             {
             {
                 启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
                 启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
             }
             }
+            foreach (BoxBean box in store.BoxMap.Values)
+            {
+                FrmBox frm = new FrmBox();
+                frm.boxBean = box;
+                AddForm(box.Name, frm);
+            }
+
             LoadOk = true;
             LoadOk = true;
-            LogUtil.logBox = this.logBox; 
+            LogUtil.logBox = this.logBox;
+            HCLogUtil.logBox = this.logBox;
             this.timer1.Start();
             this.timer1.Start();
         }
         }
 
 
@@ -187,7 +189,7 @@ namespace OnlineStore.ACSingleStore
 
 
         private void ExitApp()
         private void ExitApp()
         {
         {
-            DialogResult result = MessageBox.Show("是否确定退出包装料料仓客户端？", "提示", MessageBoxButtons.YesNo);
+            DialogResult result = MessageBox.Show("是否确定退出料仓客户端？", "提示", MessageBoxButtons.YesNo);
             if (result.Equals(DialogResult.Yes))
             if (result.Equals(DialogResult.Yes))
             {
             {
                 //如果料仓还在运行状态，先关闭料仓
                 //如果料仓还在运行状态，先关闭料仓
@@ -211,6 +213,7 @@ namespace OnlineStore.ACSingleStore
                 IOManager.instance.CloseAllDO();
                 IOManager.instance.CloseAllDO();
                 IOManager.instance.CloseAllConnection(); 
                 IOManager.instance.CloseAllConnection(); 
                 AxisManager.instance.CloseAllPort();
                 AxisManager.instance.CloseAllPort();
+                AxisManager.instance.CloseCard();
                
                
                 //this.Close();
                 //this.Close();
                 System.Environment.Exit(System.Environment.ExitCode);
                 System.Environment.Exit(System.Environment.ExitCode);
@@ -247,7 +250,7 @@ namespace OnlineStore.ACSingleStore
                 MessageBox.Show(store.Name + "当前状态：" + store.storeRunStatus + "，不能启动！");
                 MessageBox.Show(store.Name + "当前状态：" + store.storeRunStatus + "，不能启动！");
                 return;
                 return;
             }
             }
-            LogUtil.info( "开始启动");
+            LogUtil.info(store.Name+ "点击：启动");
             startTimer.Interval = 300;
             startTimer.Interval = 300;
             startTimer.Elapsed += timer_Elapsed;
             startTimer.Elapsed += timer_Elapsed;
             startTimer.AutoReset = false;
             startTimer.AutoReset = false;
@@ -305,11 +308,12 @@ namespace OnlineStore.ACSingleStore
         }
         }
         private void 停止所有料仓TToolStripMenuItem_Click(object sender, EventArgs e)
         private void 停止所有料仓TToolStripMenuItem_Click(object sender, EventArgs e)
         {
         {
+            LogUtil.info(store.Name + "点击：停止");
             if (store != null)
             if (store != null)
             {
             {
                 if (store.storeRunStatus.Equals(StoreRunStatus.Wait))
                 if (store.storeRunStatus.Equals(StoreRunStatus.Wait))
                 {
                 {
-                    MessageBox.Show(store.Name + "包装料料仓未启动，不需要停止");
+                    MessageBox.Show(store.Name + "料仓未启动，不需要停止");
                     return;
                     return;
                 }
                 }
                 if (store != null)
                 if (store != null)
@@ -322,9 +326,10 @@ namespace OnlineStore.ACSingleStore
 
 
         private void 复位RToolStripMenuItem_Click(object sender, EventArgs e)
         private void 复位RToolStripMenuItem_Click(object sender, EventArgs e)
         {
         {
+            LogUtil.info(store.Name + "点击：复位");
             if (store.storeRunStatus.Equals(StoreRunStatus.Wait))
             if (store.storeRunStatus.Equals(StoreRunStatus.Wait))
             {
             {
-                MessageBox.Show(store.Name + "包装料料仓未启动，无法复位");
+                MessageBox.Show(store.Name + "料仓未启动，无法复位");
                 return;
                 return;
             }
             }
             store.Reset();
             store.Reset();
@@ -438,6 +443,7 @@ namespace OnlineStore.ACSingleStore
         } 
         } 
         private void 退出ToolStripMenuItem_Click_1(object sender, EventArgs e)
         private void 退出ToolStripMenuItem_Click_1(object sender, EventArgs e)
         {
         {
+            LogUtil.info(store.Name + "点击：退出");
             ExitApp();
             ExitApp();
         }
         }
 
 
@@ -450,10 +456,12 @@ namespace OnlineStore.ACSingleStore
         {
         {
             if (toolStripMenuItem2.Text .Equals("启用调试"))
             if (toolStripMenuItem2.Text .Equals("启用调试"))
             {
             {
+                LogUtil.info(store.Name + "点击：启用调试");
                 DebugOpen(true );
                 DebugOpen(true );
             }
             }
             else
             else
             {
             {
+                LogUtil.info(store.Name + "点击：禁用调试");
                 DebugOpen(false);
                 DebugOpen(false);
             }
             }
         }
         }
@@ -602,6 +610,18 @@ namespace OnlineStore.ACSingleStore
         {
         {
             FrmHuiChuanTest frm = new FrmHuiChuanTest();
             FrmHuiChuanTest frm = new FrmHuiChuanTest();
             frm.ShowDialog();
             frm.ShowDialog();
+            HCLogUtil.logBox = this.logBox;
+        }
+
+        private void 复制日志ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            Clipboard.SetDataObject(logBox.Text);
+            MessageBox.Show("已复制日志到粘贴板！");
+        }
+
+        private void 清空日志ToolStripMenuItem_Click(object sender, EventArgs e)
+        { 
+            LogUtil.ClearLog();
         }
         }
     }
     }
 }
 }

source/HCSingleStore/HCSingleStore.csproj

@@ -75,7 +75,6 @@
     </Reference>
     </Reference>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Compile Include="FormManager.cs" />
     <Compile Include="FrmAxisDebug.cs">
     <Compile Include="FrmAxisDebug.cs">
       <SubType>Form</SubType>
       <SubType>Form</SubType>
     </Compile>
     </Compile>
@@ -88,12 +87,6 @@
     <Compile Include="FrmBase.Designer.cs">
     <Compile Include="FrmBase.Designer.cs">
       <DependentUpon>FrmBase.cs</DependentUpon>
       <DependentUpon>FrmBase.cs</DependentUpon>
     </Compile>
     </Compile>
-    <Compile Include="FrmIOStatus.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FrmIOStatus.Designer.cs">
-      <DependentUpon>FrmIOStatus.cs</DependentUpon>
-    </Compile>
     <Compile Include="FrmAbout.cs">
     <Compile Include="FrmAbout.cs">
       <SubType>Form</SubType>
       <SubType>Form</SubType>
     </Compile>
     </Compile>
@@ -145,9 +138,6 @@
     <EmbeddedResource Include="FrmBase.resx">
     <EmbeddedResource Include="FrmBase.resx">
       <DependentUpon>FrmBase.cs</DependentUpon>
       <DependentUpon>FrmBase.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
-    <EmbeddedResource Include="FrmIOStatus.resx">
-      <DependentUpon>FrmIOStatus.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FrmAbout.resx">
     <EmbeddedResource Include="FrmAbout.resx">
       <DependentUpon>FrmAbout.cs</DependentUpon>
       <DependentUpon>FrmAbout.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>

source/HCSingleStore/Program.cs

@@ -71,7 +71,7 @@ namespace OnlineStore.ACSingleStore
                         // 如果进程的句柄为0，即代表没有找到该窗体，即该窗体隐藏的情况时
                         // 如果进程的句柄为0，即代表没有找到该窗体，即该窗体隐藏的情况时
                         if (process.MainWindowHandle.ToInt32().Equals(0))
                         if (process.MainWindowHandle.ToInt32().Equals(0))
                         {
                         {
-                            string formTitle = ConfigAppSettings.GetValue(Setting_Init.App_Title);
+                            string formTitle = "环形线料仓-" + ConfigAppSettings.GetValue(Setting_Init.Store_CID);
                             // 获得窗体句柄
                             // 获得窗体句柄
                             formhwnd = FindWindow(null, formTitle);
                             formhwnd = FindWindow(null, formTitle);
                             // 重新显示该窗体并切换到带入到前台
                             // 重新显示该窗体并切换到带入到前台

source/HCSingleStore/positionTool/FrmPositionTool.Designer.cs

@@ -44,7 +44,6 @@
             this.txtSpeed = new System.Windows.Forms.TextBox();
             this.txtSpeed = new System.Windows.Forms.TextBox();
             this.label8 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
             this.txtFileName = new System.Windows.Forms.TextBox();
             this.txtFileName = new System.Windows.Forms.TextBox();
-            this.ioStatusControl1 = new UserFromControl.IOStatusControl();
             this.btnAbsMove = new System.Windows.Forms.Button();
             this.btnAbsMove = new System.Windows.Forms.Button();
             this.label3 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
@@ -70,6 +69,8 @@
             this.btnClear = new System.Windows.Forms.Button();
             this.btnClear = new System.Windows.Forms.Button();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.radioButton1 = new System.Windows.Forms.RadioButton();
+            this.ioSingle = new UserFromControl.IOTextControl();
             this.groupBox6.SuspendLayout();
             this.groupBox6.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -96,6 +97,7 @@
             // 
             // 
             this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             | System.Windows.Forms.AnchorStyles.Left)));
+            this.groupBox2.Controls.Add(this.ioSingle);
             this.groupBox2.Controls.Add(this.txtP4Offset);
             this.groupBox2.Controls.Add(this.txtP4Offset);
             this.groupBox2.Controls.Add(this.label10);
             this.groupBox2.Controls.Add(this.label10);
             this.groupBox2.Controls.Add(this.txtP3Offset);
             this.groupBox2.Controls.Add(this.txtP3Offset);
@@ -109,7 +111,6 @@
             this.groupBox2.Controls.Add(this.txtSpeed);
             this.groupBox2.Controls.Add(this.txtSpeed);
             this.groupBox2.Controls.Add(this.label8);
             this.groupBox2.Controls.Add(this.label8);
             this.groupBox2.Controls.Add(this.txtFileName);
             this.groupBox2.Controls.Add(this.txtFileName);
-            this.groupBox2.Controls.Add(this.ioStatusControl1);
             this.groupBox2.Controls.Add(this.btnAbsMove);
             this.groupBox2.Controls.Add(this.btnAbsMove);
             this.groupBox2.Controls.Add(this.label3);
             this.groupBox2.Controls.Add(this.label3);
             this.groupBox2.Controls.Add(this.label7);
             this.groupBox2.Controls.Add(this.label7);
@@ -258,16 +259,6 @@
             this.txtFileName.TabIndex = 278;
             this.txtFileName.TabIndex = 278;
             this.txtFileName.Text = "position.csv";
             this.txtFileName.Text = "position.csv";
             // 
             // 
-            // ioStatusControl1
-            // 
-            this.ioStatusControl1.IOName = "检测信号";
-            this.ioStatusControl1.IOValue = 0;
-            this.ioStatusControl1.isCanClick = false;
-            this.ioStatusControl1.Location = new System.Drawing.Point(38, 401);
-            this.ioStatusControl1.Name = "ioStatusControl1";
-            this.ioStatusControl1.Size = new System.Drawing.Size(267, 69);
-            this.ioStatusControl1.TabIndex = 279;
-            // 
             // btnAbsMove
             // btnAbsMove
             // 
             // 
             this.btnAbsMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnAbsMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -535,11 +526,33 @@
             this.timer1.Interval = 1000;
             this.timer1.Interval = 1000;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
             // 
+            // radioButton1
+            // 
+            this.radioButton1.AutoSize = true;
+            this.radioButton1.Location = new System.Drawing.Point(715, 0);
+            this.radioButton1.Name = "radioButton1";
+            this.radioButton1.Size = new System.Drawing.Size(116, 24);
+            this.radioButton1.TabIndex = 251;
+            this.radioButton1.TabStop = true;
+            this.radioButton1.Text = "radioButton1";
+            this.radioButton1.UseVisualStyleBackColor = true;
+            // 
+            // ioSingle
+            // 
+            this.ioSingle.IOName = "检测信号";
+            this.ioSingle.IOValue = 0;
+            this.ioSingle.isCanClick = false;
+            this.ioSingle.Location = new System.Drawing.Point(46, 425);
+            this.ioSingle.Name = "ioSingle";
+            this.ioSingle.Size = new System.Drawing.Size(202, 27);
+            this.ioSingle.TabIndex = 289;
+            // 
             // FrmPositionTool
             // FrmPositionTool
             // 
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.ClientSize = new System.Drawing.Size(1020, 719);
             this.ClientSize = new System.Drawing.Size(1020, 719);
+            this.Controls.Add(this.radioButton1);
             this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.groupBox6);
             this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Name = "FrmPositionTool";
             this.Name = "FrmPositionTool";
@@ -553,6 +566,7 @@
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             this.groupBox1.PerformLayout();
             this.ResumeLayout(false);
             this.ResumeLayout(false);
+            this.PerformLayout();
 
 
         }
         }
 
 
@@ -586,7 +600,6 @@
         private System.Windows.Forms.TextBox txtPortName;
         private System.Windows.Forms.TextBox txtPortName;
         private System.Windows.Forms.TextBox txtFileName;
         private System.Windows.Forms.TextBox txtFileName;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label3;
-        private UserFromControl.IOStatusControl ioStatusControl1;
         private System.Windows.Forms.Button btnOpenFolder;
         private System.Windows.Forms.Button btnOpenFolder;
         private System.Windows.Forms.Button btnExit;
         private System.Windows.Forms.Button btnExit;
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.GroupBox groupBox1;
@@ -599,6 +612,8 @@
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.TextBox txtP5Offset;
         private System.Windows.Forms.TextBox txtP5Offset;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.RadioButton radioButton1;
+        private UserFromControl.IOTextControl ioSingle;
     }
     }
 }
 }
 
 

source/HCSingleStore/positionTool/FrmPositionTool.cs

@@ -23,12 +23,11 @@ namespace OnlineStore.ACSingleStore
         private string PortName = "";
         private string PortName = "";
         private   short SlvAddr = 0;
         private   short SlvAddr = 0;
         private string IoIp = "";
         private string IoIp = "";
-        private int IoIndex = 0;
-        public string Axis_Brake = "";
+        private int IoIndex = 0; 
         private System.Timers.Timer toolTimer = new System.Timers.Timer();
         private System.Timers.Timer toolTimer = new System.Timers.Timer();
-
+   
         private ConfigMoveAxis configAxis;
         private ConfigMoveAxis configAxis;
-        public FrmPositionTool(ConfigMoveAxis axis,string ioIp, int ioIndex)
+        public FrmPositionTool(ConfigMoveAxis axis,string ioIp, int ioIndex,string name)
         {
         {
             InitializeComponent();
             InitializeComponent();
             this.PortName = axis.DeviceName;
             this.PortName = axis.DeviceName;
@@ -41,7 +40,7 @@ namespace OnlineStore.ACSingleStore
             toolTimer.Interval = 50;
             toolTimer.Interval = 50;
             toolTimer.AutoReset = true;
             toolTimer.AutoReset = true;
             toolTimer.Elapsed += ToolTimer_Elapsed;
             toolTimer.Elapsed += ToolTimer_Elapsed;
-
+            this.Text = name + "_升降轴位置调试";
             FrmPositionTool.CheckForIllegalCrossThreadCalls = false;
             FrmPositionTool.CheckForIllegalCrossThreadCalls = false;
         }
         }
 
 
@@ -92,7 +91,7 @@ namespace OnlineStore.ACSingleStore
             bool isOn = AxisManager.instance.IsServeoOn(PortName, SlvAddr);
             bool isOn = AxisManager.instance.IsServeoOn(PortName, SlvAddr);
             formStatus(isOn);
             formStatus(isOn);
             timer1.Start();
             timer1.Start();
-            ioStatusControl1.IOName = ResourceCulture.GetString("检测信号");
+            ioSingle.IOName = ResourceCulture.GetString("激光检测信号"); 
         }
         }
         private void btnServoOn_Click(object sender, EventArgs e)
         private void btnServoOn_Click(object sender, EventArgs e)
         { 
         { 
@@ -110,15 +109,7 @@ namespace OnlineStore.ACSingleStore
             Thread.Sleep(100);
             Thread.Sleep(100);
             AxisManager.instance.AlarmClear(PortName, SlvAddr);
             AxisManager.instance.AlarmClear(PortName, SlvAddr);
             AxisManager.instance.ServoOn(PortName, SlvAddr);
             AxisManager.instance.ServoOn(PortName, SlvAddr);
-
-            try
-            {
-                IOManager.IOMove(Axis_Brake, IO_VALUE.HIGH);
-            }catch(Exception ex)
-            {
-
-            }
-         
+ 
         }
         }
 
 
         private void btnServoOff_Click(object sender, EventArgs e)
         private void btnServoOff_Click(object sender, EventArgs e)
@@ -127,14 +118,7 @@ namespace OnlineStore.ACSingleStore
             // toolTimer.Stop();
             // toolTimer.Stop();
             AxisManager.instance.SuddenStop(PortName, SlvAddr);
             AxisManager.instance.SuddenStop(PortName, SlvAddr);
             Thread.Sleep(100);
             Thread.Sleep(100);
-            try
-            {
-                IOManager.IOMove(Axis_Brake, IO_VALUE.LOW);
-            }
-            catch (Exception ex)
-            {
-
-            }
+         
             AxisManager.instance.ServoOff(PortName, SlvAddr);
             AxisManager.instance.ServoOff(PortName, SlvAddr);
             formStatus(false);
             formStatus(false);
         }
         }
@@ -158,23 +142,13 @@ namespace OnlineStore.ACSingleStore
         private void btnClear_Click(object sender, EventArgs e)
         private void btnClear_Click(object sender, EventArgs e)
         {
         {
             this.richTextBox1.Text = "";
             this.richTextBox1.Text = "";
-        }
-
-        private void btnRelMove_Click(object sender, EventArgs e)
-        {
-            int position = Convert.ToInt32(txtPosition.Text);
-            AxisManager.instance.RelMove(PortName, SlvAddr, position);
         } 
         } 
         private void btnHomeMove_Click(object sender, EventArgs e)
         private void btnHomeMove_Click(object sender, EventArgs e)
         {
         {
             int speed = Convert.ToInt32(txtSpeed.Text);
             int speed = Convert.ToInt32(txtSpeed.Text);
             AxisManager.instance.HomeMove(PortName, SlvAddr, configAxis.HomeHighSpeed,configAxis.HomeLowSpeed,configAxis.HomeAddSpeed);
             AxisManager.instance.HomeMove(PortName, SlvAddr, configAxis.HomeHighSpeed,configAxis.HomeLowSpeed,configAxis.HomeAddSpeed);
         }
         }
-        private void btnSpeedMove_Click(object sender, EventArgs e)
-        {
-            int speed = Convert.ToInt32(txtSpeed.Text);
-            AxisManager.instance.SpeedMove(PortName, SlvAddr, speed);
-        }
+       
         private void btnGetActualPosition_Click(object sender, EventArgs e)
         private void btnGetActualPosition_Click(object sender, EventArgs e)
         {
         {
             int value = AxisManager.instance.GetTargetPosition(PortName, SlvAddr);
             int value = AxisManager.instance.GetTargetPosition(PortName, SlvAddr);
@@ -351,8 +325,8 @@ namespace OnlineStore.ACSingleStore
         { 
         { 
             try
             try
             {
             {
-                ioStatusControl1.IOValue = (int)GetSingleValue();
-                ioStatusControl1.ShowData();
+                ioSingle.IOValue = (int)GetSingleValue();
+                ioSingle.ShowData();
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             { 
             { 

source/HuichuanLibrary/FrmHuiChuanTest.cs

@@ -21,7 +21,6 @@ namespace HuichuanLibrary
         private List<Label> groupIOList = new List<Label>();
         private List<Label> groupIOList = new List<Label>();
         private void FrmHuiChuanTest_Load(object sender, EventArgs e)
         private void FrmHuiChuanTest_Load(object sender, EventArgs e)
         {
         {
-            HCLogUtil.logBox = richTextBox1;
             DILabelList = new List<Label>();
             DILabelList = new List<Label>();
             DILabelList.Add(lblDI0);
             DILabelList.Add(lblDI0);
             DILabelList.Add(lblDI1);
             DILabelList.Add(lblDI1);
@@ -88,10 +87,11 @@ namespace HuichuanLibrary
             FormStatus(false);
             FormStatus(false);
             timerIO.Start();
             timerIO.Start();
             timerMain.Start();
             timerMain.Start();
+            HCLogUtil.logBox = richTextBox1;
         }
         }
         private void btnInitBoard_Click(object sender, EventArgs e)
         private void btnInitBoard_Click(object sender, EventArgs e)
         {
         {
-            bool result = HCBoardManager.InitCard();
+            bool result = HCBoardManager.OpenCard();
             if (result)
             if (result)
             {
             {
                 cmbAxisIndex.Items.Clear();
                 cmbAxisIndex.Items.Clear();

source/HuichuanLibrary/HCBoardManager.cs

@@ -59,7 +59,7 @@ namespace HuichuanLibrary
         /// 初始化板卡
         /// 初始化板卡
         /// </summary>
         /// </summary>
         /// <returns></returns>
         /// <returns></returns>
-        public static bool InitCard()
+        public static bool OpenCard()
         {
         {
             try
             try
             {
             {

source/HuichuanLibrary/HuichuanLibrary.csproj

@@ -60,6 +60,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
+    <Content Include="device_config.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="huichuan\x64\IMC_API_x64.dll">
     <Content Include="huichuan\x64\IMC_API_x64.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
@@ -78,6 +81,9 @@
     <Content Include="huichuan\x86\msvcr100d.dll">
     <Content Include="huichuan\x86\msvcr100d.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
+    <Content Include="system_config.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Content Include="huichuan\x64\IMC_API_x64.lib">
     <Content Include="huichuan\x64\IMC_API_x64.lib">

source/HuichuanLibrary/device_config.xml

+<?xml version="1.0" encoding="utf-8"?><EtherCATConfig><Config><Master><SysHwCfg>1</SysHwCfg><cycleTime>1000</cycleTime><Info><Name><![CDATA[Card 0 ]]></Name></Info></Master><Slave><Info><Name><![CDATA[SV820N]]></Name><DeviceType>131474</DeviceType><VendorId>1048576</VendorId><ProductCode>786699</ProductCode><RevisionNo>65536</RevisionNo><ToltalVirSlot>4</ToltalVirSlot><VirSlotId>512</VirSlotId><VirSlotId>512</VirSlotId><VirSlotId>512</VirSlotId><VirSlotId>512</VirSlotId></Info><SlotArray><Module><Info><Name><![CDATA[CSP]]></Name></Info></Module><Module><Info><Name><![CDATA[CSP]]></Name></Info></Module><Module><Info><Name><![CDATA[CSP]]></Name></Info></Module><Module><Info><Name><![CDATA[CSP]]></Name></Info></Module></SlotArray><ProcessData><Sm2><Type>Outputs</Type><Enable>1</Enable><Pdo>5632</Pdo><Pdo>5648</Pdo><Pdo>5664</Pdo><Pdo>5680</Pdo></Sm2><Sm3><Type>Inputs</Type><Enable>1</Enable><Pdo>6656</Pdo><Pdo>6672</Pdo><Pdo>6688</Pdo><Pdo>6704</Pdo></Sm3><RxPdo Sm="2"><SlotIdx>0</SlotIdx><Index DependOnSlot="true">#x1600</Index><Name>Outputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x6040</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ControlWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x607A</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Target position</Name><DataType>DINT</DataType></Entry></RxPdo><TxPdo Sm="3"><SlotIdx>0</SlotIdx><Index DependOnSlot="true">#x1A00</Index><Name>Inputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x603F</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ErrorCode</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x6041</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>StatusWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x6064</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Position actual value</Name><DataType>DINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x60FD</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Digital inputs</Name><DataType>UDINT</DataType></Entry></TxPdo><RxPdo Sm="2"><SlotIdx>1</SlotIdx><Index DependOnSlot="true">#x1610</Index><Name>Outputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x6840</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ControlWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x687A</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Target position</Name><DataType>DINT</DataType></Entry></RxPdo><TxPdo Sm="3"><SlotIdx>1</SlotIdx><Index DependOnSlot="true">#x1A10</Index><Name>Inputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x683F</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ErrorCode</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x6841</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>StatusWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x6864</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Position actual value</Name><DataType>DINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x68FD</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Digital inputs</Name><DataType>UDINT</DataType></Entry></TxPdo><RxPdo Sm="2"><SlotIdx>2</SlotIdx><Index DependOnSlot="true">#x1620</Index><Name>Outputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x7040</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ControlWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x707A</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Target position</Name><DataType>DINT</DataType></Entry></RxPdo><TxPdo Sm="3"><SlotIdx>2</SlotIdx><Index DependOnSlot="true">#x1A20</Index><Name>Inputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x703F</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ErrorCode</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x7041</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>StatusWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x7064</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Position actual value</Name><DataType>DINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x70FD</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Digital inputs</Name><DataType>UDINT</DataType></Entry></TxPdo><RxPdo Sm="2"><SlotIdx>3</SlotIdx><Index DependOnSlot="true">#x1630</Index><Name>Outputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x7840</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ControlWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x787A</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Target position</Name><DataType>DINT</DataType></Entry></RxPdo><TxPdo Sm="3"><SlotIdx>3</SlotIdx><Index DependOnSlot="true">#x1A30</Index><Name>Inputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x783F</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ErrorCode</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x7841</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>StatusWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x7864</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Position actual value</Name><DataType>DINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x78FD</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Digital inputs</Name><DataType>UDINT</DataType></Entry></TxPdo></ProcessData><Mailbox><CoE><InitCmds><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[SM output parameter]]></Comment><Timeout>0</Timeout><SlotIdx>0</SlotIdx><Index>7218</Index><SubIndex>1</SubIndex><Data>0200</Data><BitLen>16</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[SM input parameter]]></Comment><Timeout>0</Timeout><SlotIdx>0</SlotIdx><Index>7219</Index><SubIndex>1</SubIndex><Data>0200</Data><BitLen>16</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Controlword]]></Comment><Timeout>0</Timeout><SlotIdx>0</SlotIdx><Index>24640</Index><SubIndex>0</SubIndex><Data>1000</Data><BitLen>16</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Modes of Operation]]></Comment><Timeout>0</Timeout><SlotIdx>0</SlotIdx><Index>24672</Index><SubIndex>0</SubIndex><Data>08</Data><BitLen>8</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Controlword]]></Comment><Timeout>0</Timeout><SlotIdx>1</SlotIdx><Index>26688</Index><SubIndex>0</SubIndex><Data>1000</Data><BitLen>16</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Modes of Operation]]></Comment><Timeout>0</Timeout><SlotIdx>1</SlotIdx><Index>26720</Index><SubIndex>0</SubIndex><Data>08</Data><BitLen>8</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Controlword]]></Comment><Timeout>0</Timeout><SlotIdx>2</SlotIdx><Index>28736</Index><SubIndex>0</SubIndex><Data>1000</Data><BitLen>16</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Modes of Operation]]></Comment><Timeout>0</Timeout><SlotIdx>2</SlotIdx><Index>28768</Index><SubIndex>0</SubIndex><Data>08</Data><BitLen>8</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Controlword]]></Comment><Timeout>0</Timeout><SlotIdx>3</SlotIdx><Index>30784</Index><SubIndex>0</SubIndex><Data>1000</Data><BitLen>16</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Modes of Operation]]></Comment><Timeout>0</Timeout><SlotIdx>3</SlotIdx><Index>30816</Index><SubIndex>0</SubIndex><Data>08</Data><BitLen>8</BitLen></InitCmd></InitCmds></CoE></Mailbox><DC><ReferenceClock>true</ReferenceClock><CycleTime>1000000</CycleTime><ShiftTime>100000</ShiftTime></DC></Slave><Slave><Info><Name><![CDATA[SV820N]]></Name><DeviceType>131474</DeviceType><VendorId>1048576</VendorId><ProductCode>786699</ProductCode><RevisionNo>65536</RevisionNo><ToltalVirSlot>4</ToltalVirSlot><VirSlotId>512</VirSlotId><VirSlotId>512</VirSlotId><VirSlotId>512</VirSlotId><VirSlotId>512</VirSlotId></Info><SlotArray><Module><Info><Name><![CDATA[CSP]]></Name></Info></Module><Module><Info><Name><![CDATA[CSP]]></Name></Info></Module><Module><Info><Name><![CDATA[CSP]]></Name></Info></Module><Module><Info><Name><![CDATA[CSP]]></Name></Info></Module></SlotArray><ProcessData><Sm2><Type>Outputs</Type><Enable>1</Enable><Pdo>5632</Pdo><Pdo>5648</Pdo><Pdo>5664</Pdo><Pdo>5680</Pdo></Sm2><Sm3><Type>Inputs</Type><Enable>1</Enable><Pdo>6656</Pdo><Pdo>6672</Pdo><Pdo>6688</Pdo><Pdo>6704</Pdo></Sm3><RxPdo Sm="2"><SlotIdx>0</SlotIdx><Index DependOnSlot="true">#x1600</Index><Name>Outputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x6040</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ControlWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x607A</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Target position</Name><DataType>DINT</DataType></Entry></RxPdo><TxPdo Sm="3"><SlotIdx>0</SlotIdx><Index DependOnSlot="true">#x1A00</Index><Name>Inputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x603F</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ErrorCode</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x6041</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>StatusWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x6064</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Position actual value</Name><DataType>DINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x60FD</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Digital inputs</Name><DataType>UDINT</DataType></Entry></TxPdo><RxPdo Sm="2"><SlotIdx>1</SlotIdx><Index DependOnSlot="true">#x1610</Index><Name>Outputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x6840</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ControlWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x687A</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Target position</Name><DataType>DINT</DataType></Entry></RxPdo><TxPdo Sm="3"><SlotIdx>1</SlotIdx><Index DependOnSlot="true">#x1A10</Index><Name>Inputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x683F</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ErrorCode</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x6841</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>StatusWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x6864</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Position actual value</Name><DataType>DINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x68FD</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Digital inputs</Name><DataType>UDINT</DataType></Entry></TxPdo><RxPdo Sm="2"><SlotIdx>2</SlotIdx><Index DependOnSlot="true">#x1620</Index><Name>Outputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x7040</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ControlWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x707A</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Target position</Name><DataType>DINT</DataType></Entry></RxPdo><TxPdo Sm="3"><SlotIdx>2</SlotIdx><Index DependOnSlot="true">#x1A20</Index><Name>Inputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x703F</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ErrorCode</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x7041</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>StatusWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x7064</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Position actual value</Name><DataType>DINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x70FD</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Digital inputs</Name><DataType>UDINT</DataType></Entry></TxPdo><RxPdo Sm="2"><SlotIdx>3</SlotIdx><Index DependOnSlot="true">#x1630</Index><Name>Outputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x7840</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ControlWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x787A</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Target position</Name><DataType>DINT</DataType></Entry></RxPdo><TxPdo Sm="3"><SlotIdx>3</SlotIdx><Index DependOnSlot="true">#x1A30</Index><Name>Inputs</Name><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x783F</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>ErrorCode</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x7841</Index><SubIndex>0</SubIndex><BitLen>16</BitLen><Name>StatusWord</Name><DataType>UINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x7864</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Position actual value</Name><DataType>DINT</DataType></Entry><Entry><DevType>0</DevType><Index DependOnSlot="true" Selected="0">#x78FD</Index><SubIndex>0</SubIndex><BitLen>32</BitLen><Name>Digital inputs</Name><DataType>UDINT</DataType></Entry></TxPdo></ProcessData><Mailbox><CoE><InitCmds><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[SM output parameter]]></Comment><Timeout>0</Timeout><SlotIdx>0</SlotIdx><Index>7218</Index><SubIndex>1</SubIndex><Data>0200</Data><BitLen>16</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[SM input parameter]]></Comment><Timeout>0</Timeout><SlotIdx>0</SlotIdx><Index>7219</Index><SubIndex>1</SubIndex><Data>0200</Data><BitLen>16</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Controlword]]></Comment><Timeout>0</Timeout><SlotIdx>0</SlotIdx><Index>24640</Index><SubIndex>0</SubIndex><Data>1000</Data><BitLen>16</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Modes of Operation]]></Comment><Timeout>0</Timeout><SlotIdx>0</SlotIdx><Index>24672</Index><SubIndex>0</SubIndex><Data>08</Data><BitLen>8</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Controlword]]></Comment><Timeout>0</Timeout><SlotIdx>1</SlotIdx><Index>26688</Index><SubIndex>0</SubIndex><Data>1000</Data><BitLen>16</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Modes of Operation]]></Comment><Timeout>0</Timeout><SlotIdx>1</SlotIdx><Index>26720</Index><SubIndex>0</SubIndex><Data>08</Data><BitLen>8</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Controlword]]></Comment><Timeout>0</Timeout><SlotIdx>2</SlotIdx><Index>28736</Index><SubIndex>0</SubIndex><Data>1000</Data><BitLen>16</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Modes of Operation]]></Comment><Timeout>0</Timeout><SlotIdx>2</SlotIdx><Index>28768</Index><SubIndex>0</SubIndex><Data>08</Data><BitLen>8</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Controlword]]></Comment><Timeout>0</Timeout><SlotIdx>3</SlotIdx><Index>30784</Index><SubIndex>0</SubIndex><Data>1000</Data><BitLen>16</BitLen></InitCmd><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Modes of Operation]]></Comment><Timeout>0</Timeout><SlotIdx>3</SlotIdx><Index>30816</Index><SubIndex>0</SubIndex><Data>08</Data><BitLen>8</BitLen></InitCmd></InitCmds></CoE></Mailbox><DC><ReferenceClock>true</ReferenceClock><CycleTime>1000000</CycleTime><ShiftTime>100000</ShiftTime></DC></Slave><Slave><Info><Name><![CDATA[GR10_1616ETNE]]></Name><DeviceType>197009</DeviceType><VendorId>1048576</VendorId><ProductCode>284428562</ProductCode><RevisionNo>0</RevisionNo><ToltalVirSlot>2</ToltalVirSlot></Info><ProcessData><Sm2><Type>Outputs</Type><Enable>1</Enable><Pdo>5888</Pdo></Sm2><Sm3><Type>Inputs</Type><Enable>1</Enable><Pdo>6912</Pdo></Sm3><TxPdo Fixed="true" Mandatory="false" Sm="3"><SlotIdx>1</SlotIdx><Index>#x1B00</Index><Name>Digital input mapping parameter</Name><Entry><DevType>2</DevType><Index Selected="0">#x6000</Index><SubIndex>1</SubIndex><BitLen>8</BitLen><Name>Digital input 00 to 07</Name><DataType>USINT</DataType></Entry><Entry><DevType>2</DevType><Index Selected="0">#x6000</Index><SubIndex>2</SubIndex><BitLen>8</BitLen><Name>Digital input 10 to 17</Name><DataType>USINT</DataType></Entry></TxPdo><RxPdo Fixed="true" Mandatory="false" Sm="2"><SlotIdx>0</SlotIdx><Index>#x1700</Index><Name>Digital output mapping parameter</Name><Entry><DevType>1</DevType><Index Selected="0">#x6200</Index><SubIndex>1</SubIndex><BitLen>8</BitLen><Name>Digital output 00 to 07</Name><DataType>USINT</DataType></Entry><Entry><DevType>1</DevType><Index Selected="0">#x6200</Index><SubIndex>2</SubIndex><BitLen>8</BitLen><Name>Digital output 10 to 17</Name><DataType>USINT</DataType></Entry></RxPdo></ProcessData><Mailbox><CoE><InitCmds><InitCmd Fixed="true"><Transition>PS</Transition><Comment><![CDATA[Error mode output]]></Comment><Timeout>0</Timeout><SlotIdx>0</SlotIdx><Index>25094</Index><SubIndex>1</SubIndex><Data>01</Data><BitLen>8</BitLen></InitCmd></InitCmds></CoE></Mailbox></Slave></Config></EtherCATConfig>
\ No newline at end of file

source/HuichuanLibrary/system_config.xml

+<?xml version="1.0" encoding="utf-8"?><CardConfig id="0"><System><SysPara><emgMode>1</emgMode><emgFilter>19</emgFilter><emgTrigLevelInv>1</emgTrigLevelInv></SysPara></System><Signal><EcatSignal><DiInverse><Groups><GpMax>2</GpMax><Gp id="0"><data>0</data></Gp><Gp id="1"><data>0</data></Gp></Groups></DiInverse><DoInverse><Groups><GpMax>2</GpMax><Gp id="0"><data>0</data></Gp><Gp id="1"><data>0</data></Gp></Groups></DoInverse><PhyAxGrpDirInv><Groups><GpMax>8</GpMax><Gp id="0"><data>0</data></Gp><Gp id="1"><data>0</data></Gp><Gp id="2"><data>0</data></Gp><Gp id="3"><data>0</data></Gp><Gp id="4"><data>0</data></Gp><Gp id="5"><data>0</data></Gp><Gp id="6"><data>0</data></Gp><Gp id="7"><data>0</data></Gp></Groups></PhyAxGrpDirInv></EcatSignal><LocalSignal><DiInverse><data>0</data></DiInverse><DoInverse><data>0</data></DoInverse><SpecialDiInverses><SpecialDiInverse type="0"><data>0</data></SpecialDiInverse><SpecialDiInverse type="1"><data>0</data></SpecialDiInverse><SpecialDiInverse type="2"><data>0</data></SpecialDiInverse><SpecialDiInverse type="3"><data>0</data></SpecialDiInverse><SpecialDiInverse type="4"><data>0</data></SpecialDiInverse><SpecialDiInverse type="5"><data>0</data></SpecialDiInverse><SpecialDiInverse type="6"><data>0</data></SpecialDiInverse></SpecialDiInverses><DiFilterTimes><DiFilterTime id="0">1</DiFilterTime><DiFilterTime id="1">1</DiFilterTime><DiFilterTime id="2">1</DiFilterTime><DiFilterTime id="3">1</DiFilterTime><DiFilterTime id="4">1</DiFilterTime><DiFilterTime id="5">1</DiFilterTime><DiFilterTime id="6">1</DiFilterTime><DiFilterTime id="7">1</DiFilterTime><DiFilterTime id="8">1</DiFilterTime><DiFilterTime id="9">1</DiFilterTime><DiFilterTime id="10">1</DiFilterTime><DiFilterTime id="11">1</DiFilterTime><DiFilterTime id="12">1</DiFilterTime><DiFilterTime id="13">1</DiFilterTime><DiFilterTime id="14">1</DiFilterTime><DiFilterTime id="15">1</DiFilterTime></DiFilterTimes><homeFltTime>0</homeFltTime><limitFltTime>0</limitFltTime><probeFltTime>0</probeFltTime><LocalEncDirs><LocalEncDir id="0">0</LocalEncDir><LocalEncDir id="1">0</LocalEncDir><LocalEncDir id="2">0</LocalEncDir><LocalEncDir id="3">0</LocalEncDir><LocalEncDir id="4">0</LocalEncDir><LocalEncDir id="5">0</LocalEncDir></LocalEncDirs><LocalPulses><LocalPulse id="0"><LocalPulseMode>0</LocalPulseMode><LocalPulseDirInver>0</LocalPulseDirInver></LocalPulse><LocalPulse id="1"><LocalPulseMode>0</LocalPulseMode><LocalPulseDirInver>0</LocalPulseDirInver></LocalPulse><LocalPulse id="2"><LocalPulseMode>0</LocalPulseMode><LocalPulseDirInver>0</LocalPulseDirInver></LocalPulse><LocalPulse id="3"><LocalPulseMode>0</LocalPulseMode><LocalPulseDirInver>0</LocalPulseDirInver></LocalPulse><LocalPulse id="4"><LocalPulseMode>0</LocalPulseMode><LocalPulseDirInver>0</LocalPulseDirInver></LocalPulse><LocalPulse id="5"><LocalPulseMode>0</LocalPulseMode><LocalPulseDirInver>0</LocalPulseDirInver></LocalPulse></LocalPulses></LocalSignal></Signal><Axises><Axis id="0"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>10000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="1"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>10000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>1</axType><outputChn>1</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="2"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>1</axType><outputChn>2</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="3"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>1</axType><outputChn>3</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="4"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>1</axType><outputChn>4</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="5"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>1</axType><outputChn>5</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="6"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>1</axType><outputChn>6</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="7"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>1</axType><outputChn>7</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="8"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="9"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="10"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="11"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="12"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="13"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="14"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="15"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="16"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="17"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="18"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="19"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="20"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="21"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="22"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="23"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="24"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="25"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="26"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="27"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="28"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="29"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="30"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis><Axis id="31"><MotionPara><bgVel>0</bgVel><maxVel>52428000</maxVel><maxAcc>500000000</maxAcc><maxDec>500000000</maxDec><maxJerk>499999993495552</maxJerk><stopDec>100000000</stopDec><eStopDec>2000000000</eStopDec></MotionPara><BindCfg><axType>-1</axType><outputChn>0</outputChn><loaclEncSrc>0</loaclEncSrc></BindCfg><AttrPara><arrivalBand>1000</arrivalBand><arrivalTime>20</arrivalTime><errorLmt>1048576</errorLmt><softPosLimitPos>2147483647</softPosLimitPos><softNegLimitPos>-2147483647</softNegLimitPos></AttrPara><SafePara><alarmEn>1</alarmEn><softLmtEn>0</softLmtEn><hwLmtEn>1</hwLmtEn><errorLmtEn>0</errorLmtEn></SafePara></Axis></Axises></CardConfig>
\ No newline at end of file

source/LoadCVSLibrary/LoadCSVLibrary.csproj

@@ -52,7 +52,6 @@
     <Compile Include="storeConfig\ConfigProAttribute.cs" />
     <Compile Include="storeConfig\ConfigProAttribute.cs" />
     <Compile Include="storeConfig\config\BoxConfig.cs" />
     <Compile Include="storeConfig\config\BoxConfig.cs" />
     <Compile Include="storeConfig\config\StoreConfig.cs" />
     <Compile Include="storeConfig\config\StoreConfig.cs" />
-    <Compile Include="storeConfig\config\StoreType.cs" />
     <Compile Include="storeConfig\config\IO_Type.cs" />
     <Compile Include="storeConfig\config\IO_Type.cs" />
     <Compile Include="CSVAttribute.cs" />
     <Compile Include="CSVAttribute.cs" />
     <Compile Include="storeConfig\CSVConfigReader.cs" />
     <Compile Include="storeConfig\CSVConfigReader.cs" />

source/LoadCVSLibrary/storeConfig/config/BaseConfig.cs

@@ -16,9 +16,27 @@ namespace OnlineStore.LoadCSVLibrary
         public const string IOIP_Str = "PRO_AOI_IP";
         public const string IOIP_Str = "PRO_AOI_IP";
    
    
         public int DeviceID { get; set; }
         public int DeviceID { get; set; }
-         
+  
         public string CID { get; set; }
         public string CID { get; set; }
 
 
+        private int StoreId = 0;
+        public int GetStoreId()
+        {
+            if (StoreId <= 0)
+            {
+                string v = CID.Substring(CID.Length - 2, 2);
+                try
+                {
+                    StoreId = Convert.ToInt32(v);
+                }
+                catch (Exception ex)
+                {
+
+                }
+            }
+            return StoreId;
+        }
+
         public string DType { get; set; }
         public string DType { get; set; }
         public string ConfigFilePath { get; set; }
         public string ConfigFilePath { get; set; }
 
 
@@ -131,7 +149,7 @@ namespace OnlineStore.LoadCSVLibrary
                             SubDIList[io.SubType].Add(io.ProName, io);
                             SubDIList[io.SubType].Add(io.ProName, io);
                         }
                         }
 
 
-                        //if (!ioTypeList.Contains(con.ProName))
+                        if (!ioTypeList.Contains(con.ProName))
                         {
                         {
                             AddBuffer(con, builder);
                             AddBuffer(con, builder);
                         }
                         }
@@ -165,7 +183,7 @@ namespace OnlineStore.LoadCSVLibrary
                         {
                         {
                             SubDOList[io.SubType].Add(io.ProName, io);
                             SubDOList[io.SubType].Add(io.ProName, io);
                         }
                         }
-                        //if (!ioTypeList.Contains(con.ProName))
+                        if (!ioTypeList.Contains(con.ProName))
                         {
                         {
                             AddBuffer(con, builder);
                             AddBuffer(con, builder);
                         }
                         }

source/LoadCVSLibrary/storeConfig/config/BoxConfig.cs

@@ -177,12 +177,7 @@ namespace OnlineStore.LoadCSVLibrary
         /// </summary>
         /// </summary>
         [ConfigProAttribute("IsUse_Tray_Check")]
         [ConfigProAttribute("IsUse_Tray_Check")]
         public int IsUse_Tray_Check { get; set; }
         public int IsUse_Tray_Check { get; set; }
-         
-
-
-      
-
-         
+          
 
 
         /// <summary>
         /// <summary>
         /// PRO 压紧轴（轴4）P1速度 CompAxis_P1_Speed	100
         /// PRO 压紧轴（轴4）P1速度 CompAxis_P1_Speed	100
@@ -222,70 +217,14 @@ namespace OnlineStore.LoadCSVLibrary
         ///  PRO,0,是否调试状态,ISDebug,0,,,,,,,,,,,,
         ///  PRO,0,是否调试状态,ISDebug,0,,,,,,,,,,,,
         /// </summary>
         /// </summary>
         [ConfigProAttribute("ISDebug")]
         [ConfigProAttribute("ISDebug")]
-        public int ISDebug { get; set; }
-        private Dictionary<string, ushort> DILengthMap = null;
-        private Dictionary<string, ushort> DOLengthMap = null;
+        public int ISDebug { get; set; } 
         public ushort GetDILength(string ip)
         public ushort GetDILength(string ip)
         {
         {
-            return 16;
-            //try
-            //{
-            //    if (DILengthMap == null)
-            //    {
-            //        DILengthMap = new Dictionary<string, ushort>();
-            //        string[] arrayList = IO_DILength.Split(';');
-            //        foreach (string str in arrayList)
-            //        {
-            //            string[] arrStr = str.Split('#');
-            //            if (arrStr.Length == 2)
-            //            {
-            //                string ioip = arrStr[0];
-            //                ushort length = Convert.ToUInt16(arrStr[1]);
-            //                DILengthMap.Add(ioip, length);
-            //            }
-            //        }
-            //    }
-            //}
-            //catch (Exception ex)
-            //{
-
-            //}
-            //if (DILengthMap.ContainsKey(ip))
-            //{
-            //    return DILengthMap[ip];
-            //}
-            //return 16;
+            return 16; 
         }
         }
         public ushort GetDOLength(string ip)
         public ushort GetDOLength(string ip)
         {
         {
-            return 16;
-            //try
-            //{
-            //    if (DOLengthMap == null)
-            //    {
-            //        DOLengthMap = new Dictionary<string, ushort>();
-            //        string[] arrayList = IO_DOLength.Split(';');
-            //        foreach (string str in arrayList)
-            //        {
-            //            string[] arrStr = str.Split('#');
-            //            if (arrStr.Length == 2)
-            //            {
-            //                string ioip = arrStr[0];
-            //                ushort length = Convert.ToUInt16(arrStr[1]);
-            //                DOLengthMap.Add(ioip, length);
-            //            }
-            //        }
-            //    }
-            //}
-            //catch (Exception ex)
-            //{
-
-            //}
-            //if (DOLengthMap.ContainsKey(ip))
-            //{
-            //    return DOLengthMap[ip];
-            //}
-            //return 16;
+            return 16; 
         }
         }
 
 
     }
     }

source/LoadCVSLibrary/storeConfig/config/IO_Type.cs

@@ -25,109 +25,7 @@ namespace OnlineStore.LoadCSVLibrary
             }
             }
             return TypeList;
             return TypeList;
         }
         }
-
-        ///// <summary>
-        ///// 料仓，DI	急停	SuddenStop_BTN X01	DI-01 
-        ///// </summary>
-        //public static string SuddenStop_BTN = "SuddenStop_BTN";
-        ///// <summary>
-        ///// 料仓 DI	复位	Reset_BTN	  	X02	DI-02 
-        ///// </summary>
-        //public static string Reset_BTN = "Reset_BTN";
-        ///// <summary>
-        ///// DI,盘点,CheckPos,2,PRO_AOI_IP_1,0,盘点,X03,DI-03,0,
-        ///// </summary>
-        //public static string CheckPos = "CheckPos";
-        ///// <summary>
-        /////DI 自动运行	AutoRun_Signal
-        ///// </summary>
-        ////  public static string AutoRun_Signal = "AutoRun_Signal";
-
-        ///// <summary>
-        ///// 料仓DI。气压检测(料仓）	Airpressure_Check
-        ///// </summary>
-        //public static string Airpressure_Check = "Airpressure_Check";
-        ///// <summary>
-        ///// DI 料仓门口料盘检测	TrayCheck_1
-        ///// </summary>
-        //public static string TrayCheck_Door = "TrayCheck_Door";
-        ///// <summary>
-        /////  DI  叉子料盘检测	TrayCheck_Fixture
-        ///// </summary> 
-        //public static string TrayCheck_Fixture = "TrayCheck_Fixture";
-
-        ///// <summary>
-        ///// 料仓IO。定位气缸上升端(料仓）	LocationCylinder_Up
-        ///// </summary>
-        //public static string LocationCylinder_Up = "LocationCylinder_Up";
-        ///// <summary>
-        /////料仓IO。 定位气缸下降端(料仓）	LocationCylinder_Down
-        ///// </summary>
-        //public static string LocationCylinder_Down = "LocationCylinder_Down";
-
-        ///// <summary>
-        ///// 料仓IO。定位气缸上升端(料仓）	LocationCylinder2_Up
-        ///// </summary>
-        //public static string LocationCylinder2_Up = "LocationCylinder2_Up";
-        ///// <summary>
-        /////料仓IO。 定位气缸下降端(料仓）	LocationCylinder2_Down
-        ///// </summary>
-        //public static string LocationCylinder2_Down = "LocationCylinder2_Down";
-        ///// <summary>
-        ///// 料仓DO 。料仓运转ON	Run_Signal
-        ///// </summary>
-        //public static string Run_Signal = "Run_Signal";
-        ///// <summary>
-        ///// 料仓DO 。料仓轴2刹车ON	Axis_Brake
-        ///// </summary>
-        //public static string Axis_Brake = "Axis_Brake";
-        ///// <summary>
-        ///// 料仓DO 。料仓吹气SOL ON	StartOrStopBlow
-        ///// </summary>
-        //public static string StartOrStopBlow = "StartOrStopBlow";
-
-
-        ///// <summary>
-        ///// DO	自动指示灯	AutoRun_HddLed
-        ///// </summary>
-        //public static string AutoRun_HddLed = "AutoRun_HddLed";
-
-
-        ///// <summary>
-        ///// DO	待机指示灯	RunSign_HddLed
-        ///// </summary>
-        //public static string RunSign_HddLed = "RunSign_HddLed";
-
-        ///// <summary>
-        /////DO	故障指示灯	Alarm_HddLed
-        ///// </summary>
-        //public static string Alarm_HddLed = "Alarm_HddLed";
-
-
-        ///// <summary>
-        ///// 吹气SOL	Blow_Single
-        ///// </summary>
-        //public static string Blow_Single = "Blow_Single";
-
-        ///// <summary>
-        ///// 进出料口门上升端	Door_Up
-        ///// </summary>
-        //public static string Door_Up = "Door_Up";
-        ///// <summary>
-        ///// 进出料口门下降端	Door_Down
-        ///// </summary>
-        //public static string Door_Down = "Door_Down";
-
-        //public static string DoorLimit = "DoorLimit";
-
-        ///// <summary>
-        /////  DO,0,报警蜂鸣器,Alarm_Buzzer,3,HC,Y04,
-        ///// </summary>
-        //public static string Alarm_Buzzer = "Alarm_Buzzer";
-        ///// <summary>
-        /////  DO,0,设备照明ON,Device_Led,8,HC,Y09,
-        ///// </summary>
-        //public static string Device_Led = "Device_Led";
+         
 
 
         /// <summary>
         /// <summary>
         ///  DI,0,急停,SuddenStop_BTN,0,HC,X00,
         ///  DI,0,急停,SuddenStop_BTN,0,HC,X00,
@@ -182,15 +80,15 @@ namespace OnlineStore.LoadCSVLibrary
         ///// </summary>
         ///// </summary>
         //public static string CheckPos = "CheckPos";
         //public static string CheckPos = "CheckPos";
         /// <summary>
         /// <summary>
-        ///  DO,0,自动指示灯,AutoRun_HddLed,0,HC,Y01,
+        ///  DO,0,自动指示灯 绿灯,AutoRun_HddLed,0,HC,Y01,
         /// </summary>
         /// </summary>
         public static string AutoRun_HddLed = "AutoRun_HddLed";
         public static string AutoRun_HddLed = "AutoRun_HddLed";
         /// <summary>
         /// <summary>
-        ///  DO,0,故障指示灯,Alarm_HddLed,1,HC,Y02,
+        ///  DO,0,故障指示灯 红灯,Alarm_HddLed,1,HC,Y02,
         /// </summary>
         /// </summary>
         public static string Alarm_HddLed = "Alarm_HddLed";
         public static string Alarm_HddLed = "Alarm_HddLed";
         /// <summary>
         /// <summary>
-        ///  DO,0,待机指示灯,RunSign_HddLed,2,HC,Y03,
+        ///  DO,0,待机指示灯 黄灯 ,RunSign_HddLed,2,HC,Y03,
         /// </summary>
         /// </summary>
         public static string RunSign_HddLed = "RunSign_HddLed";
         public static string RunSign_HddLed = "RunSign_HddLed";
         /// <summary>
         /// <summary>
@@ -231,7 +129,16 @@ namespace OnlineStore.LoadCSVLibrary
         /// </summary>
         /// </summary>
         HIGH = 1,
         HIGH = 1,
 
 
+        None=-1,
+
+    }
+    public class StoreType
+    {
 
 
+        /// <summary>
+        /// 松下伺服485通信单台料仓
+        /// </summary>
+        public static string RC_AC_SA = "RC_AC_SA";
     }
     }
 
 
 }
 }

source/LoadCVSLibrary/storeConfig/config/StoreConfig.cs

@@ -15,17 +15,7 @@ namespace OnlineStore.LoadCSVLibrary
             : base(id, cid, type, filepath)
             : base(id, cid, type, filepath)
         {
         {
         }
         }
-
-        /// <summary>
-        /// 预警温度
-        /// </summary>
-        [ConfigProAttribute("WarnTemperate")]
-        public int WarnTemperate { get; set; }
-        /// <summary>
-        /// 预警湿度
-        /// </summary>
-        [ConfigProAttribute("WarnHumidity")]
-        public int WarnHumidity { get; set; }
+         
         /// <summary>
         /// <summary>
         /// 气压检测IO关闭需要持续的时间（=3表示需要关闭三秒以上才算关闭）
         /// 气压检测IO关闭需要持续的时间（=3表示需要关闭三秒以上才算关闭）
         /// </summary>
         /// </summary>
@@ -39,28 +29,7 @@ namespace OnlineStore.LoadCSVLibrary
         /// </summary>
         /// </summary>
         [ConfigProAttribute("IOSingle_TimerOut", false)]
         [ConfigProAttribute("IOSingle_TimerOut", false)]
         public int IOSingle_TimerOut { get; set; }
         public int IOSingle_TimerOut { get; set; }
-        ///// <summary>
-        ///// PRO	需要吹气的温度(温度标准)	Max_Temperature	10
-        ///// </summary>
-        //[ConfigProAttribute("Max_Temperature", false)]
-        //public int Max_Temperature { get; set; }
-        ///// <summary>
-        ///// PRO	需要吹气的湿度(湿度标准)	Max_Humidity	10
-        ///// </summary>
-        //[ConfigProAttribute("Max_Humidity", false)]
-        //public int Max_Humidity { get; set; }
-
-        ///// <summary>
-        ///// PRO	每次吹气的时间（分钟）	BlowAir_Time	10
-        ///// </summary>
-        //[ConfigProAttribute("BlowAir_Time", false)]
-        //public int BlowAir_Time { get; set; }
-
-        ///// <summary>
-        ///// PRO	两次吹气间隔（分钟）	BlowAir_Interval	10
-        ///// </summary>
-        //[ConfigProAttribute("BlowAir_Interval", false)]
-        //public int BlowAir_Interval { get; set; }
+      
 
 
         public int InoutAxis_PositionMax { get; set; }
         public int InoutAxis_PositionMax { get; set; }
     
     

source/LoadCVSLibrary/storeConfig/config/StoreType.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
- 
-
-namespace OnlineStore.LoadCSVLibrary
-{
-    public class StoreType
-    {
-        ///// <summary>
-        ///// 双层在线料仓（电钢，康泰克板子，康奈德IO模块）料仓总配置
-        ///// </summary>
-        //public static string RC_DB_LINE = "RC_DB_LINE";
-        ///// <summary>
-        ///// 双层在线料仓（电钢，康泰克板子，康奈德IO模块）单个料仓配置
-        ///// </summary>
-        //public static string RC_DB_LA = "RC_DB_LA";
-        ///// <summary>
-        ///// 单台自动料仓 锁孔板PLC
-        ///// </summary>
-        //public static string RC_PLC_SM = "RC_PLC_SM";
-
-        ///// <summary>
-        ///// 康泰克流水线料仓_子料仓
-        ///// </summary>
-        //public static string RC_KTK_LA = "RC_KTK_LA";
-          
-        ///// <summary>
-        ///// 康泰克流水线料仓_流水线
-        ///// </summary>
-        //public static string RC_KTK_LINE = "RC_KTK_LINE";
-         
-        ///// <summary>
-        ///// 康泰克单台料仓
-        ///// </summary>
-        //public static string RC_KTK_SA = "RC_KTK_SA";
-        /// <summary>
-        /// 松下伺服485通信单台料仓
-        /// </summary>
-        public static string RC_AC_SA = "RC_AC_SA";
-    }
-}