From 01cc5773457f68274ef1b2d9d9daca8983761828 Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期四, 05 六月 2025 17:33:03 +0800
Subject: [PATCH] 佳通bug优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/util/Settings.cs | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/util/Settings.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/util/Settings.cs
index d26bbe1..846a55c 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/util/Settings.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/util/Settings.cs
@@ -20,8 +20,7 @@
public static string WHCode { get; set; }
public static string FacCode { get; set; }
public static string NDCApiUrl { get; set; }
- public static string baseTrayOutBufferLoc { get; set; }
- public static string baseTrayInBufferLoc { get; set; }
+ public static List<BaseTrayBufferLoc> baseTrayBufferLocList { get; set; }
public static string errorBufferArea { get; set; }
public static string storeAreaCode { get; set; }
public static List<AgvWaitLoc> agvWaitLocList { get; set; }
@@ -65,13 +64,9 @@
{
agvJBLocList = JsonConvert.DeserializeObject<List<AgvJBLoc>>(keyValue.Value.ToString());
}
- if (keyValue.Name == "baseTrayOutBufferLoc")
+ if (keyValue.Name == "baseTrayBufferLoc")
{
- baseTrayOutBufferLoc = keyValue.Value.ToString();
- }
- if (keyValue.Name == "baseTrayInBufferLoc")
- {
- baseTrayInBufferLoc = keyValue.Value.ToString();
+ baseTrayBufferLocList = JsonConvert.DeserializeObject<List<BaseTrayBufferLoc>>(keyValue.Value.ToString());
}
if (keyValue.Name == "NDCApiUrl")
{
@@ -117,14 +112,13 @@
/// <summary>
/// 鑾峰彇AGV鎺ラ┏浣� /// </summary>
- /// <param name="type"> 1.agv鎺ラ┏浣� 2.浜哄伐鎺ラ┏浣�</param>
/// <param name="roadway"></param>
/// <param name="action"> 0.閫氱敤 1.鍏ュ簱 2.鍑哄簱</param>
/// <returns></returns>
- public static List<string> getAgvJBLocList(int type, int roadway ,int action)
+ public static List<string> getAgvJBLocList( int roadway ,int action)
{
List<string> locCodes = new List<string>();
- var agvJbLocList = agvJBLocList.Where(a => a.type == type && a.roadway.Contains(roadway) && a.action == action).Select(a => a.locCode).ToList();
+ var agvJbLocList = agvJBLocList.Where(a => a.roadway.Contains(roadway) && a.action == action).Select(a => a.locCode).ToList();
if (agvJBLocList.Count > 0)
{
Dictionary<string, int> keyValuePairs = new Dictionary<string, int>();
@@ -150,13 +144,18 @@
return agvJBLocList.Where(a => a.locCode == locCode).FirstOrDefault();
}
+ public class BaseTrayBufferLoc
+ {
+ public string bufferOutLoc { get; set; }
+ public string bufferInLoc { get; set; }
+ }
+
public class AgvJBLoc
{
public string locCode { get; set; }
public string name { get; set; }
- public int type { get; set; } // 1.agv鎺ラ┏浣� 2.浜哄伐鎺ラ┏浣�
public List<int> roadway { get; set; }
- public int action { get; set; } // 0.閫氱敤 1.鍏ュ簱 2.鍑哄簱
+ public int action { get; set; } // 1.鍏ュ簱 2.鍑哄簱
}
public class AgvWaitLoc
--
Gitblit v1.9.1