From 2d3ee03961d6cfbde70342e8a97bc7b05d0b0dc3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 21 七月 2025 17:27:34 +0800
Subject: [PATCH] 优化代码, 封装货位锁和创建任务流程, 数据库事务等
---
Program.cs | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/Program.cs b/Program.cs
index e3e9b9b..eb8520e 100644
--- a/Program.cs
+++ b/Program.cs
@@ -1,15 +1,17 @@
锘縰sing System;
using System.Collections.Generic;
using System.Threading;
-using HH.WCS.Mobox3.DSZSH.device;
+
using HH.WCS.Mobox3.DSZSH.core;
+using HH.WCS.Mobox3.DSZSH.device;
+using HH.WCS.Mobox3.DSZSH.util;
using Microsoft.Owin.Hosting;
using Topshelf;
-using Task = System.Threading.Tasks.Task;
using Monitor = HH.WCS.Mobox3.DSZSH.core.Monitor;
+using Task = System.Threading.Tasks.Task;
namespace HH.WCS.Mobox3.DSZSH {
internal class Program
@@ -20,11 +22,15 @@
// 1.0 寮�惎api
Startup();
// 2.0 寮�惎tcp
- StartTcp();
+ //StartTcp();
// 3.0 寮�惎S7
//StartS7();
// 4.0 寮�惎Modbus
//StartModbus();
+
+ // TCP娴嬭瘯
+ //TcpClientHelper.Link("127.0.0.1", 8550);
+ Task.Run(() => { WCSCore.StartServer(); });
// 5.0 寮�惎绾跨▼
var rc = HostFactory.Run(x => {
@@ -52,7 +58,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))
{
@@ -63,14 +69,17 @@
}
/// <summary>
- /// 寮�惎TCP鍗忚閫氳锛屾湇鍔＄
+ /// 寮�惎TCP鍗忚閫氳,鏈嶅姟绔� /// </summary>
private static void StartTcp()
{
- var tcpServerIP = Settings.TcpServerIp; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
- var tcpServerPort = Settings.TcpServerPort; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
- new TcpServer(tcpServerIP, tcpServerPort);
+ //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 +106,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) {
@@ -115,13 +124,16 @@
tasks.Add(GetTask(WCSCore.Dispatch));
- // 杞锛氬嚭搴撳崟鐘舵�
+ // 娴嬭瘯:鎵樼洏涓嬬嚎
+ //tasks.Add(GetTask(Monitor.CheckInbound));
+
+ // 杞:鍑哄簱鍗曠姸鎬� tasks.Add(GetTask(Monitor.CheckOutboundOrder));
- // 杞锛氭娊妫�崟鐘舵�
+ // 杞:鎶芥鍗曠姸鎬� tasks.Add(GetTask(Monitor.CheckCheckOrder));
- // 杞锛氱Щ搴撳崟鐘舵�
+ // 杞:绉诲簱鍗曠姸鎬� tasks.Add(GetTask(Monitor.CheckShiftOrder));
Task.WaitAll(tasks.ToArray());
@@ -140,7 +152,7 @@
}
catch (Exception ex)
{
- LogHelper.Error(ex.Message, ex);
+ LogHelper.InfoEx(ex);
}
Thread.Sleep(intervalMs);
}
--
Gitblit v1.9.1