From e2ec31cc0062b3c1af621437554aa9a3505d2a56 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 23 五月 2025 17:26:55 +0800
Subject: [PATCH] 优化产线安全交互的部分，优化AGV调试接口
---
Program.cs | 45 ++++++++++++++-------------------------------
1 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/Program.cs b/Program.cs
index e77e060..e3e9b9b 100644
--- a/Program.cs
+++ b/Program.cs
@@ -1,17 +1,15 @@
锘縰sing System;
using System.Collections.Generic;
using System.Threading;
-
-using HH.WCS.Mobox3.DSZSH.AppStart;
using HH.WCS.Mobox3.DSZSH.device;
-using HH.WCS.Mobox3.DSZSH.Helpers;
-using HH.WCS.Mobox3.DSZSH.ServiceCore;
+using HH.WCS.Mobox3.DSZSH.core;
using Microsoft.Owin.Hosting;
using Topshelf;
using Task = System.Threading.Tasks.Task;
+using Monitor = HH.WCS.Mobox3.DSZSH.core.Monitor;
namespace HH.WCS.Mobox3.DSZSH {
internal class Program
@@ -24,7 +22,7 @@
// 2.0 寮�惎tcp
StartTcp();
// 3.0 寮�惎S7
- StartS7();
+ //StartS7();
// 4.0 寮�惎Modbus
//StartModbus();
@@ -54,7 +52,7 @@
Console.WriteLine("Startup ApiController");
Task.Run(() =>
{
- var url = AppStart.Settings.Config.WebApiUrl; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
+ var url = Settings.WebApiUrl; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
Console.WriteLine(url);
using (WebApp.Start<Startup>(url))
{
@@ -69,8 +67,8 @@
/// </summary>
private static void StartTcp()
{
- var tcpServerIP = AppStart.Settings.Config.TcpServerIp; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
- var tcpServerPort = AppStart.Settings.Config.TcpServerPort; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
+ var tcpServerIP = Settings.TcpServerIp; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
+ var tcpServerPort = Settings.TcpServerPort; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
new TcpServer(tcpServerIP, tcpServerPort);
}
@@ -91,18 +89,6 @@
// Console.WriteLine("S7ProductionLineHelper," + item.ProductionLine_IP);
// }
//}
-
- ////绉伴噸鐨凷7璁惧
- //var weightPLCDevice = Settings.WeightDevices;
-
- //if (weightPLCDevice.Count > 0)
- //{
- // foreach (var item in weightPLCDevice)
- // {
- // new S7Helper(item.WeightDevice_IP, (short)item.WeightDevice_Rack, (short)item.WeightDevice_Slot);
- // Console.WriteLine("S7WeightDeviceHelper," + item.WeightDevice_Name);
- // }
- //}
}
/// <summary>
@@ -111,7 +97,7 @@
private static void StartModbus()
{
// 鎵�湁鐨凪odbus璁惧
- var allPLCDevice = AppStart.Settings.Config.ProductionLines; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
+ var allPLCDevice = Settings.ProductionLines; // 杩愯鏃朵慨鏀�config.json 鏃犳晥
if (allPLCDevice.Count > 0) {
foreach (var item in allPLCDevice) {
@@ -127,19 +113,16 @@
{
List<Task> tasks = new List<Task>();
- //tasks.Add(GetTask(CheckCore.CheckOrderState));
+ tasks.Add(GetTask(WCSCore.Dispatch));
- tasks.Add(GetTask(OutboundCore.CheckOrderState));
+ // 杞锛氬嚭搴撳崟鐘舵�
+ tasks.Add(GetTask(Monitor.CheckOutboundOrder));
+ // 杞锛氭娊妫�崟鐘舵�
+ tasks.Add(GetTask(Monitor.CheckCheckOrder));
- // 娣诲姞浠诲姟鎺ㄩ�绾跨▼
- //tasks.Add(GetTask(WCSCore.Dispatch));
-
- // 娣诲姞鑷畾涔夌嚎绋�- //tasks.Add(GetTask(Monitor.CheckEmptyCnt));//妫�祴绌烘墭鐩�-
- // 鏍规嵁S7/Modbus鍗忚鍒ゆ柇杈撻�绾跨殑淇″彿 鍘熸潗鏂欎骇绾垮簱鍖�>婊℃墭缂撳瓨搴撳尯锛岀┖鎵樼紦瀛樺簱鍖�>鍘熸潗鏂欎骇绾垮簱鍖�- //tasks.Add(GetTask(Monitor.CheckS7Devices));
+ // 杞锛氱Щ搴撳崟鐘舵�
+ tasks.Add(GetTask(Monitor.CheckShiftOrder));
Task.WaitAll(tasks.ToArray());
}
--
Gitblit v1.9.1