修复命名问题等细节

SKMC.API/Client/ClientCacher.cs

@@ -64,15 +64,6 @@ namespace SKMC.Api.Client
             CatalogChanged?.Invoke(catalog);
         }
 
-        //private string _selectView;
-
-        //public string SelectView
-        //{
-        //    get { return _selectView; }
-        //    set { _selectView = value; RaisePropertyChanged(); }
-        //}
-
-
         /// <summary>
         /// 客户端消息集
         /// </summary>

SKMC.API/Client/Views/MenuViewModel.cs

@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 namespace SKMC.Api.Client.Views
 {
     /// <summary>
-    /// 菜单项VM
+    /// 菜单项视图模型
     /// </summary>
     public class MenuViewModel : BindableBase
     {

SKMC.API/Common/Config/ConfigBase.cs

@@ -2,6 +2,9 @@
 
 namespace SKMC.Api.Device.Config
 {
+    /// <summary>
+    /// 配置项基类
+    /// </summary>
     public class ConfigBase : BindableBase
     {
         private string _code;

SKMC.API/Common/DB/SqlSugarTool.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
 using DbType = SqlSugar.DbType;
+using SKMC.Api.Common.Logger;
 
 namespace SKMC.Api.Common.DB
 {

SKMC.API/Common/Data/IDataFilter.cs

@@ -6,6 +6,10 @@ using System.Threading.Tasks;
 
 namespace SKMC.Api.Common.Data
 {
+    /// <summary>
+    /// 数据过滤接口
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
     public interface IDataFilter<T>
     {
         T Filter(T value, T param1, T param2);

SKMC.API/Common/Expression/Predicator.cs → SKMC.API/Common/Expressions/Predicator.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-namespace SKMC.Api.Common
+namespace SKMC.Api.Common.Expressions
 {
     public static class Predicator
     {

SKMC.API/Common/Logger/ILogger.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SKMC.Api.Common
+namespace SKMC.Api.Common.Logger
 {
     /// <summary>
     /// 通用的日志接口

SKMC.API/Common/Logger/Log4netLogger.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SKMC.Api.Common
+namespace SKMC.Api.Common.Logger
 {
     public class Log4netLogger : ILogger
     {

SKMC.API/Common/Logger/LogDataService.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace SKMC.Api.Common
+namespace SKMC.Api.Common.Logger
 {
     public class LogDataService
     {

SKMC.API/Common/Logger/LogFactory.cs

@@ -5,7 +5,7 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SKMC.Api.Common
+namespace SKMC.Api.Common.Logger
 {
     public class LogFactory
     {

SKMC.API/Common/Logger/LoggingEventAppender.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SKMC.Api.Common
+namespace SKMC.Api.Common.Logger
 {
     /// <summary>
     /// log4net 扩展

SKMC.API/Common/Logger/LoggingEventModel.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SKMC.Api.Common
+namespace SKMC.Api.Common.Logger
 {
     public class LoggingEventModel
     {

SKMC.API/Common/Logger/LoggingEventTarget.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SKMC.Api.Common
+namespace SKMC.Api.Common.Logger
 {
     /// <summary>
     /// NLog 扩展

SKMC.API/Common/Logger/NLogLogger.cs

@@ -5,12 +5,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SKMC.Api.Common
+namespace SKMC.Api.Common.Logger
 {
     public class NLogLogger : ILogger
     {
 
-        private readonly Logger log;
+        private readonly NLog.Logger log;
 
         public NLogLogger(string name)
         {

SKMC.API/Common/ObjectFactory.cs

@@ -1,4 +1,5 @@
-using System;
+using SKMC.Api.Common.Logger;
+using System;
 using System.Collections.Generic;
 
 namespace SKMC.Api.Common

SKMC.API/Common/Tasks/Tasks.cs

@@ -1,4 +1,5 @@
-using SKMC.Api.Process.Control;
+using SKMC.Api.Common.Logger;
+using SKMC.Api.Process.Control;
 using System;
 using System.Collections.Generic;
 using System.Linq;

SKMC.API/Common/Tcp/TCPClient.cs

@@ -1,4 +1,5 @@
-using System;
+using SKMC.Api.Common.Logger;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

SKMC.API/Common/Tcp/TcpClientBase.cs

@@ -1,4 +1,5 @@
-using System;
+using SKMC.Api.Common.Logger;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;

SKMC.API/Machine/Adapter/SKVision/SKVisionClient.cs

@@ -1,4 +1,4 @@
-using SKMC.Api.Common;
+using SKMC.Api.Common.Logger;
 using System;
 using System.Collections.Generic;
 using System.Linq;

SKMC.API/Machine/Adapter/SKVision/SKVisionClientBase.cs

@@ -1,4 +1,4 @@
-using SKMC.Api.Common;
+using SKMC.Api.Common.Logger;
 using SKMC.Api.Common.Tcp;
 using SKMC.Api.Common.Vision;
 using System;

SKMC.API/Process/Control/ProcessExceptions.cs

@@ -11,6 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using Prism.Services.Dialogs;
+using SKMC.Api.Common.Logger;
 
 namespace SKMC.Api.Process.Control
 {

SKMC.API/Process/Model/Activity.cs

@@ -1,4 +1,4 @@
-using SKMC.Api.Common;
+using SKMC.Api.Common.Logger;
 using System.Collections.Generic;
 
 namespace SKMC.Api.Process.Model

SKMC.API/Process/Model/ProcessStation.cs

@@ -1,4 +1,5 @@
 using SKMC.Api.Common;
+using SKMC.Api.Common.Logger;
 using SKMC.Api.Common.Tasks;
 using SKMC.Api.Motion.Control;
 using System;

SKMC.API/Process/Model/ProcessStationManager.cs

@@ -1,4 +1,4 @@
-using SKMC.Api.Common;
+using SKMC.Api.Common.Logger;
 using SKMC.Api.Common.Tasks;
 using System;
 using System.Collections.Concurrent;

SKMC.API/Product/Material/Tray/Tray.cs

@@ -1,5 +1,5 @@
 using Prism.Mvvm;
-using SKMC.Api.Common;
+using SKMC.Api.Common.Logger;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

SKMC.API/Product/Material/Tray/TraySlot.cs

@@ -107,8 +107,8 @@ namespace SKMC.Api.Product.Material.Tray
             FixsetY = processTrayMatter.FixsetY;
             if (ProcessPoint != null)
             {
-                ProcessPoint.ProcessPointPositions[0].FixsetVal = processTrayMatter.FixsetX;
-                ProcessPoint.ProcessPointPositions[1].FixsetVal = processTrayMatter.FixsetY;
+                ProcessPoint.RecipePointPositions[0].FixsetVal = processTrayMatter.FixsetX;
+                ProcessPoint.RecipePointPositions[1].FixsetVal = processTrayMatter.FixsetY;
             }
         }
 

SKMC.API/Recipe/Config/RecipeConfigStore.cs

@@ -9,24 +9,24 @@ using System.Threading.Tasks;
 namespace SKMC.Api.Recipe.Config
 {
     /// <summary>
-    /// 
+    /// 配方参数存储接口
     /// </summary>
     public abstract class RecipeConfigStore
     {
 
-        public abstract ObservableCollection<RecipeProfile> QueryProductProfiles();
+        public abstract ObservableCollection<RecipeProfile> QueryRecipeProfiles();
 
-        public abstract ObservableCollection<RecipeParam> QueryProcessParams(short isInner = 0, short isSwtich = 0);
+        public abstract ObservableCollection<RecipeParam> QueryRecipeParams(short isInner = 0, short isSwtich = 0);
 
-        public abstract void SaveOrUpdateParams(ObservableCollection<RecipeParam> processParamConfigers);
+        public abstract void SaveOrUpdateParams(ObservableCollection<RecipeParam> recipeParamConfigers);
 
-        public abstract ObservableCollection<RecipeSpeed> QueryProcessSpeeds();
+        public abstract ObservableCollection<RecipeSpeed> QueryRecipeSpeeds();
 
-        public abstract void SaveOrUpdateSpeeds(ObservableCollection<RecipeSpeed> processSpeedConfigers);
+        public abstract void SaveOrUpdateSpeeds(ObservableCollection<RecipeSpeed> recipeSpeedConfigers);
 
-        public abstract ObservableCollection<RecipePointGroup> QueryProcessPointGroups();
+        public abstract ObservableCollection<RecipePointGroup> QueryRecipePointGroups();
 
-        public abstract void SaveOrUpdatePoints(ObservableCollection<RecipePoint> processPoints);
+        public abstract void SaveOrUpdatePoints(ObservableCollection<RecipePoint> recipePoints);
 
     }
 }

SKMC.API/Recipe/Config/RecipeParamBase.cs

@@ -9,8 +9,8 @@ using System.Threading.Tasks;
 namespace SKMC.Api.Recipe.Config
 {
     /// <summary>
-    /// <para>档案配置器</para>
-    /// <para>参数常量类可继承该类</para>
+    /// <para>配方参数基类</para>
+    /// <para>继承该类可实现即时更新</para>
     /// </summary>
     public abstract class RecipeParamBase
     {
@@ -40,14 +40,14 @@ namespace SKMC.Api.Recipe.Config
         /// <summary>
         /// 设置单个参数到常量中
         /// </summary>
-        /// <param name="processParam"></param>
-        public void SetParameter(RecipeParam processParam)
+        /// <param name="recipeParam"></param>
+        public void SetParameter(RecipeParam recipeParam)
         {
-            FieldInfo field = GetType().GetField(processParam.Code, BindingFlags.Public | BindingFlags.Static);
+            FieldInfo field = GetType().GetField(recipeParam.Code, BindingFlags.Public | BindingFlags.Static);
             if (field != null)
             {
-                field.SetValue(null, Convert.ChangeType(processParam.Value, field.FieldType));
-                processParam.LastValue = processParam.Value;
+                field.SetValue(null, Convert.ChangeType(recipeParam.Value, field.FieldType));
+                recipeParam.LastValue = recipeParam.Value;
             }
         }
     }

SKMC.API/Recipe/Model/RecipePoint.cs

@@ -6,7 +6,7 @@ namespace SKMC.Api.Recipe.Model
 {
     /// <summary>
     /// 电机点位配置模型
-    /// 每个点位由1个或多个单轴位置ProcessPointPosition组成
+    /// 每个点位由1个或多个单轴位置RecipePointPosition组成
     /// </summary>
     public class RecipePoint : BindableBase, ICloneable
     {
@@ -45,7 +45,7 @@ namespace SKMC.Api.Recipe.Model
         private double[] fixset;
 
         /// <summary>
-        /// 该点位的单轴位置的偏移量数组, 序号与ProcessPointPositions的序号一致
+        /// 该点位的单轴位置的偏移量数组, 序号与RecipePointPositions的序号一致
         /// </summary>
         public double[] Fixset
         {
@@ -55,9 +55,9 @@ namespace SKMC.Api.Recipe.Model
                 fixset = value;
                 for (int i = 0; i < fixset.Length; i++)
                 {
-                    if (ProcessPointPositions != null && ProcessPointPositions[i] != null)
+                    if (RecipePointPositions != null && RecipePointPositions[i] != null)
                     {
-                        ProcessPointPositions[i].FixsetVal = fixset[i];
+                        RecipePointPositions[i].FixsetVal = fixset[i];
                     }
                 }
             }
@@ -75,9 +75,9 @@ namespace SKMC.Api.Recipe.Model
                     fixset[i] = 0;
                 }
             }
-            if (ProcessPointPositions != null)
+            if (RecipePointPositions != null)
             {
-                foreach (RecipePointPosition pointPosition in ProcessPointPositions)
+                foreach (RecipePointPosition pointPosition in RecipePointPositions)
                 {
                     pointPosition.FixsetVal = 0;
                 }
@@ -92,7 +92,7 @@ namespace SKMC.Api.Recipe.Model
         /// <summary>
         /// 点位单轴位置集合
         /// </summary>
-        public ObservableCollection<RecipePointPosition> ProcessPointPositions { get; set; } = new ObservableCollection<RecipePointPosition>();
+        public ObservableCollection<RecipePointPosition> RecipePointPositions { get; set; } = new ObservableCollection<RecipePointPosition>();
 
         /// <summary>
         /// 获取点位的轴位置值
@@ -101,8 +101,8 @@ namespace SKMC.Api.Recipe.Model
         /// <returns></returns>
         public double PositionVal(int index = 0)
         {
-            if (index < 0 || index > ProcessPointPositions.Count - 1) return 0;
-            return ProcessPointPositions[index].Position;
+            if (index < 0 || index > RecipePointPositions.Count - 1) return 0;
+            return RecipePointPositions[index].Position;
         }
 
         public object Clone()
@@ -112,10 +112,10 @@ namespace SKMC.Api.Recipe.Model
                 Code = this.Code,
                 Name = this.Name,
             };
-            model.ProcessPointPositions = new ObservableCollection<RecipePointPosition>();
-            foreach (var item in ProcessPointPositions)
+            model.RecipePointPositions = new ObservableCollection<RecipePointPosition>();
+            foreach (var item in RecipePointPositions)
             {
-                model.ProcessPointPositions.Add((RecipePointPosition) item.Clone());
+                model.RecipePointPositions.Add((RecipePointPosition) item.Clone());
             }
             return model;
         }

SKMC.API/Recipe/Model/RecipePointGroup.cs

@@ -78,7 +78,7 @@ namespace SKMC.Api.Recipe.Model
 
         public int AxisNum 
         { 
-            get => ProcessPoints.Count;
+            get => RecipePoints.Count;
         }
 
         /// <summary>
@@ -89,7 +89,7 @@ namespace SKMC.Api.Recipe.Model
         /// <summary>
         /// 关联点位集合
         /// </summary>
-        public ObservableCollection<RecipePoint> ProcessPoints { get; set; } = new ObservableCollection<RecipePoint>();
+        public ObservableCollection<RecipePoint> RecipePoints { get; set; } = new ObservableCollection<RecipePoint>();
 
     }
 }

SKMC.API/Recipe/RecipeCacher.cs

@@ -70,7 +70,7 @@ namespace SKMC.Api.Recipe
         /// <param name="code">点位码</param>
         /// <param name="index">点位中多个轴位置的序号, 默认为第一个</param>
         /// <returns></returns>
-        public abstract double GetPointPositionVal(string code, int index = 0);
+        public abstract double GetRecipePointVal(string code, int index = 0);
 
         /// <summary>
         /// 获取流程点位的轴位置数值
@@ -78,7 +78,7 @@ namespace SKMC.Api.Recipe
         /// <param name="processPoint">点位对象</param>
         /// <param name="index">点位中多个轴位置的序号, 默认为第一个</param>
         /// <returns></returns>
-        public abstract double GetPointPositionVal(RecipePoint processPoint, int index = 0);
+        public abstract double GetRecipePointVal(RecipePoint processPoint, int index = 0);
 
         /// <summary>
         /// 获取速度配置对象

SKMC.API/SKMC.API.csproj

@@ -152,7 +152,7 @@
     <Compile Include="Common\Types\MessageQueue.cs" />
     <Compile Include="Common\Datetime\MicroTimer.cs" />
     <Compile Include="Common\Types\ObservableConcurrentList.cs" />
-    <Compile Include="Common\Expression\Predicator.cs" />
+    <Compile Include="Common\Expressions\Predicator.cs" />
     <Compile Include="Common\Tasks\TaskTokener.cs" />
     <Compile Include="Machine\Config\MachineConfig.cs" />
     <Compile Include="Machine\MachineCacher.cs" />