Merge branch 'main' of http://175.27.215.92:3000/liulb/AUCMA_SCADA

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)

Aucma.Core.RunPlc/RunPlcService.cs

@@ -14,8 +14,12 @@ namespace Aucma.Core.RunPlc
         #region 构造函数
         public RunPlcService()
         {
-            StartMelsecMcPlcServer();//三菱PLC
+            Task.Run(async () => {
+               await StartMelsecMcPlcServer();//三菱PLC
                 //StartSiemensPlcServer();//西门子
+            });
+           
+            
         }
         #endregion
 
@@ -30,7 +34,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,9 +49,10 @@ namespace Aucma.Core.RunPlc
          //       model.IsConnect = model.plc.IsConnected;
                 PlcHelper.melsecList.Add(model);
             }
+            return Task.CompletedTask;
         }
 
-        private static void StartSiemensPlcServer()
+        private static Task StartSiemensPlcServer()
         {
             var allPlcServices = Appsettings.app<PlcModel>("PLCServer").ToList();
             foreach (var item in allPlcServices)
@@ -60,6 +65,7 @@ namespace Aucma.Core.RunPlc
                 model.plc = new SiemensPlc(item.IP, item.Port);
                 PlcHelper.siemensList.Add(model);
             }
+            return Task.CompletedTask;
         }
         #endregion
 

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;
         }
 
 

Aucma.Core.SheetMetal/appsettings.json

@@ -110,8 +110,6 @@
       "Enabled": true
     },
     "Plc": {
-      "ConString": "127.0.0.1",
-      "Port": 6000,
       "Enabled": true
     }
   },