diff --git a/WindowsFormsApp1/MainForm.cs b/WindowsFormsApp1/MainForm.cs index 15a3435..ba1c2c9 100644 --- a/WindowsFormsApp1/MainForm.cs +++ b/WindowsFormsApp1/MainForm.cs @@ -240,6 +240,8 @@ namespace WindowsFormsApp1 { string returnValue = scanForm.ReturnValue; otherdata.JS_SN = returnValue; + + Init.ScanString = returnValue; } else { diff --git a/WindowsFormsApp1/Program.cs b/WindowsFormsApp1/Program.cs index 50ac108..54a1787 100644 --- a/WindowsFormsApp1/Program.cs +++ b/WindowsFormsApp1/Program.cs @@ -51,6 +51,7 @@ namespace WindowsFormsApp1 public static List t_Lineplcs; public static List threadHelps; + public static string ScanString; //PLC状态存储 public static short Plcstatus = -1; diff --git a/WindowsFormsApp1/server/SiemensHelp.cs b/WindowsFormsApp1/server/SiemensHelp.cs index 5cb0584..aa106d9 100644 --- a/WindowsFormsApp1/server/SiemensHelp.cs +++ b/WindowsFormsApp1/server/SiemensHelp.cs @@ -9,6 +9,7 @@ using WindowsFormsApp1.mod; using WindowsFormsApp1.mod.server; using System.Collections; using System.Xml.Linq; +using Newtonsoft.Json.Linq; namespace WindowsFormsApp1.server { @@ -177,7 +178,7 @@ namespace WindowsFormsApp1.server List writeaddress = new List(); //address = address.FindAll(a => a.code != "Write_Heartbeat"); - foreach (var add in address) + foreach (var add in address.Where(a=>a.type == "write")) { foreach (var p in PlcData.GetType().GetProperties()) { @@ -328,7 +329,16 @@ namespace WindowsFormsApp1.server break; case "string": - byte[] tochar = Encoding.ASCII.GetBytes(((string)value).PadRight(address[i].addresstypelegth, ' ')); + byte[] tochar = new byte[address[i].addresstypelegth]; + + var byte1 = Convert.ToByte((address[i].addresstypelegth - 2).ToString()); + var byte2 = Convert.ToByte( (((string)value).Length).ToString() ); + var byte3 = Encoding.ASCII.GetBytes((string)value); + + tochar[0] = byte1; + tochar[1] = byte2; + + Array.Copy(byte3, 0, tochar, 2, byte3.Length); tochar.CopyTo(writebyte, index); break;