Skip to content

孙克 / RC1250-ACPackingStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 8c704242 由 LN
选项

1

1 个父辈 1e5c7724
内嵌 并排
正在显示 5 个修改的文件 包含 43 行增加 和 18 行删除
dll/Client.dll
此文件类型无法预览
dll/Client.xml
...@@ -261,6 +261,16 @@ ...@@ -261,6 +261,16 @@
是否连接服务器 是否连接服务器
</summary> </summary>
</member> </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"> <member name="M:Asa.Client2.Connect">
<summary> <summary>
连接 连接
......
source/Common/util/LogUtil.cs
...@@ -124,7 +124,7 @@ namespace OnlineStore.Common ...@@ -124,7 +124,7 @@ namespace OnlineStore.Common
logBox.AppendText(now.ToLongTimeString() + " " + msg + Environment.NewLine); //增加文本 logBox.AppendText(now.ToLongTimeString() + " " + msg + Environment.NewLine); //增加文本
TimeSpan span = DateTime.Now - lastTime; TimeSpan span = DateTime.Now - lastTime;
if (span.TotalSeconds > 10) if (span.TotalSeconds > 3000000)
{ {
lastTime = DateTime.Now; lastTime = DateTime.Now;
logBox.Select(logBox.Text.Length, 0); //设置光标的位置到文本尾 logBox.Select(logBox.Text.Length, 0); //设置光标的位置到文本尾
...@@ -140,12 +140,24 @@ namespace OnlineStore.Common ...@@ -140,12 +140,24 @@ namespace OnlineStore.Common
private static DateTime lastTime = DateTime.Now; private static DateTime lastTime = DateTime.Now;
public static void UpdateLogbox() public static void UpdateLogbox()
{ {
if (logBox != null && logBox.Visible) try
{ {
if (logBox != null && logBox.Visible)
{
logBox.Text = LastText;
logBox.Text = LastText; TimeSpan span = DateTime.Now - lastTime;
logBox.Select(logBox.Text.Length, 0); //设置光标的位置到文本尾 if (span.TotalSeconds > 3000000)
logBox.ScrollToCaret(); //滚动到控件光标处 {
lastTime = DateTime.Now;
logBox.Select(logBox.Text.Length, 0); //设置光标的位置到文本尾
logBox.ScrollToCaret(); //滚动到控件光标处
}
}
}
catch (Exception ex)
{
LOGGER.Error("出错：" + ex.ToString());
} }
} }
public static void ClearLog() public static void ClearLog()
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs
...@@ -197,19 +197,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -197,19 +197,19 @@ namespace OnlineStore.DeviceLibrary
// CylinderMove(MoveInfo, IO_Type.LocationCylinder_Up, IO_Type.LocationCylinder_Down); // CylinderMove(MoveInfo, IO_Type.LocationCylinder_Up, IO_Type.LocationCylinder_Down);
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_02_LocatinDown)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_02_LocatinDown))
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BS_03_WaitArrive); MoveInfo.NextMoveStep(StoreMoveStep.BS_03_WaitArrive);
MoveInfo.TimeOutSeconds = 180; MoveInfo.TimeOutSeconds = 600;
MoveInfo.OneWaitCanEndStep = true; // MoveInfo.OneWaitCanEndStep = true;
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(180000)); // MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(600000));
InOutStoreLog(moveName + MoveInfo.SLog + "：再次调用 NeedLeave["+CurrShelfID+ "]，等待Agv " + Config.AgvNodeName + " Arrive ,最多等待180000"); InOutStoreLog(moveName + MoveInfo.SLog + "：再次调用 NeedLeave[" + CurrShelfID + "]，等待Agv " + Config.AgvNodeName + " Arrive ,最多等待1200秒");
AgvClient.SetStatus(Config.AgvNodeName, "", CurrShelfID, ClientAction.NeedLeave, ClientLevel.Low,true); AgvClient.SetStatus(Config.AgvNodeName, "", CurrShelfID, ClientAction.NeedLeave, ClientLevel.Low, true);
//等待agv到达 //等待agv到达
MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)ClientAction.Arrive)); MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)ClientAction.Arrive));
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_03_WaitArrive)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_03_WaitArrive))
{ {
//agv到达 //agv到达
if (AgvClient.GetAction(Config.AgvNodeName).Equals(ClientAction.Arrive)) if (AgvClient.GetAction(Config.AgvNodeName).Equals(ClientAction.Arrive))
{ {
...@@ -230,7 +230,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -230,7 +230,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BS_05_WaitReady); MoveInfo.NextMoveStep(StoreMoveStep.BS_05_WaitReady);
MoveInfo.TimeOutSeconds = 120; 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); AgvClient.SetStatus(Config.AgvNodeName, "", CurrShelfID, ClientAction.MayLeave, ClientLevel.High, true);
//等待agv到达 //等待agv到达
...@@ -238,9 +238,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -238,9 +238,9 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_05_WaitReady)) 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)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
InOutStoreLog(moveName + MoveInfo.SLog + "：收到agv " + Config.AgvNodeName + " Ready ，线体开始反转"); InOutStoreLog(moveName + MoveInfo.SLog + "：收到agv " + Config.AgvNodeName + " Ready ，线体开始反转");
LineBackRun(); LineBackRun();
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_06_LineBackRun)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_06_LineBackRun))
...@@ -254,7 +254,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -254,7 +254,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BS_08_WaitTime); MoveInfo.NextMoveStep(StoreMoveStep.BS_08_WaitTime);
InOutStoreLog(moveName + MoveInfo.SLog + "：再转动1000 ， 等待入料口无信号"); 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)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineIn_Check, IO_VALUE.LOW));
//等到agv离开 //等到agv离开
//MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction(AGVAction.FinishOut)); //MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction(AGVAction.FinishOut));
......
source/DeviceLibrary/agvClient/AgvClient.cs
using Asa; using Asa;
using log4net;
using OnlineStore.Common; using OnlineStore.Common;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
...@@ -10,6 +12,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -10,6 +12,7 @@ namespace OnlineStore.DeviceLibrary
{ {
public class AgvClient public class AgvClient
{ {
public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp); private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp);
private static Asa.Client2 agvClient; private static Asa.Client2 agvClient;
public static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>(); public static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>();
...@@ -138,7 +141,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -138,7 +141,7 @@ namespace OnlineStore.DeviceLibrary
bool isLog = ConfigAppSettings.GetIntValue(Setting_Init.Agv_Log_Open).Equals(1); bool isLog = ConfigAppSettings.GetIntValue(Setting_Init.Agv_Log_Open).Equals(1);
if (isLog) if (isLog)
{ {
LogUtil.info(" AGV " + ServerIp + " Log : " + s); LOGGER.Info(" AGV " + ServerIp + " Log : " + s);
} }
} }
catch (Exception ex) catch (Exception ex)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!