1

source/DeviceLibrary/IO/AIOBOX/AIOBOXManager.cs

@@ -327,11 +327,19 @@ namespace OnlineStore.DeviceLibrary
         }
 
         public override void CloseAllConnection()
-        {
+        { 
             foreach (AIOBOX aio in AIOMap.Values)
             {
-                aio.Close();
+                try
+                {
+                    aio.Close();
+                }
+                catch (Exception ex)
+                {
+                    LogUtil.error("", ex);
+                }
             }
+
             AIOMap.Clear();
         }
         public override void WriteSingleDO(string ioIp, byte slaveId, ushort StartAddress, IO_VALUE onOff)

source/DeviceLibrary/LineConfig/VMILineConfig.csv

@@ -6,13 +6,13 @@ PRO,IO模块IP,PRO_AOI_IP_1,192.168.103.25,,,,,,,
 DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X721,DI-01,0,
 DI,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X722,DI-02,0,
 DI,进料线入口检测,InL_InCheck,2,PRO_AOI_IP_1,0,进料线入口检测,X723,DI-03,0,
-DI,进料线阻挡检测1,InL_InStopCheck,3,PRO_AOI_IP_1,0,进料线阻挡检测1,X724,DI-04,0,
-DI,进料线阻挡检测2,InL_OutStopCheck,4,PRO_AOI_IP_1,0,进料线阻挡检测2,X725,DI-05,0,
-,进料线出口阻挡检测,,5,PRO_AOI_IP_1,0,进料线出口阻挡检测,X726,DI-06,0,
+DI,进料线入口阻挡检测,InL_InStopCheck,3,PRO_AOI_IP_1,0,进料线入口阻挡检测,X724,DI-04,0,
+,,,4,PRO_AOI_IP_1,0,,X725,DI-05,0,
+DI,进料线出口阻挡检测,InL_OutStopCheck,5,PRO_AOI_IP_1,0,进料线出口阻挡检测,X726,DI-06,0,
 DI,出料线入口检测,OutL_InCheck,6,PRO_AOI_IP_1,0,出料线入口检测,X727,DI-07,0,
-DI,出料线阻挡检测1,OutL_InStopCheck,7,PRO_AOI_IP_1,0,出料线阻挡检测1,X728,DI-08,0,
-DI,出料线阻挡检测2,OutL_OutStopCheck,8,PRO_AOI_IP_1,0,出料线阻挡检测2,X729,DO-01,0,
-,出料线出口检测,,9,PRO_AOI_IP_1,0,出料线出口检测,X730,DO-02,0,
+DI,出料线入口阻挡检测,OutL_InStopCheck,7,PRO_AOI_IP_1,0,出料线入口阻挡检测,X728,DI-08,0,
+,,,8,PRO_AOI_IP_1,0,,X729,DO-01,0,
+DI,出料线出口阻挡检测,OutL_OutStopCheck,9,PRO_AOI_IP_1,0,出料线出口阻挡检测,X730,DO-02,0,
 ,出料线人工取料信号,,10,PRO_AOI_IP_1,0,出料线人工取料信号,X731,DO-03,0,
 ,,,11,PRO_AOI_IP_1,0,,X732,DO-04,0,
 ,,,12,PRO_AOI_IP_1,0,,X733,DO-05,0,
@@ -23,12 +23,12 @@ DO,运行状态（指示灯）,AutoRun_HddLed,0,PRO_AOI_IP_1,0,运行状态（指示灯）,Y721,DI
 DO,故障状态（指示灯）,Alarm_HddLed,1,PRO_AOI_IP_1,0,故障状态（指示灯）,Y722,DI-02,0,
 DO,进料线驱动电机运转,InL_Run,2,PRO_AOI_IP_1,0,进料线驱动电机运转,Y723,DI-03,0,
 DO,出料线驱动电机运转,OutL_Run,3,PRO_AOI_IP_1,0,出料线驱动电机运转,Y724,DI-04,0,
-DO,进料线阻挡1下降,InL_InStopDown,4,PRO_AOI_IP_1,0,进料线阻挡1下降,Y725,DI-05,0,
-DO,进料线阻挡2下降,InL_OutStopDown,5,PRO_AOI_IP_1,0,进料线阻挡2下降,Y726,DI-06,0,
-,进料线出口阻挡下降,,6,PRO_AOI_IP_1,0,进料线出口阻挡下降,Y727,DI-07,0,
-DO,出料线阻挡1下降,OutL_InStopDown,7,PRO_AOI_IP_1,0,出料线阻挡1下降,Y728,DI-08,0,
-DO,出料线阻挡2下降,OutL_OutStopDown,8,PRO_AOI_IP_1,0,出料线阻挡2下降,Y729,DO-01,0,
-,出料线出口阻挡下降,,9,PRO_AOI_IP_1,0,出料线出口阻挡下降,Y730,DO-02,0,
+DO,出料线入口阻挡,OutL_InStopDown,4,PRO_AOI_IP_1,0,出料线入口阻挡,Y725,DI-05,0,
+,,,5,PRO_AOI_IP_1,0,,Y726,DI-06,0,
+DO,出料线出口阻挡,OutL_OutStopDown,6,PRO_AOI_IP_1,0,出料线出口阻挡,Y727,DI-07,0,
+DO,进料线出口阻挡,InL_OutStopDown,7,PRO_AOI_IP_1,0,进料线出口阻挡,Y728,DI-08,0,
+,,,8,PRO_AOI_IP_1,0,,Y729,DO-01,0,
+DO,进料线入口阻挡,InL_InStopDown,9,PRO_AOI_IP_1,0,进料线入口阻挡,Y730,DO-02,0,
 ,,,10,PRO_AOI_IP_1,0,,Y731,DO-03,0,
 ,,,11,PRO_AOI_IP_1,0,,Y732,DO-04,0,
 ,,,12,PRO_AOI_IP_1,0,,Y733,DO-05,0,

source/VMILineClient/FrmBase.Designer.cs

-namespace OnlineStore.ACSingleStore
+namespace OnlineStore.VMILineClient
 {
     partial class FrmBase
     {

source/VMILineClient/FrmBase.cs

@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace OnlineStore.ACSingleStore
+namespace OnlineStore.VMILineClient
 {
     public partial class FrmBase : Form
     {

source/VMILineClient/FrmVMIClient.Designer.cs

-namespace OnlineStore.ACSingleStore
+namespace OnlineStore.VMILineClient
 {
     partial class FrmVMIClient
     {

source/VMILineClient/FrmVMIClient.cs

@@ -15,10 +15,10 @@ using log4net;
 using UserFromControl;
 using OnlineStore.DeviceLibrary;
 using OnlineStore.Common;
-using OnlineStore.ACSingleStore;
+using OnlineStore.VMILineClient;
 using OnlineStore.LoadCSVLibrary;
 
-namespace OnlineStore.ACSingleStore
+namespace OnlineStore.VMILineClient
 {
     public partial class FrmVMIClient : FrmBase
     {
@@ -333,27 +333,27 @@ namespace OnlineStore.ACSingleStore
 
         private void btnInLInStopDown_Click(object sender, EventArgs e)
         {
-            BtnMove(btnInLInStopDown, "进料线入口阻挡下降", "进料线入口阻挡上升", IO_Type.InL_Run);
+            BtnMove(btnInLInStopDown, "进料线入口阻挡下降", "进料线入口阻挡上升", IO_Type.InL_InStopDown);
         }
 
         private void btnInLOutStopDown_Click(object sender, EventArgs e)
         {
-            BtnMove(btnInLOutStopDown, "进料线出口阻挡下降", "进料线出口阻挡上升", IO_Type.InL_Run);
+            BtnMove(btnInLOutStopDown, "进料线出口阻挡下降", "进料线出口阻挡上升", IO_Type.InL_OutStopDown);
         }
 
         private void btnOLInStopDown_Click(object sender, EventArgs e)
         {
-            BtnMove(btnOLInStopDown, "出料线入口阻挡下降", "出料线入口阻挡上升", IO_Type.InL_Run);
+            BtnMove(btnOLInStopDown, "出料线入口阻挡下降", "出料线入口阻挡上升", IO_Type.OutL_InStopDown);
         }
 
         private void btnOutL_Click(object sender, EventArgs e)
         {
-            BtnMove(btnOutL, "出料线体运转", "出料线体停止", IO_Type.InL_Run);
+            BtnMove(btnOutL, "出料线体运转", "出料线体停止", IO_Type.OutL_Run);
         }
 
         private void btnOLOutStopDown_Click(object sender, EventArgs e)
         {
-            BtnMove(btnOLOutStopDown, "出料线出口阻挡下降", "出料线出口阻挡上升", IO_Type.InL_Run);
+            BtnMove(btnOLOutStopDown, "出料线出口阻挡下降", "出料线出口阻挡上升", IO_Type.OutL_OutStopDown);
         }
 
         private void btnCloseA_Click(object sender, EventArgs e)

source/VMILineClient/ManagerUtil.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Forms;
 
-namespace OnlineStore.ACSingleStore
+namespace OnlineStore.VMILineClient
 {
     public class ManagerUtil
     {

source/VMILineClient/Program.cs

 using log4net;
 using log4net.Config;
 using OnlineStore.Common;
-using OnlineStore.ACSingleStore;
+using OnlineStore.VMILineClient;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace OnlineStore.ACSingleStore
+namespace OnlineStore.VMILineClient
 {
     static class Program
     {

source/VMILineClient/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // 有关程序集的常规信息通过以下
 // 特性集控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("ACSingleStore")]
+[assembly: AssemblyTitle("VMILineClient")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ACSingleStore")]
+[assembly: AssemblyProduct("VMILineClient")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

source/VMILineClient/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace OnlineStore.ACSingleStore.Properties {
+namespace OnlineStore.VMILineClient.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace OnlineStore.ACSingleStore.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OnlineStore.ACSingleStore.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OnlineStore.VMILineClient.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

source/VMILineClient/Properties/Settings.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace OnlineStore.ACSingleStore.Properties {
+namespace OnlineStore.VMILineClient.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]