Skip to content

孙克 / RC1250-ACPackingStore

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

AgvClient_EnterShelf bug修改

1 个父辈 58423824
内嵌 并排
正在显示 2 个修改的文件 包含 6 行增加 和 15 行删除
source/ACPackingStore/FrmStore.Designer.cs
...@@ -130,8 +130,6 @@ ...@@ -130,8 +130,6 @@
// chbAGV // chbAGV
// //
this.chbAGV.AutoSize = true; this.chbAGV.AutoSize = true;
this.chbAGV.Checked = true;
this.chbAGV.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbAGV.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAGV.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAGV.Location = new System.Drawing.Point(36, 470); this.chbAGV.Location = new System.Drawing.Point(36, 470);
this.chbAGV.Name = "chbAGV"; this.chbAGV.Name = "chbAGV";
......
source/DeviceLibrary/agvClient/AgvClient.cs
...@@ -55,10 +55,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -55,10 +55,8 @@ namespace OnlineStore.DeviceLibrary
} }
private static void AgvClient_EnterShelf(string id, string rfid) private static void AgvClient_EnterShelf(string id, string rfid)
{ {
// RFIDData data = new RFIDData(content); LogUtil.info("收到 AgvClient_EnterShelf [" + id + "] [" + rfid+ "] ");
LogUtil.info("收到 AgvClient_EnterShelf [" + id + "] [" + rfid+ "] ");
StoreManager.Store.AGVProcess(id, rfid, ClientAction.Arrive);
foreach (AC_BOX_Bean box in StoreManager.Store.BoxMap.Values) foreach (AC_BOX_Bean box in StoreManager.Store.BoxMap.Values)
{ {
if (box.Config.AgvNodeName.Equals(id)) if (box.Config.AgvNodeName.Equals(id))
...@@ -76,8 +74,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -76,8 +74,7 @@ namespace OnlineStore.DeviceLibrary
} }
public static Dictionary<string, DateTime> closeDoorTimeMap = new Dictionary<string, DateTime>(); public static Dictionary<string, DateTime> closeDoorTimeMap = new Dictionary<string, DateTime>();
private static void AgvClient_CloseDoor(string id, string rfid) private static void AgvClient_CloseDoor(string id, string rfid)
{ {
// RFIDData data = new RFIDData(content);
LogUtil.info("收到 AgvClient_CloseDoor [" + id + "] [" + rfid+ "] "); LogUtil.info("收到 AgvClient_CloseDoor [" + id + "] [" + rfid+ "] ");
if (closeDoorTimeMap.ContainsKey(id)) if (closeDoorTimeMap.ContainsKey(id))
...@@ -88,8 +85,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -88,8 +85,7 @@ namespace OnlineStore.DeviceLibrary
} }
public static void SetStatus(string id, string mark = "", string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low, bool isMust = false) public static void SetStatus(string id, string mark = "", string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low, bool isMust = false)
{ {
// ClientAction currA = GetAction(id);
if (!isMust) if (!isMust)
{ {
if (actionMap.ContainsKey(id)) if (actionMap.ContainsKey(id))
...@@ -111,8 +107,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -111,8 +107,7 @@ namespace OnlineStore.DeviceLibrary
private static void AgvClient_Ready(string id, string rfid) private static void AgvClient_Ready(string id, string rfid)
{ {
UpdateAction(id, ClientAction.Ready); UpdateAction(id, ClientAction.Ready);
// RFIDData data = new RFIDData(content);
LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + rfid+ "] "); LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + rfid+ "] ");
StoreManager.Store.AGVProcess(id, rfid, ClientAction.Ready); StoreManager.Store.AGVProcess(id, rfid, ClientAction.Ready);
} }
...@@ -120,10 +115,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -120,10 +115,8 @@ namespace OnlineStore.DeviceLibrary
private static void AgvClient_Arrive(string id, string rfid) private static void AgvClient_Arrive(string id, string rfid)
{ {
UpdateAction(id, ClientAction.Arrive); UpdateAction(id, ClientAction.Arrive);
// RFIDData data = new RFIDData(content);
LogUtil.info("收到 AgvClient_Arrive [" + id + "] [" + rfid+ "] "); LogUtil.info("收到 AgvClient_Arrive [" + id + "] [" + rfid+ "] ");
StoreManager.Store.AGVProcess(id, rfid,ClientAction.Arrive); StoreManager.Store.AGVProcess(id, rfid,ClientAction.Arrive);
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!