From 694604c4f0ef5c06e146a19ee848b72bd8fefa57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Wed, 21 Jun 2023 17:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BA=93=E9=AA=8C=E8=AF=81?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BPASmartClient.Business.csproj | 2 +-
.../BPASmartClient.CustomResource.csproj | 2 +-
BPASmartClient.Device/BaseDevice.cs | 2 +-
.../BPASmartClient.DosingSystemSingle.csproj | 2 +-
.../BPASmartClient.FoodStationTest.csproj | 2 +-
.../BPASmartClient.JXJFoodBigStation.csproj | 4 +-
.../BPASmartClient.JakaRobot.csproj | 2 +-
.../BPASmartClient.Modbus.csproj | 2 +-
.../BPASmartClient.Model.csproj | 2 +-
BPASmartClient.Nfc/BPASmartClient.Nfc.csproj | 2 +-
.../BPASmartClient.S7Net.csproj | 2 +-
.../BPASmartClient.ScreenLib.csproj | 2 +-
.../BPASmartClient.SerialPort.csproj | 2 +-
.../BPASmartClient.SmallBatchingSystem.csproj | 2 +-
BPASmartClient.Tourism/AddConvert.cs | 29 -----
BPASmartClient.Tourism/Control_MorkCL.cs | 120 +++++++++++++++++-
BPASmartClient.Tourism/ExtensionMethod.cs | 78 ++++++++++++
BPASmartClient.Tourism/GVL_MorkCL.cs | 2 +
BPASmartClient.Tourism/GlobalUsing.cs | 3 +-
.../Model/Control/FryingPanGet.cs | 2 +-
.../Model/Control/FryingPanSet.cs | 81 ++++++------
.../Model/Control/OtherDeviceGet.cs | 21 +++
.../OtherDeviceSet.cs} | 7 +-
.../Model/Control/PressureCookerGet.cs | 12 ++
.../Model/Control/PressureCookerSet.cs | 12 ++
.../Model/Control/RobotGet.cs | 26 +++-
.../Model/Control/RobotSet.cs | 113 ++++++++++++++---
BPASmartClient.Tourism/Model/ControlData.cs | 11 +-
.../{ControlDeviceType.cs => EDeviceType.cs} | 13 +-
BPASmartClient.Tourism/Model/Func/FuncPar.cs | 5 +
BPASmartClient.Tourism/Model/Func/InitData.cs | 2 +-
BPASmartClient.Tourism/Model/NotifyTopic.cs | 5 +
BPASmartClient.Tourism/Model/Result.cs | 14 ++
.../Server/{ISqlLIte.cs => ISqlite.cs} | 2 +-
BPASmartClient.Tourism/Server/OtherServer.cs | 22 +++-
.../Server/PressureCookerServer.cs | 15 ++-
BPASmartClient.Tourism/Server/RobotServer.cs | 48 +++++++
BPASmartClient.Tourism/Server/SqliteHelper.cs | 2 +-
BPASmartClient.Tourism/Server/TaskServer.cs | 29 +++++
.../BPASmartClient.Update.csproj | 2 +-
.../BPASmartClient.DosingSystem.csproj | 2 +-
WpfTest/WpfTest.csproj | 2 +-
42 files changed, 585 insertions(+), 125 deletions(-)
delete mode 100644 BPASmartClient.Tourism/AddConvert.cs
create mode 100644 BPASmartClient.Tourism/ExtensionMethod.cs
create mode 100644 BPASmartClient.Tourism/Model/Control/OtherDeviceGet.cs
rename BPASmartClient.Tourism/Model/{DeviceType.cs => Control/OtherDeviceSet.cs} (53%)
create mode 100644 BPASmartClient.Tourism/Model/Control/PressureCookerGet.cs
create mode 100644 BPASmartClient.Tourism/Model/Control/PressureCookerSet.cs
rename BPASmartClient.Tourism/Model/{ControlDeviceType.cs => EDeviceType.cs} (50%)
create mode 100644 BPASmartClient.Tourism/Model/Result.cs
rename BPASmartClient.Tourism/Server/{ISqlLIte.cs => ISqlite.cs} (95%)
create mode 100644 BPASmartClient.Tourism/Server/TaskServer.cs
diff --git a/BPASmartClient.Business/BPASmartClient.Business.csproj b/BPASmartClient.Business/BPASmartClient.Business.csproj
index bc5eae2f..03fc5407 100644
--- a/BPASmartClient.Business/BPASmartClient.Business.csproj
+++ b/BPASmartClient.Business/BPASmartClient.Business.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
index 767b8ea8..a89335fd 100644
--- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
+++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
@@ -463,7 +463,7 @@
-
+
diff --git a/BPASmartClient.Device/BaseDevice.cs b/BPASmartClient.Device/BaseDevice.cs
index 072e3f50..c19bcca2 100644
--- a/BPASmartClient.Device/BaseDevice.cs
+++ b/BPASmartClient.Device/BaseDevice.cs
@@ -162,7 +162,7 @@ namespace BPASmartClient.Device
///
public void DeviceProcessLogShow(string info)
{
- Log.Insert(0, new { Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Type = "流程", Text = info });
+ Log.Insert(0, new { Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff"), Type = "流程", Text = info });
MessageLog.GetInstance.DeviceProcessLogShow(DeviceId.ToString(), info);
if (Log.Count > 100) { Log.RemoveAt(Log.Count - 1); }
}
diff --git a/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj b/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj
index 465ab84c..4ff09e8b 100644
--- a/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj
+++ b/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj b/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj
index 88a9f643..960cb6bf 100644
--- a/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj
+++ b/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj b/BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj
index ac53015c..7944d193 100644
--- a/BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj
+++ b/BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj
@@ -17,8 +17,8 @@
-
-
+
+
diff --git a/BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj b/BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj
index defab860..896bc5c4 100644
--- a/BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj
+++ b/BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/BPASmartClient.Modbus/BPASmartClient.Modbus.csproj b/BPASmartClient.Modbus/BPASmartClient.Modbus.csproj
index da719a10..4f766387 100644
--- a/BPASmartClient.Modbus/BPASmartClient.Modbus.csproj
+++ b/BPASmartClient.Modbus/BPASmartClient.Modbus.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/BPASmartClient.Model/BPASmartClient.Model.csproj b/BPASmartClient.Model/BPASmartClient.Model.csproj
index f7881186..98b3af38 100644
--- a/BPASmartClient.Model/BPASmartClient.Model.csproj
+++ b/BPASmartClient.Model/BPASmartClient.Model.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/BPASmartClient.Nfc/BPASmartClient.Nfc.csproj b/BPASmartClient.Nfc/BPASmartClient.Nfc.csproj
index ba33798a..0941b50c 100644
--- a/BPASmartClient.Nfc/BPASmartClient.Nfc.csproj
+++ b/BPASmartClient.Nfc/BPASmartClient.Nfc.csproj
@@ -21,7 +21,7 @@
-
+
diff --git a/BPASmartClient.S7Net/BPASmartClient.S7Net.csproj b/BPASmartClient.S7Net/BPASmartClient.S7Net.csproj
index 3c694624..a4df70c4 100644
--- a/BPASmartClient.S7Net/BPASmartClient.S7Net.csproj
+++ b/BPASmartClient.S7Net/BPASmartClient.S7Net.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj b/BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj
index 4531e799..9be6f09f 100644
--- a/BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj
+++ b/BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj
@@ -24,7 +24,7 @@
-
+
diff --git a/BPASmartClient.SerialPort/BPASmartClient.SerialPort.csproj b/BPASmartClient.SerialPort/BPASmartClient.SerialPort.csproj
index 2c99f76d..d54d2e46 100644
--- a/BPASmartClient.SerialPort/BPASmartClient.SerialPort.csproj
+++ b/BPASmartClient.SerialPort/BPASmartClient.SerialPort.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj b/BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj
index 1cd718e1..ea3327f3 100644
--- a/BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj
+++ b/BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj
@@ -21,7 +21,7 @@
-
+
diff --git a/BPASmartClient.Tourism/AddConvert.cs b/BPASmartClient.Tourism/AddConvert.cs
deleted file mode 100644
index 6a1f5a29..00000000
--- a/BPASmartClient.Tourism/AddConvert.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BPASmartClient.MorkCL
-{
- ///
- /// 地址转换类
- ///
- internal static class AddConvert
- {
- public static string ToModbusAdd(this string add)
- {
- return "";
- }
-
- ///
- /// 煮面机器人地址转换
- ///
- ///
- ///
- public static string AddressConvert(string address)
- {
- return (Convert.ToInt32(address.Substring(1, address.Length - 1)) + 4096).ToString();
- }
- }
-}
diff --git a/BPASmartClient.Tourism/Control_MorkCL.cs b/BPASmartClient.Tourism/Control_MorkCL.cs
index 7832feac..cbce75a0 100644
--- a/BPASmartClient.Tourism/Control_MorkCL.cs
+++ b/BPASmartClient.Tourism/Control_MorkCL.cs
@@ -1,5 +1,7 @@
using BPA.Message.Enum;
using BPASmartClient.Device;
+using BPASmartClient.MorkCL.Server;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -14,20 +16,134 @@ namespace BPASmartClient.MorkCL
GVL_MorkCL morkCL = new GVL_MorkCL();
Alarm alarm = new Alarm();
+ ///
+ /// 设备信息集合
+ ///
+ ConcurrentDictionary devices { get; set; } = new();
+
+ ///
+ /// 任务集合
+ ///
+ ConcurrentDictionary TaskList { get; set; } = new();
public override void DoMain()
{
MonitorViewModel.DeviceId = DeviceId;
+
+ //注册本地配方接收
+ ActionManage.GetInstance.Register(new Action
-
+
diff --git a/WpfTest/WpfTest.csproj b/WpfTest/WpfTest.csproj
index 383e059c..ea14a78a 100644
--- a/WpfTest/WpfTest.csproj
+++ b/WpfTest/WpfTest.csproj
@@ -9,7 +9,7 @@
-
+