SKMC.API/Client/Access/ClientAccessCodes.cs

@@ -80,6 +80,14 @@ namespace SKMC.Api.Client.Access
         /// </summary>
         public static string RecipeSpeedOper = "RecipeSpeedOper";
         /// <summary>
+        /// 差异管理界面可视
+        /// </summary>
+        public static string RecipeDifferenceView = "RecipeDifferenceView";
+        /// <summary>
+        /// 差异管理界面可操作
+        /// </summary>
+        public static string RecipeDifferenceOper = "RecipeDifferenceOper";
+        /// <summary>
         /// 手动界面可视
         /// </summary>
         public static string MannualView = "MannualView";

SKMC.API/Machine/Config/MachineConfig.cs

@@ -32,4 +32,41 @@ namespace SKMC.Api.Machine.Config
             set { _value = value; RaisePropertyChanged(); }
         }
     }
+
+    ///<summary> 机台原点偏差配置 </summary>
+    public class MachineOffsetConfig : ConfigBase
+    {
+        private double _Offset;
+
+        public double Offset
+        {
+            get { return _Offset; }
+            set { _Offset = value; RaisePropertyChanged(); }
+        }
+
+        private long _id;
+
+        public long Id
+        {
+            get { return _id; }
+            set { _id = value; RaisePropertyChanged(); }
+        }
+
+        private int _axis_No;
+
+        public int Axis_No
+        {
+            get { return _axis_No; }
+            set { _axis_No = value; RaisePropertyChanged(); }
+        }
+
+        private int _merged;
+
+        public int Merged
+        {
+            get { return _merged; }
+            set { _merged = value; RaisePropertyChanged(); }
+        }
+
+    }
 }

SKMC.API/Machine/Config/MachineConfigStore.cs

@@ -16,10 +16,19 @@ namespace SKMC.Api.Machine.Config
         /// <returns></returns>
         public abstract ObservableCollection<MachineCatalogConfig> QueryCatalogs();
 
+        ///<summary> 查询机台原点偏差集合 </summary>
+        public abstract ObservableCollection<MachineOffsetConfig> QueryOffsets();
+
         /// <summary>
         /// 保存机台参数
         /// </summary>
         /// <param name="machineParamConfig"></param>
         public abstract void SaveMachineParam(MachineParamConfig machineParamConfig);
+
+        ///<summary> 保存机台原点偏差 </summary>
+        public abstract void SaveMachineOffset(ObservableCollection<MachineOffsetConfig> machineOffsetConfigs);
+
+        ///<summary> 插入机台原点偏差 </summary>
+        public abstract void InsertMachineOffset(ObservableCollection<MachineOffsetConfig> machineOffsetConfigs);
     }
 }

SKMC.API/Machine/MachineCacher.cs

@@ -16,7 +16,12 @@ namespace SKMC.Api.Machine
         /// <summary>
         /// Param数据
         /// </summary>
-        public ObservableCollection<MachineParamConfig> MachineParams { get; set; }     
+        public ObservableCollection<MachineParamConfig> MachineParams { get; set; }
+
+        /// <summary>
+        /// 原点偏差数据
+        /// </summary>
+        public ObservableCollection<MachineOffsetConfig> MachineOffsetConfigs { get; set; }
 
         /// <summary>
         /// 获取设备参数