1

source/DeviceLibrary/acVmiLine/RobotManager.cs

@@ -79,9 +79,7 @@ namespace OnlineStore.DeviceLibrary
                 Application.Exit();
             }
             return VMILine;
-        }
-
-     
+        } 
    
         public static bool checkWatch(Stopwatch watch, int targetMs, bool isStop = true)
         {

source/DeviceLibrary/acVmiLine/VMILineBean.cs

@@ -58,7 +58,7 @@ namespace OnlineStore.DeviceLibrary
             IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
             IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
         }
-         
+
 
         /// <summary>
         /// 开始运行
@@ -66,14 +66,14 @@ namespace OnlineStore.DeviceLibrary
         public bool StartRun()
         {
             LogUtil.info(Name + "开始启动，启动时间：" + DateTime.Now);
-            WarnMsg = ""; 
+            WarnMsg = "";
             if (IOManager.IOValue(IO_Type.SuddenStop_BTN).Equals(IO_VALUE.HIGH))
-            {   
+            {
                 //急停按钮和气压检测需要一起判断 
-                if (!AgvClient.ISConnected())
-                {
-                    AgvClient.Init();
-                }
+                //    if (!AgvClient.ISConnected())
+                //  {
+                AgvClient.Init();
+                //}
                 RFIDManager.Open(new string[] { Config.InL_In_RFIDIP, Config.InL_Out_RFIDIP });
                 runStatus = RunStatus.HomeMoving;
                 MoveInfo.NewMove(LineMoveType.ReturnHome);
@@ -82,7 +82,7 @@ namespace OnlineStore.DeviceLibrary
             }
             else
             {
-                SetWarnMsg("启动失败：急停未开"); 
+                SetWarnMsg("启动失败：急停未开");
                 return false;
             }
         }
@@ -163,6 +163,7 @@ namespace OnlineStore.DeviceLibrary
         {
             WarnMsg = "";
             RFIDManager.Close();
+            AgvClient.Dispose();
             mainTimer.Enabled = false;
             serverConnectTimer.Enabled = false;
             StopMove(); 
@@ -270,10 +271,8 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (span.TotalMilliseconds > StopDownMS)
             {
-                ol_noshelfWatch.Stop();
-
-                IOManager.CIOMove(IO_Type.OutL_OutStopDown, IO_VALUE.LOW);
-
+                ol_noshelfWatch.Stop(); 
+                IOManager.CIOMove(IO_Type.OutL_OutStopDown, IO_VALUE.LOW); 
             }
         }
         private DateTime il_lastCallAgvTime = DateTime.Now;

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -136,7 +136,7 @@ namespace OnlineStore.DeviceLibrary
             }
             catch (Exception ex)
             {
-                LogUtil.error("释放 agvClient " + ServerIp + " 出错：", ex);
+                LogUtil.error("agvClient.Close " + ServerIp + " 出错：", ex);
             }
         }
     }

source/DeviceLibrary/bean/StoreMoveInfo.cs

@@ -222,46 +222,7 @@ namespace OnlineStore.DeviceLibrary
         /// 轴原点信号
         /// </summary>
         internal static int W006_AxisOrg = 6;
-        /// <summary>
-        /// 料盘高度
-        /// </summary>
-        internal static int W007_ReelHeight = 7;
-        /// <summary>
-        /// 入库库位验证完成
-        /// </summary>
-        internal static int W008_InStoreCheckOK = 8;
-        /// <summary>
-        /// BOX可以开始入库
-        /// </summary>
-        internal static int W009_BoxCanInstore = 9;
-        /// <summary>
-        /// 等待横移34无托盘
-        /// </summary>
-        internal static int W010_SW34NoTray = 10;
-        /// <summary>
-        /// 入料模块：批量轴缓慢上升，并检测有料盘后停止
-        /// </summary>
-        internal static int W101_BatchAxisMove = 101;
-        /// <summary>
-        /// 入料模块扫码
-        /// </summary>
-        internal static int W102_FeedScanCode = 102;
-        /// <summary>
-        /// 入料横移机构空闲
-        /// </summary>
-        internal static int W103_FeedNoMove = 103;
-        /// <summary>
-        /// 移栽模块可移栽出库
-        /// </summary>
-        internal static int W201_ProvidingCanOut = 201;
-        /// <summary>
-        /// 等待出料流水线可以接收料盘
-        /// </summary>
-        internal static int W202_DLineCanOut = 202;
-        /// <summary>
-        ///等待出料皮带线扫码结束
-        /// </summary>
-        internal static int W301_DLineScanCode = 301;
+ 
     }
     public enum LineMoveType
     {
@@ -284,14 +245,6 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// 重置
         /// </summary>
-        StoreReset = 4,
-        ///// <summary>
-        ///// 移栽装置的停止，需要先远点返回，然后停止
-        ///// </summary>
-        //StopMove=5,
-        ///// <summary>
-        ///// 移栽检测托盘
-        ///// </summary>
-        //CheckFixture=6,
+        StoreReset = 4, 
     }
 }

source/LoadCVSLibrary/Config/bean/Store_IO_Type.cs

@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
- 
-
+using System.Text; 
 namespace OnlineStore.LoadCSVLibrary
 {
 
@@ -48,10 +46,7 @@ namespace OnlineStore.LoadCSVLibrary
         ///  DI 进料线阻挡检测2    InL_OutStopCheck
         /// </summary> 
         public static string InL_OutStopCheck = "InL_OutStopCheck";
-
-        
-
-
+         
         /// <summary>
         /// DI 出料线入口检测 OutL_InCheck
         /// </summary>
@@ -112,9 +107,6 @@ namespace OnlineStore.LoadCSVLibrary
         /// <summary>
         /// 高位
         /// </summary>
-        HIGH = 1,
-
-
-    }
-
+        HIGH = 1, 
+    } 
 }

source/VMILineClient/FrmVMIClient.Designer.cs

@@ -514,7 +514,7 @@
             // btnNeedEntry
             // 
             this.btnNeedEntry.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnNeedEntry.Location = new System.Drawing.Point(498, 22);
+            this.btnNeedEntry.Location = new System.Drawing.Point(496, 22);
             this.btnNeedEntry.Name = "btnNeedEntry";
             this.btnNeedEntry.Size = new System.Drawing.Size(132, 39);
             this.btnNeedEntry.TabIndex = 4;
@@ -525,7 +525,7 @@
             // btnNeedLeave
             // 
             this.btnNeedLeave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnNeedLeave.Location = new System.Drawing.Point(360, 22);
+            this.btnNeedLeave.Location = new System.Drawing.Point(358, 22);
             this.btnNeedLeave.Name = "btnNeedLeave";
             this.btnNeedLeave.Size = new System.Drawing.Size(132, 39);
             this.btnNeedLeave.TabIndex = 3;