轴状态修改

source/ACSingleStore/App.config

@@ -15,7 +15,7 @@
     <!--   停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）-->
     <!--   停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）-->
     <add key="StopBlowValue" value="4" />
     <add key="StopBlowValue" value="4" />
     <!--Server address-->
     <!--Server address-->
-    <!--<add key="http.server" value="http://localhost:80/"/>-->
+    <add key="http.server" value="http://192.168.1.106:8080/"/>
     <!--storeType-->
     <!--storeType-->
     <add key="store_count" value="1" />
     <add key="store_count" value="1" />
     <!--start one store config-->
     <!--start one store config-->

source/ACSingleStore/FrmStoreBox.cs

@@ -433,7 +433,7 @@ namespace OnlineStore.ACSingleStore
 
 
         private void btnInStore_Click(object sender, EventArgs e)
         private void btnInStore_Click(object sender, EventArgs e)
         {
         {
-            
+            store.SendLineStatus();
             if (store.storeRunStatus >= StoreRunStatus.HomeMoving)
             if (store.storeRunStatus >= StoreRunStatus.HomeMoving)
             {
             {
                 string selectPositionNum = cmbPosition.Text;
                 string selectPositionNum = cmbPosition.Text;

source/Common/bean/Bean.cs

@@ -204,14 +204,18 @@ namespace OnlineStore.Common
         /// <summary>
         /// <summary>
         /// 升降轴
         /// 升降轴
         /// </summary>
         /// </summary>
-        public static string updownAxis = "updownAxis";
+        public static string updownAxis = "device_updownAxis";
         /// <summary>
         /// <summary>
         /// 旋转轴
         /// 旋转轴
         /// </summary>
         /// </summary>
-        public static string middleAxis = "middleAxis";
+        public static string middleAxis = "device_middleAxis";
         /// <summary>
         /// <summary>
         /// 进出轴
         /// 进出轴
         /// </summary>
         /// </summary>
-        public static string inoutAxis = "inoutAxis";
+        public static string inoutAxis = "device_inoutAxis";
+        /// <summary>
+        /// 批量上下料轴
+        /// </summary>
+        public static string batchAxis = "device_batchAxis";
     }
     }
 }
 }

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1698,7 +1698,7 @@ namespace OnlineStore.DeviceLibrary
                     List<WaitResultInfo> waitresult = StoreMove.WaitList;
                     List<WaitResultInfo> waitresult = StoreMove.WaitList;
                     foreach (WaitResultInfo wait in waitresult)
                     foreach (WaitResultInfo wait in waitresult)
                     {
                     {
-                        if (wait.WaitType == 1 && wait.AxisInfo != null)
+                        if (wait.WaitType == 1 &&(wait.IsEnd.Equals(false))&& wait.AxisInfo != null)
                         {
                         {
                             if (wait.AxisInfo.IsSameAxis(Config.InOut_Axis))
                             if (wait.AxisInfo.IsSameAxis(Config.InOut_Axis))
                             {
                             {