CAN FD 增加逻辑功能

CapMachine.Wpf/ViewModels/CANFDConfigViewModel.cs

@@ -34,7 +34,7 @@ namespace CapMachine.Wpf.ViewModels
     {
         public CANFDConfigViewModel(IDialogService dialogService, IFreeSql freeSql,
             IEventAggregator eventAggregator, IRegionManager regionManager, SysRunService sysRunService,
-            ComActionService actionService,ILogService logService,
+            ComActionService actionService, ILogService logService, LogicRuleService logicRuleService,
             ConfigService configService, CanFdDriveService canFdDriveService,
             IMapper mapper, MachineRtDataService machineRtDataService)
         {
@@ -44,6 +44,7 @@ namespace CapMachine.Wpf.ViewModels
             RegionManager = regionManager;
             SysRunService = sysRunService;
             ComActionService = actionService;
+            LogicRuleService = logicRuleService;
             LogService = logService;
             ConfigService = configService;
             CanFdDriveService = canFdDriveService;
@@ -127,8 +128,10 @@ namespace CapMachine.Wpf.ViewModels
                 new CbxItems(){ Key="通讯PTC膜温",Text="通讯PTC膜温"},
                 new CbxItems(){ Key="通讯PTC模块温度",Text="通讯PTC模块温度"},
             };
-            InitLoadCanConfigPro();
 
+            InitLoadCanConfigPro();
+            //初始化写规则下拉框
+            InitWriteRuleCbx();
         }
 
 
@@ -140,6 +143,7 @@ namespace CapMachine.Wpf.ViewModels
         public IRegionManager RegionManager { get; }
         public SysRunService SysRunService { get; }
         public ComActionService ComActionService { get; }
+        public LogicRuleService LogicRuleService { get; }
         public ILogService LogService { get; }
         public ConfigService ConfigService { get; }
         public CanFdDriveService CanFdDriveService { get; }
@@ -151,8 +155,40 @@ namespace CapMachine.Wpf.ViewModels
         /// </summary>
         public IDialogService DialogService { get; }
 
+        #region 规则
 
 
+        /// <summary>
+        /// 逻辑更改事件
+        /// </summary>
+        /// <param name="msg"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void LogicRuleChangeEventCall(string msg)
+        {
+            //InitWriteRuleCbx();
+        }
+
+        /// <summary>
+        /// 初始化写规则下拉框
+        /// </summary>
+        private void InitWriteRuleCbx()
+        {
+            WriteRuleCbxItems = new ObservableCollection<CbxItems>();
+            //选择的读写规则
+            foreach (var itemRule in LogicRuleService.LogicRuleDtos)
+            {
+                WriteRuleCbxItems.Add(new CbxItems()
+                {
+                    Key = itemRule.Id.ToString(),
+                    Text = itemRule.Name
+                });
+            }
+
+        }
+
+
+        #endregion
+
         #region CanConfigPro
 
         /// <summary>
@@ -163,7 +199,8 @@ namespace CapMachine.Wpf.ViewModels
             //CAN配置集合数据
             canLinConfigPros = FreeSql.Select<CanLinConfigPro>().Where(a => a.CANLINInfo == CANLIN.CANFD)
                 .Include(a => a.CANFdConfigExd)
-                .IncludeMany(a => a.CanLinConfigContents)
+                .IncludeMany(a => a.CanLinConfigContents, then => then.Include(b => b.LogicRule))//,then=> then.Include(b=>b.LogicRule)
+                                                                                                 //.IncludeMany(a => a.CanLinConfigContents)
                 .ToList();
 
             ListCanLinConfigPro = new ObservableCollection<CanLinConfigPro>(canLinConfigPros);
@@ -197,6 +234,7 @@ namespace CapMachine.Wpf.ViewModels
                             MsgName = item.MsgFrameName,
                             SignalName = item.SignalName,
                             SignalCmdValue = double.TryParse(item.DefautValue, out double result) == true ? result : 0,
+                            LogicRuleDto = Mapper.Map<LogicRuleDto>(item.LogicRule),
                         });
                         //CanFdDriveService.CmdData.Add(new CanCmdData()
                         //{
@@ -535,7 +573,7 @@ namespace CapMachine.Wpf.ViewModels
 
                 //CANConfigExdDto 数据
                 SelectedCANConfigExdDto = Mapper.Map<CANFdConfigExdDto>(SelectCanLinConfigPro!.CANFdConfigExd);
-                if (SelectedCANConfigExdDto!=null)
+                if (SelectedCANConfigExdDto != null)
                 {
                     //更新波特率等配置信息
                     CanFdDriveService.ToomossCanFDDrive.UpdateConfig((uint)SelectedCANConfigExdDto.ArbBaudRate,
@@ -557,6 +595,7 @@ namespace CapMachine.Wpf.ViewModels
                             MsgName = item.MsgFrameName,
                             SignalName = item.SignalName,
                             SignalCmdValue = double.TryParse(item.DefautValue, out double result) == true ? result : 0,
+                            LogicRuleDto = Mapper.Map<LogicRuleDto>(item.LogicRule),
                         });
 
                         //CanFdDriveService.CmdData.Add(new CanCmdData()
@@ -1084,6 +1123,15 @@ namespace CapMachine.Wpf.ViewModels
             set { _ReadNameCbxItems = value; RaisePropertyChanged(); }
         }
 
+        private ObservableCollection<CbxItems> _WriteRuleCbxItems;
+        /// <summary>
+        /// 写入的规格集合
+        /// </summary>
+        public ObservableCollection<CbxItems> WriteRuleCbxItems
+        {
+            get { return _WriteRuleCbxItems; }
+            set { _WriteRuleCbxItems = value; RaisePropertyChanged(); }
+        }
 
         //private string _SelectedWriteName;
         ///// <summary>
@@ -1199,6 +1247,7 @@ namespace CapMachine.Wpf.ViewModels
                             //直接修改
                             FreeSql.Update<CanLinRWConfig>(item.Id)
                                 .Set(a => a.Name, item.Name)
+                                .Set(a => a.LogicRuleId, item.LogicRuleId)
                                 .Set(a => a.DefautValue, item.DefautValue)
                                 .ExecuteAffrows();
                             //ListWriteCanLinRWConfigDto.Remove(SelectedWriteCanLinRWConfigDto);