出入库根据料盘高度匹配压紧点

source/DeviceLibrary/StoreConfig/BoxConfig_1.csv

@@ -11,6 +11,7 @@ PRO,0,升降轴（轴2）进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P
 PRO,0,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,891,,,,,,,,,,,,
 PRO,0,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,100,,,,,,,,,,,,
 PRO,0,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,10000,,,,,,,,,,,,
+PRO,0,压紧轴（轴4）P2压紧点列表,CompAxis_P2_List,8=9400;,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 PRO,0,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,1000,,,,,,,,,,,,
 PRO,0,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,500,,,,,,,,,,,,

source/DeviceLibrary/acSingleStore/BoxBean_Partial.cs

@@ -50,7 +50,7 @@ namespace OnlineStore.DeviceLibrary
                 ACStorePosition position = param.GetACPosition();
                 if (position == null)
                 {
-                    LogUtil.error(  Name + "出入库时发现param中取到的Position=null,没有库位不能执行出入库");
+                    LogUtil.error(Name + "出入库时发现param中取到的Position=null,没有库位不能执行出入库");
                     return false;
                 }
 
@@ -91,7 +91,7 @@ namespace OnlineStore.DeviceLibrary
                 ACStorePosition position = param.GetACPosition();
                 if (position == null)
                 {
-                    LogUtil.error(  Name + "出入库时发现param中取到的Position=null,没有库位不能执行出入库");
+                    LogUtil.error(Name + "出入库时发现param中取到的Position=null,没有库位不能执行出入库");
                     return false;
                 }
                 if (param.PosInfo.PlateH <= 0)
@@ -104,6 +104,11 @@ namespace OnlineStore.DeviceLibrary
                 }
                 return true;
             }
+            int v = Config.GetCompP2(param.PosInfo.PlateH);
+            if (v > 0&&(!param.MoveP.ComPress_P2.Equals(v)))
+            {
+                param.MoveP.ComPress_P2 = v; 
+            }
             return true;
         }
 

source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs

@@ -47,9 +47,10 @@ namespace OnlineStore.LoadCSVLibrary
 
         public virtual void CheckField()
         {
-            if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName) || String.IsNullOrEmpty(ProValue))
+            if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName))
+            //if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName) || String.IsNullOrEmpty(ProValue))
                 {
-                throw new CVSFieldNotMatchingExection(ConfigStr + "，【类型：" + ProType + "】【名称：" + ProName + "】【属性值：" + ProValue + "】必须配置值！");
+                throw new CVSFieldNotMatchingExection(ConfigStr + "，【类型】【名称】必须配置值！");
             }
         }
     }
@@ -220,7 +221,7 @@ namespace OnlineStore.LoadCSVLibrary
         {
             if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName) || String.IsNullOrEmpty(DeviceName) || String.IsNullOrEmpty(ProValue))
             {
-                throw new CVSFieldNotMatchingExection(ConfigStr + "，【类型：ProType】【名称：ProName】【属性值：ProVale】【设备名称：DeviceName】必须配置值！");
+                throw new CVSFieldNotMatchingExection(ConfigStr + "，【类型】【名称】【属性值】【设备名称】必须配置值！");
             }
         }
     }

source/LoadCVSLibrary/storeConfig/config/BoxConfig.cs

@@ -227,5 +227,51 @@ namespace OnlineStore.LoadCSVLibrary
             return 16; 
         }
 
+        /// <summary>
+        ///  PRO,0,压紧轴（轴4）P2压紧点列表,CompAxis_P2_List,8=385001;,,,,,,,,,,,,
+        /// </summary>
+        [ConfigProAttribute("CompAxis_P2_List",false)]
+        public string CompAxis_P2_List { get; set; } 
+
+        private Dictionary<int, int> CompP2Map = null;
+
+        public Dictionary<int, int> LoadCompP2Map()
+        {
+            try
+            {
+                if (CompP2Map == null)
+                {
+                    CompP2Map = new Dictionary<int, int>();
+                    string[] arrayList = CompAxis_P2_List.Split(';');
+                    foreach (string str in arrayList)
+                    {
+                        string[] arrStr = str.Split('=');
+                        if (arrStr.Length == 2)
+                        {
+                            int height = Convert.ToInt32(arrStr[0].Trim()); 
+                            int comp2 = Convert.ToInt32(arrStr[1].Trim());
+                            CompP2Map.Add(height, comp2);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return CompP2Map;
+        }
+        public int GetCompP2(int height)
+        {
+            if(CompP2Map == null)
+            {
+                LoadCompP2Map();
+            }
+            if (CompP2Map.ContainsKey(height))
+            {
+                return CompP2Map[height];
+            }
+            return 0;
+        }
     }
 }