From fd3edbc046ce756ab3b6e8a741d2a910f5ccccb7 Mon Sep 17 00:00:00 2001
From: "liulb@mesnac.com" <haiwei@123>
Date: Tue, 28 Nov 2023 10:14:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E5=8D=A1?=
 =?UTF-8?q?=E9=A1=BF=E7=8E=B0=E8=B1=A1=EF=BC=8C=E4=BC=98=E5=8C=96PLC?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.Core.Extensions/Middlewares/PlcMildd.cs          | 4 ----
 Aucma.Core.RunPlc/RunPlcService.cs                     | 8 ++++++--
 Aucma.Core.SheetMetal/Startup.cs                       | 2 +-
 Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs | 5 +++--
 Aucma.Core.SheetMetal/appsettings.json                 | 2 --
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Admin.Core.Extensions/Middlewares/PlcMildd.cs b/Admin.Core.Extensions/Middlewares/PlcMildd.cs
index 0a30c2b0..83822bc4 100644
--- a/Admin.Core.Extensions/Middlewares/PlcMildd.cs
+++ b/Admin.Core.Extensions/Middlewares/PlcMildd.cs
@@ -20,10 +20,6 @@ namespace Admin.Core.Extensions
                 if (Appsettings.app("Middleware", "Plc", "Enabled").ObjToBool())
                 {
                     await plc.StartPlcAsync();
-                    //if (result)
-                    //    Console.WriteLine("三菱PLC服务启动成功！");
-                    //else
-                    //    Console.WriteLine("三菱PLC服务启动失败！");
                 }
             }
             catch (Exception e)
diff --git a/Aucma.Core.RunPlc/RunPlcService.cs b/Aucma.Core.RunPlc/RunPlcService.cs
index 626ca94c..623b1ae3 100644
--- a/Aucma.Core.RunPlc/RunPlcService.cs
+++ b/Aucma.Core.RunPlc/RunPlcService.cs
@@ -14,7 +14,10 @@ namespace Aucma.Core.RunPlc
         #region 构造函数
         public RunPlcService()
         {
-            StartMelsecMcPlcServer();//三菱PLC
+            Task.Run(async () => {
+               await StartMelsecMcPlcServer();//三菱PLC
+            });
+           
             //StartSiemensPlcServer();//西门子
         }
         #endregion
@@ -30,7 +33,7 @@ namespace Aucma.Core.RunPlc
             return Task.CompletedTask;
         }
 
-        private static void StartMelsecMcPlcServer()
+        private static Task StartMelsecMcPlcServer()
         {
        //    string ip = Appsettings.app("Middleware", "Scanner1", "Ip");
             var allPlcServices = Appsettings.app<PlcModel>("PLCServer").ToList();
@@ -45,6 +48,7 @@ namespace Aucma.Core.RunPlc
          //       model.IsConnect = model.plc.IsConnected;
                 PlcHelper.melsecList.Add(model);
             }
+            return Task.CompletedTask;
         }
 
         private static void StartSiemensPlcServer()
diff --git a/Aucma.Core.SheetMetal/Startup.cs b/Aucma.Core.SheetMetal/Startup.cs
index 0372fbbf..d49f7c02 100644
--- a/Aucma.Core.SheetMetal/Startup.cs
+++ b/Aucma.Core.SheetMetal/Startup.cs
@@ -92,7 +92,7 @@ namespace Aucma.Core.SheetMetal
             // ����QuartzNetJob���ȷ���
             app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
             //PLC
-            app.UsePlcMildd(runPlcService);
+            //app.UsePlcMildd(runPlcService);
         }
 
         #region ע�����
diff --git a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
index 0be4a7ba..269ed703 100644
--- a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
+++ b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
@@ -39,7 +39,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
 
             StationName = "U壳/侧板钣金生产";
 
-            //Job_SheetMetalTask_Quartz.SmEverDayDelegateEvent += InitEveryDayMethod;
+            Job_SheetMetalTask_Quartz.SmEverDayDelegateEvent += InitEveryDayMethod;
             Job_SheetMetalTask_Quartz.SmShowDelegateEvent += UpdatePlanSHow;//计划内容展示
             WeakReferenceMessenger.Default.Register<string>(this, Recive);
             
@@ -74,7 +74,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
         /// 每日生产
         /// </summary>
         /// <returns></returns>
-        private  void InitEveryDayMethod()
+        private Task InitEveryDayMethod()
         {
             ChartValues<double> achievement = new ChartValues<double>();
             Random random = new Random();
@@ -115,6 +115,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
             Achievement.Add(column2);
 
             //await InitExecMethod();
+            return Task.CompletedTask;
         }
 
 
diff --git a/Aucma.Core.SheetMetal/appsettings.json b/Aucma.Core.SheetMetal/appsettings.json
index 616191da..98c6c633 100644
--- a/Aucma.Core.SheetMetal/appsettings.json
+++ b/Aucma.Core.SheetMetal/appsettings.json
@@ -110,8 +110,6 @@
       "Enabled": true
     },
     "Plc": {
-      "ConString": "127.0.0.1",
-      "Port": 6000,
       "Enabled": true
     }
   },