From 0d6f0c1f1b4a44c533d2741c570612c2d997c197 Mon Sep 17 00:00:00 2001
From: MoYue <MoYue@DESKTOP-V2TRTHU>
Date: Fri, 12 Apr 2024 13:30:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialogs/ModifySequentialViewModel.cs      | 83 ++++++++++---------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs b/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
index 7c643bb..4aaf9e4 100644
--- a/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
+++ b/InSituLaboratory/ViewModels/Pages/Dialogs/ModifySequentialViewModel.cs
@@ -27,7 +27,6 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
 
         public  SysSequentialDetails SysSequentialdata { get; set; }
 
-
         public string? workTime { get; set; }
 
         public long? workInt { get; set; }
@@ -43,6 +42,16 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
         /// </summary>
         public DateTime? endTime { get; set; }
 
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int Number { get; set; }
+
+        /// <summary>
+        /// 时序类别
+        /// </summary>
+        public string kind { get; set; }
+
         /// <summary>
         /// 配置
         /// </summary>
@@ -54,6 +63,7 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
             set
             {
                 _sequenceGroup = value;
+
                 SysSequentialdata = _sequentialService.GetSequentialSequenceGroup(SequenceGroup, kind);
                 if (SysSequentialdata != null)
                 {
@@ -67,11 +77,6 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
             }
         }
 
-        /// <summary>
-        /// 序号
-        /// </summary>
-        public int Number { get; set; }
-
         /// <summary>
         /// 传感器设备
         /// </summary>
@@ -155,41 +160,6 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
             }
         }
 
-        /// <summary>
-        /// 循环时长
-        /// </summary>
-        private string _durationTime;
-
-        public string DurationTime
-        {
-            get { return _durationTime; }
-            set
-            {
-                _durationTime = value;
-                ErrorList.Remove("DurationTime");
-                if (SequenceGroup != null)
-                {
-                    if (SysSequentialdata != null)
-                    {
-                        if (_durationTime != SysSequentialdata.DurationTime)
-                        {
-                            ErrorList.Add("DurationTime", new List<string> { "当前配置已存在循环时长:" + SysSequentialdata.DurationTime +"s"+"，无法修改" });
-                        }
-                        else
-                        {
-                            ErrorList.Remove("DurationTime");
-                        }
-                        this.RaiseErrorsChanged("DurationTime");
-                    }
-                }
-            }
-        }
-
-
-        /// <summary>
-        /// 时序类别
-        /// </summary>
-        public string kind { get; set; }
 
         private string _workTime;
         /// <summary>
@@ -276,6 +246,37 @@ namespace InSituLaboratory.ViewModels.Pages.Dialogs
             }
         }
 
+        /// <summary>
+        /// 循环时长
+        /// </summary>
+        private string _durationTime;
+
+        public string DurationTime
+        {
+            get { return _durationTime; }
+            set
+            {
+                _durationTime = value;
+                ErrorList.Remove("DurationTime");
+                if (SequenceGroup != null)
+                {
+                    if (SysSequentialdata != null)
+                    {
+                        if (_durationTime != SysSequentialdata.DurationTime)
+                        {
+                            ErrorList.Add("DurationTime", new List<string> { "当前配置已存在循环时长:" + SysSequentialdata.DurationTime +"s"+"，无法修改" });
+                        }
+                        else
+                        {
+                            ErrorList.Remove("DurationTime");
+                        }
+                        this.RaiseErrorsChanged("DurationTime");
+                    }
+                }
+            }
+        }
+
+
         #endregion
 
         ISysSequentialService _sequentialService;