将物料和记录合并到产品中，其他细节和命名调整

SKMC.API/Motion/Driver/IMotionDriver.cs

@@ -12,7 +12,7 @@ namespace SKMC.Api.Motion.Driver
         /// <summary>
         /// 运动控制数据解析器接口
         /// </summary>
-        IMotionDriverParser MotionParser { get; set; }
+        IMotionDriverParser MotionDriverParser { get; set; }
 
         /// <summary>
         /// 获取型号

SKMC.API/Motion/Driver/IMotionDriverManager.cs

@@ -16,16 +16,16 @@ namespace SKMC.Api.Motion.Driver
         /// <summary>
         /// 创建控制卡高级接口
         /// </summary>
-        /// <param name="motionControl"></param>
+        /// <param name="motionDriver"></param>
         /// <returns></returns>
-        //IMotionAdvanceControl Create(IMotionCard motionControl);
+        IMotionDriverAdvance Create(IMotionDriver motionDriver);
 
         /// <summary>
         /// 打开控制卡并初始化
         /// </summary>
         /// <param name="driverName"></param>
         /// <returns></returns>
-        void Open(IMotionDriver motionControl);
+        void Open(IMotionDriver motionDriver);
 
         /// <summary>
         /// 关闭控制卡
@@ -36,7 +36,7 @@ namespace SKMC.Api.Motion.Driver
         /// 获取控制层接口
         /// </summary>
         /// <returns></returns>
-        IMotionDriver GetMotionControl();
+        IMotionDriver GetMotionDriver();
 
         /// <summary>
         /// 获取Ethercat总线连接状态

SKMC.API/Process/Model/ProcessAction.cs

@@ -12,7 +12,7 @@ namespace SKMC.Api.Process.Model
 
         protected readonly IMotionChecker motionChecker = ObjectFactory.Resolve<IMotionChecker>();
 
-        protected readonly IMotionControl processMotionControl = ObjectFactory.Resolve<IMotionControl>();
+        protected readonly IMotionControl motionControl = ObjectFactory.Resolve<IMotionControl>();
 
         public ProcessStation ProcessStation { get; set; }
 

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

@@ -6,7 +6,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 
-namespace SKMC.Api.Device.Material.Tray
+namespace SKMC.Api.Product.Material.Tray
 {
     /// <summary>
     /// 基础物料盘, 可放m*n个物料

SKMC.API/Device/Material/Tray/TrayConfig.cs → SKMC.API/Product/Material/Tray/TrayConfig.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace SKMC.Api.Device.Material.Tray
+namespace SKMC.Api.Product.Material.Tray
 {
     /// <summary>
     /// 基础物料盘的配置模型

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

@@ -2,7 +2,7 @@
 using Prism.Mvvm;
 using SKMC.Api.Recipe.Model;
 
-namespace SKMC.Api.Device.Material.Tray
+namespace SKMC.Api.Product.Material.Tray
 {
     /// <summary>
     /// 矩阵物料盘的物料/穴位模型

SKMC.API/Record/ProductionBoard.cs → SKMC.API/Product/Record/ProductionBoard.cs

@@ -1,6 +1,6 @@
 using Prism.Commands;
 
-namespace SKMC.Api.Record
+namespace SKMC.Api.Product.Record
 {
     /// <summary>
     /// 简单的生产数据统计工具

SKMC.API/Record/ProductionRecord.cs → SKMC.API/Product/Record/ProductionRecord.cs

@@ -1,6 +1,6 @@
 using Prism.Mvvm;
 
-namespace SKMC.Api.Record
+namespace SKMC.Api.Product.Record
 {
     /// <summary>
     /// 生产数据记录

SKMC.API/SKMC.API.csproj

@@ -143,7 +143,7 @@
     <Compile Include="Motion\Model\MotionPdo.cs" />
     <Compile Include="Motion\Config\MotionConstants.cs" />
     <Compile Include="Recipe\Config\RecipeParamBase.cs" />
-    <Compile Include="Record\ProductionBoard.cs" />
+    <Compile Include="Product\Record\ProductionBoard.cs" />
     <Compile Include="Process\Control\ProcessActivityObserver.cs" />
     <Compile Include="Recipe\Config\RecipeConfigStore.cs" />
     <Compile Include="Recipe\Model\RecipePointGroup.cs" />
@@ -167,10 +167,10 @@
     <Compile Include="Process\Model\ProcessStationManager.cs" />
     <Compile Include="Process\Model\ProcessStation.cs" />
     <Compile Include="Process\Model\ProcessStorage.cs" />
-    <Compile Include="Record\ProductionRecord.cs" />
-    <Compile Include="Device\Material\Tray\Tray.cs" />
-    <Compile Include="Device\Material\Tray\TrayConfig.cs" />
-    <Compile Include="Device\Material\Tray\TraySlot.cs" />
+    <Compile Include="Product\Record\ProductionRecord.cs" />
+    <Compile Include="Product\Material\Tray\Tray.cs" />
+    <Compile Include="Product\Material\Tray\TrayConfig.cs" />
+    <Compile Include="Product\Material\Tray\TraySlot.cs" />
     <Compile Include="Motion\Control\IMotionControl.cs" />
     <Compile Include="Motion\Model\MotionAxis.cs" />
     <Compile Include="Motion\Model\MotionAxisRecord.cs" />