From f703b278956736aa14c12d1d25c8e8f23b822760 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 26 六月 2025 17:27:32 +0800
Subject: [PATCH] 优化国自辅助调度和任务推送逻辑
---
Program.cs | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/Program.cs b/Program.cs
index 5f4e00f..c88fd1c 100644
--- a/Program.cs
+++ b/Program.cs
@@ -10,6 +10,7 @@
using Task = System.Threading.Tasks.Task;
using Monitor = HH.WCS.Mobox3.DSZSH.core.Monitor;
+using System.Net.Sockets;
namespace HH.WCS.Mobox3.DSZSH {
internal class Program
@@ -20,11 +21,15 @@
// 1.0 寮�惎api
Startup();
// 2.0 寮�惎tcp
- StartTcp();
+ //StartTcp();
// 3.0 寮�惎S7
- StartS7();
+ //StartS7();
// 4.0 寮�惎Modbus
- StartModbus();
+ //StartModbus();
+
+ // TCP娴嬭瘯
+ //TcpClientHelper.Link("127.0.0.1", 8550);
+ Task.Run(() => { WCSCore.StartServer(); });
// 5.0 寮�惎绾跨▼
var rc = HostFactory.Run(x => {
@@ -52,7 +57,7 @@
Console.WriteLine("Startup ApiController");
Task.Run(() =>
{
- var url = Settings.WebApiUrl; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
+ var url = Settings.WebApiUrl;
Console.WriteLine(url);
using (WebApp.Start<Startup>(url))
{
@@ -67,10 +72,12 @@
/// </summary>
private static void StartTcp()
{
- var tcpServerIP = Settings.TcpServerIp; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
- var tcpServerPort = Settings.TcpServerPort; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
+ var tcpServerIP = Settings.TcpServerIp;
+ var tcpServerPort = Settings.TcpServerPort;
new TcpServer(tcpServerIP, tcpServerPort);
-
+ //var res = TcpClientHelper.Init(tcpServerIP, tcpServerPort);
+ //var res = TcpClientHelper.Init(tcpServerIP, 8550);
+ //LogHelper.Info($"TcpClient杩炴帴" + (res ? "鎴愬姛" : "澶辫触"));
}
/// <summary>
@@ -97,7 +104,7 @@
private static void StartModbus()
{
// 鎵�湁鐨凪odbus璁惧
- var allPLCDevice = Settings.ProductionLines; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
+ var allPLCDevice = Settings.ProductionLines;
if (allPLCDevice.Count > 0) {
foreach (var item in allPLCDevice) {
@@ -112,6 +119,11 @@
public void Start()
{
List<Task> tasks = new List<Task>();
+
+ tasks.Add(GetTask(WCSCore.Dispatch));
+
+ // 娴嬭瘯锛氭墭鐩樹笅绾�+ //tasks.Add(GetTask(Monitor.CheckInbound));
// 杞锛氬嚭搴撳崟鐘舵�
tasks.Add(GetTask(Monitor.CheckOutboundOrder));
@@ -146,5 +158,7 @@
return task;
}
}
+
+
}
}
--
Gitblit v1.9.1