blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
kazelee
1 天以前 74ca5a83f24c53c48ad7e6f5b7739649fb411546 
 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();


            // 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 +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,13 @@


        /// </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 +105,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,6 +123,9 @@




                tasks.Add(GetTask(WCSCore.Dispatch));




                // 测试：托盘下线


                //tasks.Add(GetTask(Monitor.CheckInbound));




                // 轮询：出库单状态


                tasks.Add(GetTask(Monitor.CheckOutboundOrder));