From 16d2162a833cebeae72c363962917bb9da8145ef Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期五, 06 六月 2025 17:34:47 +0800
Subject: [PATCH] 福建佳通优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/util/Settings.cs | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/util/Settings.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/util/Settings.cs
index 3ad20b8..7520040 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/util/Settings.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.FJJT/util/Settings.cs
@@ -16,6 +16,7 @@
public static List<LinePlcInfo> linePlcInfo { get; set; }
public static List<PlcValue> plcValue { get; set; }
public static List<AreaProperty> areaPropertyList { get; set; }
+ public static List<AreaRelevance> areaRelevanceList { get; set; }
public static int port { get; set; }
public static string WHCode { get; set; }
public static string FacCode { get; set; }
@@ -73,6 +74,10 @@
{
areaPropertyList = JsonConvert.DeserializeObject<List<AreaProperty>>(keyValue.Value.ToString());
}
+ if (keyValue.Name == "AreaRelevance")
+ {
+ areaRelevanceList = JsonConvert.DeserializeObject<List<AreaRelevance>>(keyValue.Value.ToString());
+ }
}
}
}
@@ -92,17 +97,34 @@
return areaPropertyList.Where(a => a.cntrType.Contains(cntrType)).Select(a => a.areaCode).ToList();
}
+ /// <summary>
+ /// 鏌ヨ瀛樺偍搴撳尯
+ /// </summary>
+ /// <param name="areaCode"></param>
+ /// <returns></returns>
+ public static List<string> getRelAreaCodes(string areaCode)
+ {
+ List<string> areaCodes = new List<string>();
+ var areaRelevance = areaRelevanceList.Where(a => a.areaCode == areaCode).FirstOrDefault();
+ if (areaRelevance != null)
+ {
+ areaCodes = areaRelevance.relAreaCode;
+ }
+ return areaCodes;
+ }
+
+ public class AreaRelevance
+ {
+ public string areaCode { get; set; }
+ public List<string> relAreaCode { get; set; }
+ }
+
public class AreaProperty
{
public string areaName { get; set; }
public string areaCode { get; set; }
public List<int> cntrType { get; set; } // 瀹瑰櫒绫诲瀷 1.鑳庨潰锛�.鑳庝晶锛�.鍐呰‖锛�.甯樺竷锛�.鐜甫锛�.鍐犲甫锛�.閽㈠寘
}
-
-
-
-
-
public class deviceInfo {
public string address { get; set; }
--
Gitblit v1.9.1