1

source/DeviceLibrary/DeviceLibrary.csproj

@@ -155,6 +155,12 @@
     <Content Include="libdmtx.dll">
     <Content Include="libdmtx.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
+    <Content Include="MvCameraControl.Net.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="MvCameraControl.Net.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="opencv_world420.dll">
     <Content Include="opencv_world420.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -59,7 +59,8 @@ namespace OnlineStore.DeviceLibrary
                 isNoAirCheck = true;
                 isNoAirCheck = true;
             }
             }
             this.alarmType = alarmType;
             this.alarmType = alarmType;
-            if (alarmType.Equals(LineAlarmType.SuddenStop) || alarmType.Equals(LineAlarmType.NoAirCheck))
+            if (alarmType.Equals(LineAlarmType.SuddenStop) || alarmType.Equals(LineAlarmType.NoAirCheck)
+                || alarmType.Equals(LineAlarmType.AxisAlarm)||alarmType.Equals(LineAlarmType.AxisMoveError))
             {
             {
                 StopMove(alarmType + "报警");
                 StopMove(alarmType + "报警");
             }
             }