From c4e968254a4f1c5d538a9fd91284b4843ea08198 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 23 五月 2025 10:44:58 +0800
Subject: [PATCH] 内部联调，修复问题，添加取消任务功能
---
Program.cs | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/Program.cs b/Program.cs
index 942c7dd..02bf3c6 100644
--- a/Program.cs
+++ b/Program.cs
@@ -3,17 +3,19 @@
using System.Threading;
using System.Threading.Tasks;
-using HH.WCS.Mobox3.AnGang.AppStart;
-using HH.WCS.Mobox3.AnGang.Devices;
+using HH.WCS.Mobox3.AnGang.core;
+using HH.WCS.Mobox3.AnGang.device;
using Microsoft.Owin.Hosting;
using Topshelf;
+using Monitor = HH.WCS.Mobox3.AnGang.core.Monitor;
+
namespace HH.WCS.Mobox3.AnGang {
internal class Program
{
- [STAThread]
+ //[STAThread] // TODO SNAP
static void Main(string[] args)
{
//鍩虹璁剧疆淇℃伅鍒濆鍖�@@ -59,7 +61,7 @@
Console.WriteLine("Startup ApiController");
Task.Run(() =>
{
- var url = Settings.Config.WebApiUrl;
+ var url = Settings.WebApiUrl;
Console.WriteLine(url);
using (WebApp.Start<Startup>(url))
{
@@ -74,8 +76,8 @@
/// </summary>
private static void StartTcp()
{
- var tcpServerIP = Settings.Config.TCPServerIP;
- var tcpServerPort = Settings.Config.TCPServerPort;
+ var tcpServerIP = Settings.TCPServerIP;
+ var tcpServerPort = Settings.TCPServerPort;
new TcpServer(tcpServerIP, tcpServerPort);
}
@@ -115,8 +117,7 @@
}
private static void StartSnap() {
- //new SnapManager(Settings.Snap);
- new SnapManager(Settings.Config.Snap[0]);
+ new SnapManager(Settings.Snaps[0]);
}
public class WorkThread
@@ -125,13 +126,8 @@
{
List<Task> tasks = new List<Task>();
// 娣诲姞浠诲姟鎺ㄩ�绾跨▼
- //tasks.Add(GetTask(WCSCore.Dispatch));
-
- ////娣诲姞鑷畾涔夌嚎绋�- //tasks.Add(GetTask(Monitor.CheckEmptyCnt));//妫�祴绌烘墭鐩�-
- ////鏍规嵁S7/Modbus鍗忚鍒ゆ柇杈撻�绾跨殑淇″彿 鍘熸潗鏂欎骇绾垮簱鍖�>婊℃墭缂撳瓨搴撳尯锛岀┖鎵樼紦瀛樺簱鍖�>鍘熸潗鏂欎骇绾垮簱鍖�- //tasks.Add(GetTask(Monitor.CheckS7Devices));
+ tasks.Add(GetTask(WCSCore.Dispatch));
+ //tasks.Add(GetTask(Monitor.CheckCountOrder));
Task.WaitAll(tasks.ToArray());
}
--
Gitblit v1.9.1