From 1bb929f06ec901d839dd8ac0e3de001d90577a97 Mon Sep 17 00:00:00 2001
From: hanqiangqiang <1364346467@qq.com>
Date: Wed, 20 Dec 2023 10:34:57 +0800
Subject: [PATCH] =?UTF-8?q?[Common]=20ProcessHistory=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AF=B9=E8=B1=A1=E9=9B=86=E5=90=88=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0=E4=B8=8D=E5=AD=98=E5=82=A8=E5=88=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=20[UI.Client]=20=E4=BC=98=E5=8C=96PM=20proce?=
 =?UTF-8?q?ss=E5=8F=96=E6=B6=88=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Core/Common/DeviceData/RecipeProcessHistoryData.cs |  4 ++--
 .../CenterViews/Modules/PM/PMProcessViewModel.cs       | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/MECF.Framework.Common/Aitex/Core/Common/DeviceData/RecipeProcessHistoryData.cs b/MECF.Framework.Common/Aitex/Core/Common/DeviceData/RecipeProcessHistoryData.cs
index 3309332..281b2c9 100644
--- a/MECF.Framework.Common/Aitex/Core/Common/DeviceData/RecipeProcessHistoryData.cs
+++ b/MECF.Framework.Common/Aitex/Core/Common/DeviceData/RecipeProcessHistoryData.cs
@@ -32,11 +32,11 @@ namespace MECF.Framework.Common.Aitex.Core.Common.DeviceData
         {
             var phi1 = CustomXmlSerializer.Deserialize<ProcessDeviceItems>(new FileInfo($"Config\\PM\\PM1\\ProcessDeviceItemsPM1.xml"));
             PM1ItemList = phi1.ItemList;
-            DATA.Subscribe($"PM1.ProcessHistoryItemsDefault", () => PM1ItemList, SubscriptionAttribute.FLAG.SaveDB);
+            DATA.Subscribe($"PM1.ProcessHistoryItemsDefault", () => PM1ItemList, SubscriptionAttribute.FLAG.IgnoreSaveDB);
 
             var phi2 = CustomXmlSerializer.Deserialize<ProcessDeviceItems>(new FileInfo($"Config\\PM\\PM2\\ProcessDeviceItemsPM2.xml"));
             PM2ItemList = phi2.ItemList;
-            DATA.Subscribe($"PM2.ProcessHistoryItemsDefault", () => PM2ItemList, SubscriptionAttribute.FLAG.SaveDB);
+            DATA.Subscribe($"PM2.ProcessHistoryItemsDefault", () => PM2ItemList, SubscriptionAttribute.FLAG.IgnoreSaveDB);
 
         }
     }
diff --git a/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMProcessViewModel.cs b/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMProcessViewModel.cs
index d8f1fbf..e0ab008 100644
--- a/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMProcessViewModel.cs
+++ b/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMProcessViewModel.cs
@@ -1730,10 +1730,8 @@ namespace MECF.Framework.UI.Client.CenterViews.Modules.PM
             Task.Run(() =>
             {
                 if (_cts?.Token.CanBeCanceled == true)
-                {
                     _cts.Cancel();
-                }
-
+                
                 Thread.Sleep(200);
                 _busyIndicatorContentExport.Report(new ProgressUpdatingEventArgs(100, 100, ""));
 
@@ -1748,7 +1746,11 @@ namespace MECF.Framework.UI.Client.CenterViews.Modules.PM
             foreach (var daySlice in daySlices)
             {
                 if (_cts.IsCancellationRequested)
-                    return ;
+                {
+                    _cts?.Dispose();
+                    return;
+                }
+                    
                 gasFlowRunVent.Add( GasFlowSqlHelp.GetDayGasFlowSum(daySlice, SystemName, GasFlowSumList));
 
                 _busyIndicatorContentExport.Report(new ProgressUpdatingEventArgs(200, 200, $"{daySlice}"));