1.出库叉子退回后增加出库完成的状态。

 2.门口是否有料的信号发送给服务器。

source/ACSingleStore/记录.txt

@@ -50,6 +50,11 @@
 	P;H;Q
 	P;H;Q
 
 
 
 
+	20190304更新：
+	1.出库叉子退回后增加出库完成的状态。
+	2.门口是否有料的信号发送给服务器。
+
+
 
 
 
 
 
 

source/Common/bean/Bean.cs

@@ -200,5 +200,10 @@ namespace OnlineStore.Common
         /// 温度报警值
         /// 温度报警值
         /// </summary>
         /// </summary>
         public static string maxTemperature = "temp";
         public static string maxTemperature = "temp";
+
+        /// <summary>
+        /// 门口料盘检测信号，1=有信号
+        /// </summary>
+        public static string tarycheck_door = "tarycheck_door";
     }
     }
 }
 }

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1270,7 +1270,7 @@ namespace OnlineStore.DeviceLibrary
             foreach (ConfigMoveAxis axisInfo in moveAxisList)
             foreach (ConfigMoveAxis axisInfo in moveAxisList)
             {
             {
                 short axis = axisInfo.GetAxisValue();
                 short axis = axisInfo.GetAxisValue();
-                string deviceName = axisInfo.DeviceName;
+                string deviceName = axisInfo.GetNameStr();
                 AxisAlarmInfo info = AxisAlarmCodeMap[deviceName];
                 AxisAlarmInfo info = AxisAlarmCodeMap[deviceName];
 
 
                 int alarmIo = ACServerManager.GetAlarmStatus(deviceName, axis);
                 int alarmIo = ACServerManager.GetAlarmStatus(deviceName, axis);
@@ -1879,6 +1879,9 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 lastPosId = "";
                 lastPosId = "";
             }
             }
+            //增加门口是否有料盘信号
+            int value =(int) KNDIOValue(IO_Type.TrayCheck_Door);
+            boxStatus.data.Add(ParamDefine.tarycheck_door, value.ToString());
 
 
             //温湿度
             //温湿度
             //ASTemperateParam param = HumitureServer.GetTemperateParam(Config.Temperate_Serveraddress);
             //ASTemperateParam param = HumitureServer.GetTemperateParam(Config.Temperate_Serveraddress);

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -715,6 +715,12 @@ namespace OnlineStore.DeviceLibrary
                 OutStoreLog("出库：SO_13 升降轴返回，轴2至P1(待机点) ,关闭舱门");
                 OutStoreLog("出库：SO_13 升降轴返回，轴2至P1(待机点) ,关闭舱门");
                 ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
                 ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
                 CloseDoorAndWait();
                 CloseDoorAndWait();
+
+                //把料盘放到门口时出库完成 
+                string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
+                lastPosId = posId;
+                lastPosIdStatus = StoreStatus.OutStoreEnd;
+                storeStatus = StoreStatus.OutStoreEnd;
             }
             }
             else if (StoreMove.MoveStep == StoreMoveStep.SO_13_GoBack)
             else if (StoreMove.MoveStep == StoreMoveStep.SO_13_GoBack)
             {
             {

source/DeviceLibrary/store/StoreStep.cs

@@ -104,6 +104,13 @@ namespace OnlineStore.DeviceLibrary
         /// 重置中（原点返回和重置都发此状态）
         /// 重置中（原点返回和重置都发此状态）
         /// </summary>
         /// </summary>
         ResetMove=13,       
         ResetMove=13,       
+
+        /// <summary>
+        /// 出库完成，叉子从门口退回之后更新为此状态
+        /// </summary>
+        OutStoreEnd=14,
+
+
     }
     }
 
 
     /// <summary>
     /// <summary>