From 790eb4d466531a0a727fbc617eb6447167c1da54 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期五, 16 五月 2025 14:20:14 +0800
Subject: [PATCH] 天津艾默生agv
---
HH.WCS.Mobox3/HH.WCS.Mobox3.Emerson/util/Settings.cs | 37 +------------------------------------
1 files changed, 1 insertions(+), 36 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.EmersonWCS/util/Settings.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.Emerson/util/Settings.cs
similarity index 76%
rename from HH.WCS.Mobox3/HH.WCS.Mobox3.EmersonWCS/util/Settings.cs
rename to HH.WCS.Mobox3/HH.WCS.Mobox3.Emerson/util/Settings.cs
index a89d683..2c4e04c 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.EmersonWCS/util/Settings.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.Emerson/util/Settings.cs
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.Text.Json.Nodes;
-namespace HH.WCS.EmersonWcs.util
+namespace HH.WCS.Emerson.util
{
public class Settings
{
@@ -13,9 +13,7 @@
public static string GZSeverUrl { get; set; }
public static string SqlServer { get; set; }
public static string SqlServer1 { get; set; }
- public static List<ConveyorLinesInfoModel> ConveyorLinesInfo { get; set; }
public static List<deviceInfo> deviceInfos { get; set; }
- public static List<LinePlcInfo> linePlcInfo { get; set; }
public static int port { get; set; }
public static string WHCode { get; set; }
public static string FacCode { get; set; }
@@ -100,14 +98,6 @@
{
deviceInfos = JsonConvert.DeserializeObject<List<deviceInfo>>(keyValue.Value.ToString());
}
- if (keyValue.Name == "ConveyorLinesInfo")
- {
- ConveyorLinesInfo = JsonConvert.DeserializeObject<List<ConveyorLinesInfoModel>>(keyValue.Value.ToString());
- }
- if (keyValue.Name == "linePlcInfo")
- {
- linePlcInfo = JsonConvert.DeserializeObject<List<LinePlcInfo>>(keyValue.Value.ToString());
- }
}
}
@@ -137,30 +127,5 @@
public string code { get; set; }
}
- public class ConveyorLinesInfoModel
- {
- public string deviceNo { get; set; }
- public string deviceSign { get; set; }
- public int code { get; set; }
- public string location { get; set; }
- public int writeAddr { get; set; }
- public int readAddr { get; set; }
- public int enable { get; set; }
- }
-
- public class LinePlcInfo
- {
- public string code { get; set; }
- public string location { get; set; }
- public string deviceNo { get; set; }
- public string address { get; set; }
- public int writeAddr { get; set; }
- public int readAddr { get; set; }
- public string[] useAddrNo { get; set; }
- public string inLoca { get; set; }
- public string outLoca { get; set; }
- public string taskType { get; set; }
- public int enable { get; set; }
- }
}
}
--
Gitblit v1.9.1