1

source/ACPackingStore/ACPackingStore.csproj

@@ -22,7 +22,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>true</Prefer32Bit>
+    <Prefer32Bit>false</Prefer32Bit>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <PlatformTarget>AnyCPU</PlatformTarget>

source/ACPackingStore/FrmStore.cs

@@ -56,6 +56,7 @@ namespace OnlineStore.ACPackingStore
             //   LogUtil.logBox = this.logBox;
             //   LogUtil.logBox = this.logBox;
             // HideForm();
             // HideForm();
             LoadOk = true;
             LoadOk = true;
+            LogUtil.logBox = this.logBox;
 
 
             this.timer1.Start();
             this.timer1.Start();
         }
         }

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs

@@ -300,7 +300,10 @@ namespace OnlineStore.DeviceLibrary
                     //如果此时轴三还在报警，需要提示错误并等待 
                     //如果此时轴三还在报警，需要提示错误并等待 
                     if (ACServerManager.GetAlarmStatus(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue()) > 0)
                     if (ACServerManager.GetAlarmStatus(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue()) > 0)
                     {
                     {
-                        LogUtil.error(Name + MoveInfo.MoveType + "进出轴报警！复位失败，请检查！");
+                        LogUtil.error(Name + MoveInfo.MoveType + "复位失败:  " + Config.InOut_Axis.Explain + "报警");
+                        WarnMsg = Name + "复位失败:  " + Config.InOut_Axis.Explain + "报警";
+                        Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(Config.InOut_Axis).ToString(), WarnMsg, StoreMoveType.None); 
+                        return;
                     }
                     }
                     //复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
                     //复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
                     LogInfo(MoveInfo.MoveType + ":  压紧轴，旋转轴，上下轴开始 原点返回");
                     LogInfo(MoveInfo.MoveType + ":  压紧轴，旋转轴，上下轴开始 原点返回");
@@ -310,13 +313,11 @@ namespace OnlineStore.DeviceLibrary
                     ACAxisHomeMove(Config.UpDown_Axis);
                     ACAxisHomeMove(Config.UpDown_Axis);
                     break;
                     break;
                 case StoreMoveStep.BOX_H05_OtherAxisBack:
                 case StoreMoveStep.BOX_H05_OtherAxisBack:
-
                     MoveInfo.NextMoveStep(StoreMoveStep.BOX_H06_MiddleAxisToP1);
                     MoveInfo.NextMoveStep(StoreMoveStep.BOX_H06_MiddleAxisToP1);
                     LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1，上下轴走到P1，压紧轴到P1 ");
                     LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1，上下轴走到P1，压紧轴到P1 ");
                     ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
                     ACAxisMove(Config.Middle_Axis, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
                     ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed);
                     ACAxisMove(Config.UpDown_Axis, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed);
                     ACAxisMove(Config.Comp_Axis, Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed);
                     ACAxisMove(Config.Comp_Axis, Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed);
-
                     break;
                     break;
                 case StoreMoveStep.BOX_H06_MiddleAxisToP1:
                 case StoreMoveStep.BOX_H06_MiddleAxisToP1:
                     LogInfo(MoveInfo.MoveType + ": 完成"); 
                     LogInfo(MoveInfo.MoveType + ": 完成");