bug修改

source/DeviceLibrary/bean/EquipBean.cs

@@ -613,8 +613,16 @@ namespace OnlineStore.DeviceLibrary
                     {
                         return;
                     }
-                    if (MoveInfo.IsInWait == false)
+                    if (!MoveInfo.IsInWait  )
                     {
+                        foreach(WorkStation w in StationMap.Values)
+                        {
+                            if (w.MoveInfo.IsInWait)
+                            {
+                                return;
+                            }
+                        }
+
                         LogInfo("之前有IO超时异常【" + alarmInfo.alarmDetail + "】,但是当前已经没有在等待中，清理信号超时异常！");
                         alarmType = StoreAlarmType.None;
                         WarnMsg = "";
@@ -910,6 +918,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 LogUtil.error(Name + "轴报警，关闭刹车，停止运动，关闭轴，打开报警灯");
                 StopMove();
+
             }
             else if (alarmType == StoreAlarmType.SuddenStop)
             {

source/DeviceLibrary/bean/EquipBean_Partial.cs

@@ -485,11 +485,9 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(MoveStep.SO_23_PutReel))
             {
                 MoveInfo.NextMoveStep(MoveStep.SO_24_InoutBack);
-                MoveLog(" 进出轴动作至P1[" + moveP.InOut_P1 + "],调用SheflFinish ");
-
-                HttpServer.ShelfFinish(CurrTray.realRFID, CurrTray.barcode, CurrTray.shelfP.ToString() );
-
+                MoveLog(" 进出轴动作至P1[" + moveP.InOut_P1 + "],调用SheflFinish "); 
                 ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
+                HttpServer.ShelfFinish(CurrTray.realRFID, CurrTray.barcode, CurrTray.shelfP.ToString());
             }
             else if (MoveInfo.IsStep(MoveStep.SO_24_InoutBack))
             {

source/DeviceLibrary/bean/WorkStation.cs

@@ -153,7 +153,7 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(MoveStep.SR_03_LocationUp))
             {
                 LogUtil.info(Name + "复位："+ CurrShelf.ToStr() + "准备完成，可以放料 ");
-                MoveInfo.EndMove();
+                MoveInfo.EndMove();                
             }
         }
         private void SR_03_LocationUp()

source/HCSingleStore/App.config

@@ -11,8 +11,8 @@
     <!--   停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）-->
     <add key="StopBlowValue" value="4" />
     <!--Server address-->
-      <add key="http.server" value="http://10.85.162.124/myproject/" />
-    <add key="httpAddr" value="http://10.85.160.25/myproject/rest/api/qisda/device/"/>
+      <add key="http.server" value="http://192.168.100.14/myproject/" />
+    <add key="httpAddr" value="http://192.168.100.14/myproject/rest/api/qisda/device/"/>
     <!--AGV调度服务器地址-->
     <add key="AgvServerIp" value="10.85.162.40" />
     <!--storeType-->

source/HCSingleStore/FrmEquip.cs

@@ -292,8 +292,8 @@ namespace OnlineStore.ACSingleStore
             if (position != null)
             {
                 position.MiddleAxis_P2 = FormUtil.GetIntValue(txtMiddleP2); 
-                position.UpDownAxis_L_P4 = FormUtil.GetIntValue(txtUpDownP5);
-                position.UpDownAxis_H_P3 = FormUtil.GetIntValue(txtUpDownP6); 
+                position.UpDownAxis_L_P4 = FormUtil.GetIntValue(txtUpDownP4);
+                position.UpDownAxis_H_P3 = FormUtil.GetIntValue(txtUpDownP3); 
 
                 position.InOutAxis_P3 = FormUtil.GetIntValue(txtInOutP3);
                 position.CompressAxis_P3 = FormUtil.GetIntValue(txtComP3);