增加SV

CapMachine.Wpf/Models/Tag/ITag.cs

@@ -32,15 +32,25 @@ namespace CapMachine.Wpf.Models.Tag
         string? Unit { get; set; }
 
         /// <summary>
-        /// 工程值
+        /// 工程值 PV
         /// </summary>
         double EngValue { get; set; }
 
         /// <summary>
-        /// 工程值的字符串
+        /// 工程值的字符串 PV
         /// </summary>
         string EngValueStr { get; set; }
 
+        /// <summary>
+        /// 工程值 Sv
+        /// </summary>
+        double EngSvValue { get; set; }
+
+        /// <summary>
+        /// 工程值的字符串 Sv
+        /// </summary>
+        string EngSvValueStr { get; set; }
+
         /// <summary>
         /// MV
         /// </summary>

CapMachine.Wpf/Models/Tag/Tag.cs

@@ -177,11 +177,38 @@ namespace CapMachine.Wpf.Models.Tag
             set { _AutoHandState = value; RaisePropertyChanged(); }
         }
 
+        private double _EngSVValue;
+        /// <summary>
+        /// 工程值 SV
+        /// </summary>
+        public double EngSVValue
+        {
+            get { return _EngSVValue; }
+            set
+            {
+                _EngSVValue = value;
+                if (TagValue.IsShow)
+                {
+                    RaisePropertyChanged();
+                }
+                EngSvValueStr = Math.Round(value, DecimalPoint).ToString();
+            }
+        }
+
+        private string _EngSvValueStr;
+        /// <summary>
+        /// 工程值的字符串 SV
+        /// </summary>
+        public string EngSvValueStr
+        {
+            get { return _EngSvValueStr; }
+            set { _EngSvValueStr = value; RaisePropertyChanged(); }
+        }
 
 
         private double _EngValue;
         /// <summary>
-        /// 工程值
+        /// 工程值 PV
         /// </summary>
         public double EngValue
         {

CapMachine.Wpf/Services/MachineRtDataService.cs

@@ -895,6 +895,11 @@ namespace CapMachine.Wpf.Services
 
         private OperateResult<short> OperateResultShort { get; set; }
 
+        /// <summary>
+        /// SV数据
+        /// </summary>
+        private OperateResult<short> OperateResultSVShort { get; set; }
+
         private Random Random { get; set; } = new Random();
 
         /// <summary>
@@ -975,9 +980,20 @@ namespace CapMachine.Wpf.Services
                                             LinkState = false;
                                         }
                                     }
+
+                                    if (!string.IsNullOrEmpty(itemTag.Value.SVAddress))
+                                    {
+                                        OperateResultSVShort = SiemensDrive.ReadInt16(itemTag.Value.SVAddress);
+                                        if (OperateResultSVShort.IsSuccess)
+                                        {
+                                            TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value = OperateResultSVShort.Content;
+                                            TagManger.GetTagByName<short>(itemTag.Value.Name).EngSVValue = TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName<short>(itemTag.Value.Name)!.Precision;
+                                            LinkState = true;
+                                        }
                                         else
                                         {
-                                        
+                                            LinkState = false;
+                                        }
                                     }
                                     break;
                                 default:

CapMachine.Wpf/Views/MonitorView.xaml

@@ -170,6 +170,7 @@
                                 HandValueCommand="{Binding Source={StaticResource Proxy}, Path=Data.HandValueCmd}"
                                 MeterName="{Binding NameNoUnit}"
                                 PVValue="{Binding EngValue}"
+                                SVValue="{Binding EngSVValue}"
                                 Unit="{Binding Unit}" />
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>