单盘入库，获取库位号之后，需要重新压紧一次

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -719,17 +719,19 @@ namespace OnlineStore.DeviceLibrary
                     }
                     else
                     {
-                        LogUtil.info("单盘入库获取库位号成功：" + param.PositionNum + ",叉子后退，开始入库");
                         //更改当前入库参数  
                         storeRunStatus = StoreRunStatus.Busy;
                         storeStatus = StoreStatus.InStoreExecute;
                         StoreMove.MoveParam = param;
+                        moveP = StoreMove.MoveParam.MoveP;
                         //lastMoveType = StoreMoveType.InStore;
                         StoreMove.IsBatchInOutStore = true;
                         StoreMove.IsNeedInStore = true;
 
+                        LogUtil.info("单盘入库获取库位号成功：" + param.ToStr() + ",叉子后退，压紧轴压紧[" + moveP.ComPress_P2 + "]，开始入库");
                         StoreMove.NextMoveStep(StoreMoveStep.SI_07_InoutToP1);
                         ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Position);
+                        ComMoveToPosition(moveP.ComPress_P2, Config.CompAxis_P2_Speed);
                     }
                 }
             }

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -535,9 +535,7 @@ namespace OnlineStore.DeviceLibrary
 
             Dictionary<string, string> data = resultOperation.data;
             if (data != null && data.ContainsKey(ParamDefine.posId) && data.ContainsKey(ParamDefine.plateH) && data.ContainsKey(ParamDefine.plateW))
-            {
-                //服务器返回时有：posId库位编号，plateW:料盘宽度,plateH：料盘高度，
-                //postId格式BoxId#位置
+            { 
                 string posId = data[ParamDefine.posId];
                 try
                 {
@@ -548,10 +546,8 @@ namespace OnlineStore.DeviceLibrary
                     //bool isSingleOut = singleOut.ToLower().Equals("true");
                     string[] posArray = posId.Split('#');
                     if (!(posArray.Length == 2))
-                    {
-                     //   WarnMsg = Name + ResourceControl.GetString(ResourceControl.InStoreError, "入库库位格式错误：") + "【" + message + "】【" + posId + "】";
-                        SetWarnMsgAndLog(ResourceControl.InStoreError, message, posId);
-                       // LogUtil.error("服务器反馈   入库库位格式错误：二维码【" + message + "】库位【" + posId + "】");
+                    { 
+                        SetWarnMsgAndLog(ResourceControl.InStoreError, message, posId); 
                         return null;
                     }
 
@@ -559,10 +555,8 @@ namespace OnlineStore.DeviceLibrary
                     //根据发送的posId获取位置列表
                     AutoStorePosition position = CSVPositionReader<AutoStorePosition>.GetPositon(posId);
                     if (position == null)
-                    {   //出入库没有找到服务器发送的库位，需要打印日志方便查询原因
-                      //  WarnMsg = ResourceControl.GetString(ResourceControl.InStoreNoPosition, "入库未找到库位：") + "【" + message + "】【" + posId + "】 ";
-                        SetWarnMsgAndLog(ResourceControl.InStoreNoPosition, message, posId);
-                      //  LogUtil.error("服务器反馈  入库未找到库位：二维码【" + message + "】库位【" + posId + "】");
+                    {   
+                        SetWarnMsgAndLog(ResourceControl.InStoreNoPosition, message, posId); 
                         return null;
                     }
 

source/DeviceLibrary/store/InOrOutStoreParam.cs

@@ -46,17 +46,7 @@ namespace OnlineStore.DeviceLibrary
             this.PlateH = plateH;
             IsSolderPaste = false;
         }
-        //public InOutStoreParam(string wareNo, string posId, int plateH, int plateW,int trayCode)
-        //{
-        //    ACStoreP = null;
-        //    WareNumber = wareNo;
-        //    PositionNum = posId;
-        //    MoveP = null;
-        //    this.PlagtW = plateW;
-        //    this.PlateH = plateH;
-        //    this.TrayCode = trayCode;
-        //    IsSolderPaste = false;
-        //}
+       
 
         public InOutStoreParam(string wareNo, string posId, LineMoveP linePosition)
         {
@@ -67,14 +57,7 @@ namespace OnlineStore.DeviceLibrary
             IsSolderPaste = false;
             SetSize();
         }
-        //public InOutStoreParam(string wareNo, string posId, AutoStorePosition movep)
-        //{
-        //    ACStoreP = movep; 
-        //    WareNumber = wareNo;
-        //    PositionNum = posId;
-        //    MoveP = null; 
-        //    IsSolderPaste = false;
-        //}
+      
         public void SetSize()
         {
             AutoStorePosition position = CSVPositionReader<AutoStorePosition>.GetPositon(PositionNum);
@@ -116,10 +99,7 @@ namespace OnlineStore.DeviceLibrary
         /// 位置坐标名（对应配置表的位置）
         /// </summary>
         public string PositionNum { get; set; }
-        /// <summary>
-        /// 托盘号
-        /// </summary>
-        public int TrayCode { get; set; }
+       
 
         public LineMoveP MoveP { get; set; }
         /// <summary>
@@ -134,7 +114,10 @@ namespace OnlineStore.DeviceLibrary
         /// 是否是放入锡膏（在线料仓才需要此字段）
         /// </summary>
         public bool IsSolderPaste { get; set; }
-        
-         
+        public string ToStr()
+        {
+            return " [" + WareNumber + "] [" + PositionNum + "] [" + PlagtW + "x" + PlateH + "] ";
+        }
+
     }
 }