迁移bug修改

git-svn-id: http://10.4.3.168:50001/svn/Furnace@82 dbcde07d-dcf5-c148-8a84-ac3097b7778e

FrameworkLocal/UIClient/ClientBase/UIViewModelBase.cs

@@ -128,7 +128,13 @@ namespace MECF.Framework.UI.Client.ClientBase
         protected Func<MemberInfo, bool> _hasSubscriptionAttribute;
 
         public ICommand DeviceOperationCommand { get; private set; }
-
+        public bool SetField<T>(ref T field, T value, string propertyName)
+        {
+            if (EqualityComparer<T>.Default.Equals(field, value)) return false;
+            field = value;
+            NotifyOfPropertyChange(propertyName);
+            return true;
+        }
         public Dictionary<string, string> StockerToModuleDic
         {
             get

Furnace/FurnaceRT/Equipments/PMs/PMModule.cs

@@ -365,7 +365,6 @@ namespace FurnaceRT.Equipments.PMs
             DATA.Subscribe($"{Module}.{SensorPROCManualOK.DeviceName}", () => SensorPROCManualOK);
             DATA.Subscribe($"{Module}.EditRecipeName", () => EditRecipeName);
             DATA.Subscribe($"{Module}.EditRecipeStepName", () => EditRecipeStepName);
-            DATA.Subscribe($"{Module}.N2PurgeMode", () => _N2PurgeMode.ToString());
 
             DATA.Subscribe($"{Module}.HTR1Enable", () => IsHTR1Enable);
             DATA.Subscribe($"{Module}.HTR2Enable", () => IsHTR2Enable);
@@ -402,6 +401,7 @@ namespace FurnaceRT.Equipments.PMs
                 return aITMfcDataList;
             });
             InitOtherData();
+            InitN2PurgeData();
         }
 
         private void InitStats()

Furnace/FurnaceUI/Views/Operations/Maintenances/N2PurgeStatusView.xaml

@@ -1616,7 +1616,7 @@
                                     Grid.ColumnSpan="3"
                                     Height="30"
                                     IsReadOnly="True"
-                                    Text="{Binding N2PurgeModeDisplay, Mode=OneWay}"/>
+                                    Text="{Binding N2PurgeMode, Mode=OneWay}"/>
                                 <TextBlock
                                     Grid.Row="2"
                                     Grid.Column="0"

Furnace/FurnaceUI/Views/Operations/Maintenances/N2PurgeStatusViewModel.cs

@@ -48,43 +48,8 @@ namespace FurnaceUI.Views.Operations.Maintenances
         private bool _isRecipeEdit = false;
 
         private string _N2PurgeModeDisplay;
-        public string N2PurgeModeDisplay
-        {
-            get
-            {
-                switch (N2PurgeMode)
-                {
-                    case "Auto":
-                        {
-                            _N2PurgeModeDisplay = "Auto";
-                            break;
-                        }
-                    case "N2PurgeMode":
-                        {
-                            _N2PurgeModeDisplay = "N2 Purge Mode";
-                            break;
-                        }
-                    case "ATMMode":
-                        {
-                            _N2PurgeModeDisplay = "ATM Mode";
-                            break;
-                        }
-                    case "ManualMode":
-                        {
-                            _N2PurgeModeDisplay = "Manual Mode";
-                            break;
-                        }
-                    default:
-                        _N2PurgeModeDisplay = "";
-                        break;
-                }
-                return _N2PurgeModeDisplay;
-            }
-            set
-            {
-                _N2PurgeModeDisplay = value;
-            }
-        }
+        public string N2PurgeModeDisplay { get => _N2PurgeModeDisplay; set => SetField(ref _N2PurgeModeDisplay, value, nameof(N2PurgeModeDisplay)); }
+
         [Subscription("PM1.N2PurgeMode")]
         public string N2PurgeMode { get; set; }
         [Subscription("PM1.SensorRecipeOK")]
@@ -895,10 +860,16 @@ namespace FurnaceUI.Views.Operations.Maintenances
         public void SequenceSelect()
         {
             WindowManager wm = new WindowManager();
-            wm.ShowDialogWithTitle(_selectSequence, null, "Sequence Select");
-            if (_selectSequence.DialogResultString != null || _selectSequence.DialogResultString != "")
+            bool? bret = wm.ShowDialogWithTitle(_selectSequence, null, "Sequence Select");
+            if (bret.Value)
             {
-                SequenceSelected = _selectSequence.DialogResultView;
+                if (_selectSequence.DialogResultString != null || _selectSequence.DialogResultString != "")
+                {
+                    SequenceSelected = _selectSequence.DialogResultView;
+                    N2PurgeModeDisplay = SequenceSelected;
+
+                }
+
             }
         }
     }