1

Admin.Core.Tasks/QuartzNet/Jobs/Job_OldBoxFoam_Quartz.cs

@@ -56,7 +56,7 @@ namespace Admin.Core.Tasks
         public async Task Execute(IJobExecutionContext context)
         {
             await ExecuteJob(context, async () => await OldBoxFoamDataRun(context));//发泡线
-            await ExecuteJob(context, async () => await OldBoxFoamStoreDataRun(context));
+            //await ExecuteJob(context, async () => await OldBoxFoamStoreDataRun(context));
         }
         /// <summary>
         /// 发泡线
@@ -376,16 +376,12 @@ namespace Admin.Core.Tasks
         #endregion
 
         public async Task OldBoxFoamData()
-        {
-            var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldTypePlc1"));
-            if (obj == null) { return; }
-            if (obj.plc.IsConnected)
         {
             var list = await _oldBoxFoamDataServices.QueryAsync();
             int i = list.Count();
             foreach (var item in list)
             {
-                    UpdateRealOldBoxFoamData(obj, item);
+                UpdateRealOldBoxFoamData(item);
                 i--;
                 if (i == 0)
                 {
@@ -394,11 +390,14 @@ namespace Admin.Core.Tasks
                 }
             }
         }
-        }
 
-        private async void UpdateRealOldBoxFoamData(PlcModel obj, OldBoxFoamData item)
+        private async void UpdateRealOldBoxFoamData(OldBoxFoamData item)
         {
             if (item.ObjId==1)
+            {
+                var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldTypePlc1"));
+                if (obj == null) { return; }
+                if (obj.plc.IsConnected)
                 {
                     string type = $"{obj.plc.ReadString("D3140")}{obj.plc.ReadString("D3141")}";
                     item.Fixtureboxtype = type;
@@ -415,7 +414,12 @@ namespace Admin.Core.Tasks
                         item.Fixtureboxtype = "停止";
                     }
                 }
+            }
             if (item.ObjId == 2)
+            {
+                var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldTypePlc1"));
+                if (obj == null) { return; }
+                if (obj.plc.IsConnected)
                 {
                     string type = $"{obj.plc.ReadString("D3142")}{obj.plc.ReadString("D3141")}";
                     item.Fixtureboxtype = type;
@@ -432,7 +436,12 @@ namespace Admin.Core.Tasks
                         item.Fixtureboxtype = "停止";
                     }
                 }
+            }
             if (item.ObjId == 3)
+            {
+                var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldTypePlc1"));
+                if (obj == null) { return; }
+                if (obj.plc.IsConnected)
                 {
                     string type = $"{obj.plc.ReadString("D3142")}{obj.plc.ReadString("D3143")}";
                     item.Fixtureboxtype = type;
@@ -449,7 +458,12 @@ namespace Admin.Core.Tasks
                         item.Fixtureboxtype = "停止";
                     }
                 }
+            }
             if (item.ObjId == 4)
+            {
+                var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldTypePlc1"));
+                if (obj == null) { return; }
+                if (obj.plc.IsConnected)
                 {
                     string type = $"{obj.plc.ReadString("D3144")}{obj.plc.ReadString("D3145")}";
                     item.Fixtureboxtype = type;
@@ -466,7 +480,12 @@ namespace Admin.Core.Tasks
                         item.Fixtureboxtype = "停止";
                     }
                 }
+            }
             if (item.ObjId == 5)
+            {
+                var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldTypePlc1"));
+                if (obj == null) { return; }
+                if (obj.plc.IsConnected)
                 {
                     string type = $"{obj.plc.ReadString("D3150")}{obj.plc.ReadString("D3151")}";
                     item.Fixtureboxtype = type;
@@ -483,7 +502,12 @@ namespace Admin.Core.Tasks
                         item.Fixtureboxtype = "停止";
                     }
                 }
+            }
             if (item.ObjId == 6)
+            {
+                var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldTypePlc1"));
+                if (obj == null) { return; }
+                if (obj.plc.IsConnected)
                 {
                     string type = $"{obj.plc.ReadString("D3152")}{obj.plc.ReadString("D3143")}";
                     item.Fixtureboxtype = type;
@@ -500,6 +524,7 @@ namespace Admin.Core.Tasks
                         item.Fixtureboxtype = "停止";
                     }
                 }
+            }
 
             bool result = await _oldBoxFoamDataServices.UpdateAsync(item);
             if (result)

Aucma.Core.BoxFoam/ViewModels/OldBoxFoamPageViewModel.cs

@@ -25,7 +25,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
             _oldBoxFoamDataServices = App.ServiceProvider.GetService<IOldBoxFoamDataServices>();
             _oldBoxFoamTypeServices = App.ServiceProvider.GetService<IOldBoxFoamTypeServices>();
 
-            Job_OldBoxFoam_Quartz.RefreshOldBoxFoamTypeDataDelegateEvent += OldBoxFoamTypeOnLoad;
+            //Job_OldBoxFoam_Quartz.RefreshOldBoxFoamTypeDataDelegateEvent += OldBoxFoamTypeOnLoad;
 
             OldBoxFoamOnLoad();
             OldBoxFoamTypeOnLoad();