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

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/StoreConfig/BoxConfig_2.csv

@@ -10,7 +10,7 @@ PRO,0,升降轴（轴2）进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P
 PRO,0,升降轴（轴2）进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,2730,,,,,,,,,,,,
 PRO,0,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,893,,,,,,,,,,,,
 PRO,0,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,100,,,,,,,,,,,,
-PRO,0,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,10000,,,,,,,,,,,,
+PRO,0,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,10000,,,,,,,,,,,, 
 ,,,,,,,,,,,,,,,,
 PRO,0,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,1000,,,,,,,,,,,,
 PRO,0,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,500,,,,,,,,,,,,

source/DeviceLibrary/acSingleStore/BoxBean.cs

@@ -69,17 +69,17 @@ namespace OnlineStore.DeviceLibrary
             moveAxisList = new List<ConfigMoveAxis>();
             MoveAxisConfig();
             List<ACStorePosition> positionList = CSVPositionReader<ACStorePosition>.getPositionList();
-            PositionNumList = new List<string>();
+            PositionNumList = new List<string>(); 
             foreach (ACStorePosition position in positionList)
             {
                 bool result = ACStorePosition.CheckPosition(position, Config);
                 if (result && position.StoreId.Equals(config.GetStoreId()))
                 {
-                    PositionNumList.Add(position.PositionNum);
+                    PositionNumList.Add(position.PositionNum); 
                 }
             }
 
-            humBean = new HumitureBean(config.Humiture_Port, Name);
+            humBean = new HumitureBean(config.Humiture_Port, Name); 
             lineConnect = new LineConnect(config.GetStoreId(),config.CID);
             mainTimer.Enabled = false; 
         }
@@ -99,7 +99,7 @@ namespace OnlineStore.DeviceLibrary
             moveAxisList.Add(Config.Comp_Axis);
             this.AxisAlarmCodeMap.Add(this.Config.Comp_Axis.GetNameStr(), new AxisAlarmInfo()); 
         }
-         
+               
         public override bool StartRun()
         {
 

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;
                 }
 
@@ -68,7 +68,7 @@ namespace OnlineStore.DeviceLibrary
                 p.ComPress_P3 = position.CompressAxis_CPosition_P3;
                 p.InOut_P3 = position.InOutAxis_Position_P3;
                 p.Middle_P2 = position.MiddleAxis_Position_P2;
-               // p.Middle_P3 = position.MiddleAxis_Position_P3;
+                // p.Middle_P3 = position.MiddleAxis_Position_P3;
                 p.UpDown_P3 = position.UpDownAxis_IHPosition_P3;
                 p.UpDown_P4 = position.UpDownAxis_ILPosition_P4;
                 p.UpDown_P5 = position.UpDownAxis_OLPosition_P5;
@@ -79,7 +79,7 @@ namespace OnlineStore.DeviceLibrary
                 if (param.PosInfo.PlateH <= 0)
                 {
                     param.PosInfo.PlateH = position.BagHigh;
-                }
+                } 
                 if (param.PosInfo.PlateW <= 0)
                 {
                     param.PosInfo.PlateW = position.BagWidth;
@@ -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))
-            {
-                throw new CVSFieldNotMatchingExection(ConfigStr + "，【类型：" + ProType + "】【名称：" + ProName + "】【属性值：" + ProValue + "】必须配置值！");
+            if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName))
+            //if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName) || String.IsNullOrEmpty(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

@@ -17,7 +17,7 @@ namespace OnlineStore.LoadCSVLibrary
         {
         }
 
-    
+
         /// <summary>
         ///轴2升降轴 运动上下轴
         /// </summary>
@@ -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;
+        }
     }
 }