出库修改

source/ACSingleStore/App.config

@@ -32,7 +32,7 @@
     <add key="HumitureControllerType" value="0"/>
     <add key="UseAIOBOX" value="1"/>
     <!--流水线地址和端口配置-->
-    <add key ="LineServerIp" value ="192.168.1.110"/>
+    <add key ="LineServerIp" value ="192.168.1.113"/>
     <add key ="LineServerPort" value ="5246"/>
     <!--是否调试状态-->
     <add key ="IsInDebug" value ="1"/>

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1216,7 +1216,7 @@ namespace OnlineStore.DeviceLibrary
                 //TODO:判断BOX是否处于可以入库状态，如果调试或急停中，需要返回给服务器；
                 if (CanStarInOut())
                 {
-                    InOutStoreParam param = new InOutStoreParam(message, posId, plateH, plateW, 0);
+                    InOutStoreParam param = new InOutStoreParam(message, posId, plateH, plateW);
                     StartInStoreMove(param);
                     //如果当前正在出入库中，需要记录下来，等待空闲时执行
                     LogUtil.info(LOGGER, StoreName + " 收到服务器入库命令：库位号【" + posId + "】二维码【" + message + "】 开始入库！");
@@ -1302,7 +1302,7 @@ namespace OnlineStore.DeviceLibrary
             //TODO:判断BOX是否处于可以入库状态，如果调试或急停中，需要返回给服务器；
             if (CanStarInOut())
             {
-                InOutStoreParam param = new InOutStoreParam(message, posId, plateH, plateW, 0);
+                InOutStoreParam param = new InOutStoreParam(message, posId, plateH, plateW);
                 LogUtil.info(logName + "  开始入库！");
                 StartInStoreMove(param);
                 //如果当前正在出入库中，需要记录下来，等待空闲时执行
@@ -1682,7 +1682,7 @@ namespace OnlineStore.DeviceLibrary
                         FixtureCodeInfo currInOutFixture = new FixtureCodeInfo(0, "", posId, plateW, plateH);
                         if (CanStarInOut() &&( LineConnect.CanStartOut()||IsDebug))
                         {
-                            bool result = StartOutStoreMove(new InOutStoreParam("", posId, position));
+                            bool result = StartOutStoreMove(new InOutStoreParam("", posId, plateW,plateH));
                             if (!result)
                             {
                                 LogUtil.info(LOGGER, StoreName + " 执行出库【" + currInOutFixture.ToStr() + "】失败，加入等待队列");

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -58,12 +58,6 @@ namespace OnlineStore.DeviceLibrary
                 p.Middle_P1 = Config.MiddleAxis_P1_Position;
 
                 p.InOut_P2 = position.InOutAxis_DoorPosition_P2; 
-                //p.UpDown_P1 = position.UpDownAxis_DoorOPosition_P1;
-                //p.UpDown_P8 = position.UpDownAxis_DoorIBPosition_P8;
-                //p.UpDown_P2 = position.UpDownAxis_DoorIPosition_P2;
-                //p.UpDown_P7 = position.UpDownAxis_DoorOBPosition_P7;
-
-                //p.InOut_P2 = Config.InOutAxis_DoorPosition_P2;
                 p.UpDown_P1 = Config.UpDownAxis_DoorOPosition_P1;
                 p.UpDown_P8 = Config.UpDownAxis_DoorIBPosition_P8;
                 p.UpDown_P2 = Config.UpDownAxis_DoorIPosition_P2;
@@ -78,6 +72,15 @@ namespace OnlineStore.DeviceLibrary
                 p.UpDown_P5 = position.UpDownAxis_OHPosition_P5;
                 p.UpDown_P6 = position.UpDownAxis_OLPosition_P6;
                 param.MoveP = p;
+
+                if (String.IsNullOrEmpty(param.PlateH))
+                {
+                    param.PlateH = position.BagHigh.ToString(); 
+                }
+                if (string.IsNullOrEmpty(param.PlateW))
+                {
+                    param.PlateW = position.BagWidth.ToString();
+                }
                 return true;
             }
             return true;

source/DeviceLibrary/lineConnect/LineConnect.cs

@@ -74,6 +74,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 store.Cmd = cmd_outend; 
                 string msg = ToParamStr(store);
+                LogUtil.info("OutStoreEnd：" + msg);
                 client.send(msg);
             }
             catch (Exception ex)

source/DeviceLibrary/store/InOrOutStoreParam.cs

@@ -45,17 +45,7 @@ namespace OnlineStore.DeviceLibrary
             this.PlateH = plateH;
             IsSolderPaste = false;
         }
-        public InOutStoreParam(string wareNo, string posId, string plateH, string plateW,int trayCode)
-        {
-            ACStoreP = null;
-            WareNumber = wareNo;
-            PositionNum = posId;
-            MoveP = null;
-            this.PlateW = plateW;
-            this.PlateH = plateH;
-            this.TrayCode = trayCode;
-            IsSolderPaste = false;
-        }
+     
 
         public InOutStoreParam(string wareNo, string posId, LineMoveP linePosition)
         {
@@ -65,14 +55,14 @@ namespace OnlineStore.DeviceLibrary
             MoveP = linePosition;
             IsSolderPaste = false;
         }
-        public InOutStoreParam(string wareNo, string posId, ACStorePosition movep)
-        {
-            ACStoreP = movep; 
-            WareNumber = wareNo;
-            PositionNum = posId;
-            MoveP = null; 
-            IsSolderPaste = false;
-        }
+        //public InOutStoreParam(string wareNo, string posId, ACStorePosition movep)
+        //{
+        //    ACStoreP = movep; 
+        //    WareNumber = wareNo;
+        //    PositionNum = posId;
+        //    MoveP = null; 
+        //    IsSolderPaste = false;
+        //}
      
         private ACStorePosition ACStoreP = null;
 
@@ -100,10 +90,7 @@ namespace OnlineStore.DeviceLibrary
         /// 位置坐标名（对应配置表的位置）
         /// </summary>
         public string PositionNum { get; set; }
-        /// <summary>
-        /// 托盘号
-        /// </summary>
-        public int TrayCode { get; set; }
+       
 
         public LineMoveP MoveP { get; set; }
         /// <summary>