1

dll/Client.xml

@@ -261,6 +261,16 @@
             是否连接服务器
             </summary>
         </member>
+        <member name="P:Asa.Client2.CancelState">
+            <summary>
+            取消状态，true发送none，false发送实际状态
+            </summary>
+        </member>
+        <member name="P:Asa.Client2.SendLog">
+            <summary>
+            仅发送命令的代码日志
+            </summary>
+        </member>
         <member name="M:Asa.Client2.Connect">
             <summary>
             连接

source/Common/util/LogUtil.cs

@@ -124,7 +124,7 @@ namespace OnlineStore.Common
                     logBox.AppendText(now.ToLongTimeString() + "  " + msg + Environment.NewLine); //增加文本
 
                     TimeSpan span = DateTime.Now - lastTime;
-                    if (span.TotalSeconds > 10)
+                    if (span.TotalSeconds > 3000000)
                     {
                         lastTime = DateTime.Now;
                         logBox.Select(logBox.Text.Length, 0);  //设置光标的位置到文本尾 
@@ -140,12 +140,24 @@ namespace OnlineStore.Common
         private static DateTime lastTime = DateTime.Now;
         public static void UpdateLogbox()
         {
-            if (logBox != null && logBox.Visible)
+            try
             {
+                if (logBox != null && logBox.Visible)
+                {
+                    logBox.Text = LastText;
 
-                logBox.Text = LastText;
-                logBox.Select(logBox.Text.Length, 0);  //设置光标的位置到文本尾 
-                logBox.ScrollToCaret(); //滚动到控件光标处 
+                    TimeSpan span = DateTime.Now - lastTime;
+                    if (span.TotalSeconds > 3000000)
+                    {
+                        lastTime = DateTime.Now;
+                        logBox.Select(logBox.Text.Length, 0);  //设置光标的位置到文本尾 
+                        logBox.ScrollToCaret(); //滚动到控件光标处 
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LOGGER.Error("出错：" + ex.ToString());
             }
         }
         public static void ClearLog()

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs

@@ -197,19 +197,19 @@ namespace OnlineStore.DeviceLibrary
                 // CylinderMove(MoveInfo, IO_Type.LocationCylinder_Up, IO_Type.LocationCylinder_Down);
             }
             else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_02_LocatinDown))
-            { 
+            {
                 MoveInfo.NextMoveStep(StoreMoveStep.BS_03_WaitArrive);
-                MoveInfo.TimeOutSeconds = 180;
-                MoveInfo.OneWaitCanEndStep = true;
-                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(180000));
-                InOutStoreLog(moveName + MoveInfo.SLog + "：再次调用 NeedLeave["+CurrShelfID+ "]，等待Agv " + Config.AgvNodeName + " Arrive ,最多等待180000");
-                AgvClient.SetStatus(Config.AgvNodeName, "", CurrShelfID, ClientAction.NeedLeave, ClientLevel.Low,true);
+                MoveInfo.TimeOutSeconds = 600;
+                //   MoveInfo.OneWaitCanEndStep = true;
+                //   MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(600000));
+                InOutStoreLog(moveName + MoveInfo.SLog + "：再次调用 NeedLeave[" + CurrShelfID + "]，等待Agv " + Config.AgvNodeName + " Arrive ,最多等待1200秒");
+                AgvClient.SetStatus(Config.AgvNodeName, "", CurrShelfID, ClientAction.NeedLeave, ClientLevel.Low, true);
                 //等待agv到达
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)ClientAction.Arrive));
             }
             else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_03_WaitArrive))
             {
-           
+
                 //agv到达
                 if (AgvClient.GetAction(Config.AgvNodeName).Equals(ClientAction.Arrive))
                 {
@@ -230,7 +230,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 MoveInfo.NextMoveStep(StoreMoveStep.BS_05_WaitReady);
                 MoveInfo.TimeOutSeconds = 120;
-                InOutStoreLog(moveName + MoveInfo.SLog + "：移门已打开，调用MayLeave[" + CurrShelfID + "]，等待agv " + Config.AgvNodeName+" Ready");
+                InOutStoreLog(moveName + MoveInfo.SLog + "：移门已打开，调用MayLeave[" + CurrShelfID + "]，等待agv " + Config.AgvNodeName + " Ready");
                 AgvClient.SetStatus(Config.AgvNodeName, "", CurrShelfID, ClientAction.MayLeave, ClientLevel.High, true);
 
                 //等待agv到达
@@ -238,9 +238,9 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_05_WaitReady))
             {
-                MoveInfo.NextMoveStep(StoreMoveStep.BS_06_LineBackRun); 
+                MoveInfo.NextMoveStep(StoreMoveStep.BS_06_LineBackRun);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
-                InOutStoreLog(moveName + MoveInfo.SLog + "：收到agv " + Config.AgvNodeName + " Ready ，线体开始反转"); 
+                InOutStoreLog(moveName + MoveInfo.SLog + "：收到agv " + Config.AgvNodeName + " Ready ，线体开始反转");
                 LineBackRun();
             }
             else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_06_LineBackRun))
@@ -254,7 +254,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 MoveInfo.NextMoveStep(StoreMoveStep.BS_08_WaitTime);
                 InOutStoreLog(moveName + MoveInfo.SLog + "：再转动1000 ， 等待入料口无信号");
-                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100)); 
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineIn_Check, IO_VALUE.LOW));
                 //等到agv离开
                 //MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction(AGVAction.FinishOut));

source/DeviceLibrary/agvClient/AgvClient.cs

-using Asa; 
+using Asa;
+using log4net;
 using OnlineStore.Common;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -10,6 +12,7 @@ namespace OnlineStore.DeviceLibrary
 {
     public class AgvClient
     {
+        public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp);
         private static Asa.Client2 agvClient;
         public static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>();
@@ -138,7 +141,7 @@ namespace OnlineStore.DeviceLibrary
                 bool isLog = ConfigAppSettings.GetIntValue(Setting_Init.Agv_Log_Open).Equals(1);
                 if (isLog)
                 {
-                    LogUtil.info(" AGV " + ServerIp + " Log : " + s);
+                    LOGGER.Info(" AGV " + ServerIp + " Log : " + s);
                 }
             }
             catch (Exception ex)