优化代码, 封装货位锁和创建任务流程, 数据库事务等

kazelee

3 天以前 2d3ee03961d6cfbde70342e8a97bc7b05d0b0dc3

 Program.cs

@@ -1,15 +1,17 @@
using 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()
        {
            // 所有的Modbus设备
            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);
                    }