diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 653918f5..00000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.vs/HighWayIot/v16/.suo b/.vs/HighWayIot/v16/.suo index f010505d..d1e65301 100644 Binary files a/.vs/HighWayIot/v16/.suo and b/.vs/HighWayIot/v16/.suo differ diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll index a8001b1f..dead5ea8 100644 Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb index 1861d801..46d305e1 100644 Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll index 015d6020..30bae7e5 100644 Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb index 50cbe113..a3ec7c87 100644 Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 21bd7271..6da11dd8 100644 Binary files a/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index 1a8d15ef..6f15ce90 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache index 2f4e9963..894f71b9 100644 --- a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a7b9700ece89019f9a8fff2497527f9b8c1e51ea +ac0a11ee7fe82dce7ae2872df4df8f2250e5b258 diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt index ca69a23d..2d1151b1 100644 --- a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt +++ b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt @@ -22,3 +22,15 @@ Z:\Desktop\日常代码\HighWayIot\HighWayIot.Common\obj\Debug\HighWayIot.Common \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\bin\Debug\HighWayIot.Common.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\bin\Debug\HighWayIot.Common.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\bin\Debug\Newtonsoft.Json.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\bin\Debug\log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\bin\Debug\Newtonsoft.Json.xml +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.AssemblyReference.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CoreCompileInputs.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll b/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll index a8001b1f..dead5ea8 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb b/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb index 1861d801..46d305e1 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll index 015d6020..30bae7e5 100644 Binary files a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb index 50cbe113..a3ec7c87 100644 Binary files a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 4597be03..ccf231db 100644 Binary files a/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache new file mode 100644 index 00000000..11724aac Binary files /dev/null and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache index 3762e2d0..9c16cd0d 100644 --- a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6f7defaf25a86df26f2efd6b8c372b276f6bf154 +59081c031c66312c4725da63a7bc5bcf0307991e diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt index 5e1a04a8..90151ce4 100644 --- a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt +++ b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt @@ -13,3 +13,11 @@ Z:\Desktop\日常代码\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4n \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\bin\Debug\log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.AssemblyReference.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CoreCompileInputs.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll index 015d6020..30bae7e5 100644 Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb index 50cbe113..a3ec7c87 100644 Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll b/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll index 14dd6555..4c8ddd1c 100644 Binary files a/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll and b/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll differ diff --git a/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb b/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb index 50e7ad55..ea7823b7 100644 Binary files a/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb and b/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb differ diff --git a/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 4e119e32..7409024a 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache index 8daa58fa..e7698930 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache index 701b4c0a..9e05b27f 100644 --- a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -769ef64c9f2ab6d9958444e33f074374d10eae52 +e061e4de927ddb3fdef27ae1bced63ffbea99d10 diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.FileListAbsolute.txt b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.FileListAbsolute.txt index 79300d4f..3e711e0e 100644 --- a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.FileListAbsolute.txt +++ b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.FileListAbsolute.txt @@ -16,3 +16,12 @@ Z:\Desktop\日常代码\HighWayIot\HighWayIot.Mqtt\bin\Debug\MQTTnet.dll \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CopyComplete \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\bin\Debug\HighWayIot.Mqtt.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\bin\Debug\HighWayIot.Mqtt.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\bin\Debug\log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\bin\Debug\MQTTnet.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.AssemblyReference.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CoreCompileInputs.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CopyComplete +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll index 14dd6555..4c8ddd1c 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.pdb b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.pdb index 50e7ad55..ea7823b7 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.pdb and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.pdb differ diff --git a/HighWayIot.Plc/HighWayIot.Plc.csproj b/HighWayIot.Plc/HighWayIot.Plc.csproj index 22b9cc92..1977e6e2 100644 --- a/HighWayIot.Plc/HighWayIot.Plc.csproj +++ b/HighWayIot.Plc/HighWayIot.Plc.csproj @@ -46,7 +46,8 @@ - + + diff --git a/HighWayIot.Plc/Impl/SiemensPlc.cs b/HighWayIot.Plc/Impl/SiemensPlc.cs new file mode 100644 index 00000000..e9b6b26a --- /dev/null +++ b/HighWayIot.Plc/Impl/SiemensPlc.cs @@ -0,0 +1,405 @@ +using HighWayIot.Common; +using HighWayIot.Log4net; +using HslCommunication; +using HslCommunication.Profinet.Siemens; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Plc.Impl +{ + public class SiemensPlc + { + + private LogHelper logHelper = LogHelper.Instance; + + private StringChange stringChange = StringChange.Instance; + + private const SiemensPLCS type = SiemensPLCS.S200Smart; + + private SiemensS7Net s7 = new SiemensS7Net(type); + + public SiemensPlc() + { + if (!HslCommunication.Authorization.SetAuthorizationCode("30c15272-3960-4853-9fab-3087392ee5cd")) + { + logHelper.Info("HslCommunication激活失败"); + return; + } + } + + public bool IsConnected { get; set; } + + /// + /// 建立连接 + /// + /// + /// + /// + /// + public bool Connect(string IP, int port) + { + logHelper.PlcLog("西门子S7系列PLC连接开始"); + s7.IpAddress = IP; + s7.Port = 102; + try + { + OperateResult connect = s7.ConnectServer(); + if (connect.IsSuccess) + { + this.IsConnected = true; + logHelper.PlcLog("西门子S7系列PLC建立连接成功!!!"); + return true; + } + else + { + this.IsConnected = false; + logHelper.PlcLog("西门子S7系列PLC建立连接失败!!!"); + return false; + } + } + catch (Exception ex) + { + this.IsConnected = false; + logHelper.Error("西门子S7系列PLC建立连接异常", ex); + return false; + } + } + + /// + /// 通过地址和长度读取PLC数据 + /// + /// + /// + /// + /// + public byte[] readValueByAddress(int len, string address) + { + //logHelper.PlcLog("开始通过PLC地址和长度读取PLC数据"); + try + { + OperateResult read = s7.Read(address, (ushort)(len)); + if (read.IsSuccess) + { + byte[] result = stringChange.ConvertFloatToINt(read.Content); + logHelper.PlcLog(String.Format("通过地址和长度读取PLC数据成功:{0}", stringChange.bytesToHexStr(result, result.Length))); + return result; + } + else + { + logHelper.PlcLog("通过地址和长度读取PLC数据失败!!!"); + this.IsConnected = false; + return new byte[0]; + } + } + catch (Exception ex) + { + logHelper.Error("通过地址和长度读取PLC数据异常", ex); + this.IsConnected = false; + return new byte[0]; + } + } + + /// + /// 通过PLC地址写入int类型数据 + /// + /// + /// + /// + /// + public bool writeValueByAddress(int value, string address) + { + //logHelper.PlcLog(String.Format("开始通过PLC地址{0}写入int类型数据{1}",address,value)); + try + { + OperateResult operateResult = s7.Write(address, Convert.ToInt32(value)); + if (operateResult.IsSuccess) + { + logHelper.PlcLog(String.Format("开始通过PLC地址{0}写入int类型数据{1}成功", address, value)); + return true; + } + logHelper.PlcLog(String.Format("开始通过PLC地址{0}写入int类型数据{1}失败!!!", address, value)); + this.IsConnected = false; + return false; + } + catch (Exception ex) + { + logHelper.Error("通过PLC地址写入int类型数据", ex); + this.IsConnected = false; + return false; + } + } + + /// + /// 通过PLC地址清零数据 + /// + /// + /// + /// + /// + public bool resetByAddress(string address, int len) + { + //logHelper.PlcLog(String.Format("开发通过PLC地址{0}清零数据", address)); + try + { + byte[] write = new byte[len * 2]; + for (int i = 0; i < len * 2; i++) + { + write[i] = 0; + } + OperateResult operateResult = s7.Write(address, write); + + if (operateResult.IsSuccess) + { + logHelper.PlcLog(String.Format("通过PLC地址{0}清零数据成功", address)); + return true; + } + logHelper.PlcLog(String.Format("通过PLC地址{0}清零数据失败!!!", address)); + return false; + } + catch (Exception ex) + { + logHelper.Error(String.Format("通过PLC地址{0}清零数据异常", address), ex); + return false; + } + } + + /// + /// 通过PLC地址读取EA值 + /// + /// + /// + /// + public string readEaByAddress(string address) + { + //logHelper.PlcLog(String.Format("通过PLC地址{0}读取EA值", address)); + try + { + OperateResult read = s7.Read(address, (ushort)(8)); + + if (read.IsSuccess && read.Content != null) + { + string result = Convert.ToString(read.Content); + logHelper.PlcLog(String.Format("通过PLC地址{0}读取EA值成功:{1}", address, result)); + return result; + } + else + { + logHelper.PlcLog(String.Format("通过PLC地址{0}读取EA值失败!!!", address)); + this.IsConnected = false; + return ""; + } + } + catch (Exception ex) + { + logHelper.Error("通过PLC地址读取EA值异常", ex); + this.IsConnected = false; + return ""; + } + } + + /// + /// 通过PLC地址读取交互信号 + /// + /// + /// + public int readInteractiveSignal(string address) + { + //logHelper.PlcLog(String.Format("开始通过PLC地址{0}读取交互信号", address)); + try + { + OperateResult read = s7.ReadInt16(address); + if (read.IsSuccess) + { + logHelper.PlcLog(String.Format("通过PLC地址{0}读取交互信号成功:{1}", address, read.Content)); + return read.Content; + } + logHelper.PlcLog(String.Format("通过PLC地址{0}读取交互信号失败!!!", address)); + this.IsConnected = false; + return 0; + } + catch (Exception ex) + { + logHelper.Error("通过PLC地址读取交互信号异常", ex); + this.IsConnected = false; + return 0; + } + } + + /// + /// 通过PLC地址读取int32类型数据 + /// + /// + /// + public int readInt32ByAddress(string address) + { + //logHelper.PlcLog(String.Format("开始通过PLC地址{0}读取int32类型数据",address)); + try + { + OperateResult read = s7.ReadInt16(address); + if (read.IsSuccess) + { + logHelper.PlcLog(String.Format("通过PLC地址{0}读取int32类型数据成功:{1}", address, read.Content)); + return read.Content; + } + logHelper.PlcLog(String.Format("通过PLC地址{0}读取int32类型数据失败!!!", address)); + this.IsConnected = false; + return 0; + } + catch (Exception ex) + { + logHelper.Error("通过PLC地址读取int32类型数据异常", ex); + this.IsConnected = false; + return 0; + } + } + + /// + /// 通过PLC地址写入int32类型数据 + /// + /// + /// + /// + /// + public bool writeInt32ByAddress(string address, int value) + { + logHelper.PlcLog(String.Format("开始通过PLC地址{0}写入int32类型数据{1}", address, value)); + try + { + OperateResult write = s7.Write(address, short.Parse(Convert.ToString(value))); + if (write.IsSuccess) + { + logHelper.PlcLog(String.Format("通过PLC地址{0}写入int32类型数据{1}成功", address, value)); + return true; + } + logHelper.PlcLog(String.Format("通过PLC地址{0}写入int32类型数据{1}失败!!!", address, value)); + this.IsConnected = false; + return false; + } + catch (Exception ex) + { + logHelper.Error(String.Format("通过PLC地址{0}写入int32类型数据异常", address), ex); + this.IsConnected = false; + return false; + } + } + + /// + /// 通过PLC地址写入String类型数据 + /// + /// + /// + /// + /// + public bool writeStringByAddress(string address, string value) + { + //logHelper.PlcLog(String.Format("通过PLC地址{0}写入String类型数据{1}",address,value)); + try + { + OperateResult operateResult = s7.Write(address, value); + if (operateResult.IsSuccess) + { + logHelper.PlcLog(String.Format("通过PLC地址{0}写入String类型数据{1}成功", address, value)); + return true; + } + logHelper.PlcLog(String.Format("通过PLC地址{0}写入String类型数据{1}失败!!!", address, value)); + //this.IsConnected = false; + return false; + } + catch (Exception ex) + { + logHelper.Error(String.Format("通过PLC地址{0}写入String类型数据异常", address), ex); + //this.IsConnected = false; + return false; + } + } + + /// + /// 通过PLC地址读取string类型数据 + /// + /// + /// + /// + public string readStringByAddress(string address, ushort length) + { + //logHelper.PlcLog(String.Format("开始通过PLC地址{0}读取string类型数据", address)); + try + { + OperateResult read = s7.ReadString(address, length); + if (read.IsSuccess) + { + logHelper.PlcLog(String.Format("通过PLC地址{0}读取string类型数据成功:{1}", address, read.Content)); + return read.Content; + } + logHelper.PlcLog(String.Format("通过PLC地址{0}读取string类型数据失败!!!", address)); + this.IsConnected = false; + return ""; + } + catch (Exception ex) + { + logHelper.Error("通过PLC地址读取int32类型数据异常", ex); + return ""; + } + } + + /// + /// 通过PLC地址读取Bool类型数据 + /// + /// + /// + /// + public bool readBoolByAddress(string address) + { + //logHelper.PlcLog(String.Format("开始通过PLC地址{0}读取bool类型数据", address)); + try + { + OperateResult read = s7.ReadBool(address); + if (read.IsSuccess) + { + logHelper.PlcLog(String.Format("通过PLC地址{0}读取bool类型数据成功:{1}", address, read.Content)); + return read.Content; + } + logHelper.PlcLog(String.Format("通过PLC地址{0}读取bool类型数据失败!!!", address)); + this.IsConnected = false; + return false; + } + catch (Exception ex) + { + logHelper.Error("通过PLC地址读取int32类型数据异常", ex); + this.IsConnected = false; + return false; + } + } + + /// + /// 通过PLC地址写入Bool类型数据 + /// + /// + /// + /// + public bool writeBoolByAddress(string address, bool value) + { + //logHelper.PlcLog(String.Format("开始通过PLC地址{0}写入bool类型数据{1}", address, value)); + try + { + OperateResult write = s7.Write(address, short.Parse(stringChange.ParseToInt(value ? "1" : "0").ToString())); + if (write.IsSuccess) + { + logHelper.PlcLog(String.Format("通过PLC地址{0}写入bool类型数据{1}成功", address, value)); + return true; + } + logHelper.PlcLog(String.Format("通过PLC地址{0}写入bool类型数据{1}失败!!!", address, value)); + this.IsConnected = false; + return false; + } + catch (Exception ex) + { + logHelper.Error(String.Format("通过PLC地址{0}写入bool类型数据异常", address), ex); + this.IsConnected = false; + return false; + } + } + } +} \ No newline at end of file diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Plc/bin/Debug/HighWayIot.Common.dll index a8001b1f..dead5ea8 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Plc/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Plc/bin/Debug/HighWayIot.Common.pdb index 1861d801..46d305e1 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Plc/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.dll index 015d6020..30bae7e5 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.pdb index 50cbe113..a3ec7c87 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll index aa010cb8..7c4f0d20 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll and b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll differ diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb index a15f32e8..14192d95 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb and b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb differ diff --git a/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8620b3c0..2be310f8 100644 Binary files a/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index 6f7ab76a..d9459a06 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.CoreCompileInputs.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.CoreCompileInputs.cache index b7a921d7..5e5feb4f 100644 --- a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a8516619b84e06bea86e54aad13f21e97c77c103 +d3a2b36425c9fe84169998718143e6c3666a447c diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.FileListAbsolute.txt b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.FileListAbsolute.txt index 4f51c96e..4bff1fc4 100644 --- a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.FileListAbsolute.txt +++ b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.FileListAbsolute.txt @@ -28,3 +28,18 @@ Z:\Desktop\日常代码\HighWayIot\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.cspro \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.CopyComplete \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.dll \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\bin\Debug\HighWayIot.Plc.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\bin\Debug\HighWayIot.Plc.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\bin\Debug\HighWayIot.Common.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\bin\Debug\HighWayIot.Log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\bin\Debug\HslCommunication.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\bin\Debug\Newtonsoft.Json.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\bin\Debug\log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\bin\Debug\HighWayIot.Common.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\bin\Debug\HighWayIot.Log4net.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\bin\Debug\Newtonsoft.Json.xml +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.AssemblyReference.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.CoreCompileInputs.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.csproj.CopyComplete +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Plc\obj\Debug\HighWayIot.Plc.pdb diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll index aa010cb8..7c4f0d20 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb index a15f32e8..14192d95 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll index a8001b1f..dead5ea8 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb index 1861d801..46d305e1 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll index 015d6020..30bae7e5 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb index 50cbe113..a3ec7c87 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll index 16271804..b8d3895a 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb index 5900f31d..ea79a830 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 672bb223..bd052bff 100644 Binary files a/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index 1eb8a6e1..41d20571 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache index 19058cb0..e33d8430 100644 --- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d76d94154f93492487ee2c4ed32d7c2ed0caf8f5 +895f3c69f89b5588bcc6d1c266768b015c1ec5d0 diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt index c840f667..38785b70 100644 --- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt +++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt @@ -23,3 +23,22 @@ Z:\Desktop\日常代码\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Re \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CopyComplete \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.dll \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.dll.config +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\HighWayIot.Common.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\HighWayIot.Log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\MySql.Data.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\Oracle.ManagedDataAccess.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\SqlSugar.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\System.Data.SQLite.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\Newtonsoft.Json.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\HighWayIot.Common.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\HighWayIot.Log4net.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\bin\Debug\Newtonsoft.Json.xml +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.AssemblyReference.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CoreCompileInputs.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CopyComplete +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.pdb diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll index 16271804..b8d3895a 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb index 5900f31d..ea79a830 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.dll index a8001b1f..dead5ea8 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.pdb index 1861d801..46d305e1 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.dll index 015d6020..30bae7e5 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.pdb index 50cbe113..a3ec7c87 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll b/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll index c781837c..83bd13ea 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb b/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb index eb038aad..986afe27 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb differ diff --git a/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 4d165138..ca74b682 100644 Binary files a/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache index aeb340c8..56fbdf9c 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache index 264d2a8a..dd624a60 100644 --- a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7dec673ed125b9eaed716ab318fe91ac536b00c0 +4513ba02cf63dbc13668b2fa4a8e815c58d65ebd diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.FileListAbsolute.txt b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.FileListAbsolute.txt index dc8e9c9e..c8f0ac38 100644 --- a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.FileListAbsolute.txt +++ b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.FileListAbsolute.txt @@ -28,3 +28,18 @@ Z:\Desktop\日常代码\HighWayIot\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csp \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.CopyComplete \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.dll \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\bin\Debug\HighWayIot.Rfid.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\bin\Debug\HighWayIot.Rfid.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\bin\Debug\GRreader.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\bin\Debug\HighWayIot.Common.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\bin\Debug\HighWayIot.Log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\bin\Debug\Newtonsoft.Json.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\bin\Debug\log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\bin\Debug\HighWayIot.Common.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\bin\Debug\HighWayIot.Log4net.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\bin\Debug\Newtonsoft.Json.xml +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.AssemblyReference.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.CoreCompileInputs.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.CopyComplete +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.pdb diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll index c781837c..83bd13ea 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll differ diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb index eb038aad..986afe27 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb differ diff --git a/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 209b32ed..06f5bd7b 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache index be2a595a..deaa92ca 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt index 28801593..3fd160f4 100644 --- a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt +++ b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt @@ -14,3 +14,11 @@ Z:\Desktop\日常代码\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.T \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.CopyComplete \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.dll \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\bin\Debug\HighWayIot.TouchSocket.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\bin\Debug\HighWayIot.TouchSocket.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\bin\Debug\TouchSocket.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.AssemblyReference.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.CopyComplete +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.pdb diff --git a/HighWayIot/bin/Debug/HighWayIot.Common.dll b/HighWayIot/bin/Debug/HighWayIot.Common.dll index a8001b1f..dead5ea8 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Common.dll and b/HighWayIot/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Common.pdb b/HighWayIot/bin/Debug/HighWayIot.Common.pdb index 1861d801..46d305e1 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot/bin/Debug/HighWayIot.Log4net.dll index 015d6020..30bae7e5 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb index 50cbe113..a3ec7c87 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.dll b/HighWayIot/bin/Debug/HighWayIot.Repository.dll index 16271804..b8d3895a 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb index 5900f31d..ea79a830 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.exe b/HighWayIot/bin/Debug/HighWayIot.exe index afd0d36a..58278248 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.exe and b/HighWayIot/bin/Debug/HighWayIot.exe differ diff --git a/HighWayIot/bin/Debug/HighWayIot.pdb b/HighWayIot/bin/Debug/HighWayIot.pdb index 88a3e088..1a234a93 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.pdb and b/HighWayIot/bin/Debug/HighWayIot.pdb differ diff --git a/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ff3e78a8..c14520b4 100644 Binary files a/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index f4583224..434375b4 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache index 7fffe3ec..7eee954d 100644 --- a/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache +++ b/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ea37f033f486c008bf46f91689270ff097a0d10f +0ad03e0798a1cb33c569face6b117fbfd6fd6609 diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt b/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt index 2d703350..bd00324c 100644 --- a/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt +++ b/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt @@ -33,3 +33,26 @@ Z:\Desktop\日常代码\HighWayIot\HighWayIot\obj\Debug\HighWayIot.pdb \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot\obj\Debug\HighWayIot.csproj.CopyComplete \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot\obj\Debug\HighWayIot.exe \\Mac\Home\Desktop\日常代码\HighWayIot\HighWayIot\obj\Debug\HighWayIot.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\HighWayIot.exe.config +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\HighWayIot.exe +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\HighWayIot.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\HighWayIot.Log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\HighWayIot.Repository.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\MySql.Data.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\Oracle.ManagedDataAccess.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\System.Data.SQLite.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\log4net.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\SqlSugar.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\HighWayIot.Common.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\Newtonsoft.Json.dll +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\HighWayIot.Log4net.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\HighWayIot.Repository.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\HighWayIot.Repository.dll.config +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\HighWayIot.Common.pdb +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\bin\Debug\Newtonsoft.Json.xml +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\obj\Debug\HighWayIot.csproj.AssemblyReference.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\obj\Debug\HighWayIot.exe.config +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\obj\Debug\HighWayIot.csproj.CoreCompileInputs.cache +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\obj\Debug\HighWayIot.csproj.CopyComplete +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\obj\Debug\HighWayIot.exe +C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot\obj\Debug\HighWayIot.pdb diff --git a/HighWayIot/obj/Debug/HighWayIot.exe b/HighWayIot/obj/Debug/HighWayIot.exe index afd0d36a..58278248 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.exe and b/HighWayIot/obj/Debug/HighWayIot.exe differ diff --git a/HighWayIot/obj/Debug/HighWayIot.pdb b/HighWayIot/obj/Debug/HighWayIot.pdb index 88a3e088..1a234a93 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.pdb and b/HighWayIot/obj/Debug/HighWayIot.pdb differ