Alarm List DB Insert

Dev/OHV/OHV.Module.Interactivity/OHV.Module.Interactivity.csproj

@@ -196,9 +196,6 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OHV.Common\OHV.Common.csproj">
       <Project>{0d1f7fbc-bfb0-4ee4-852d-e2a8d62c5708}</Project>
@@ -217,6 +214,9 @@
       <Name>OHV.SqliteDAL</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

Dev/OHV/OHV.Module.ListViews/OHV.Module.ListViews.csproj

@@ -100,9 +100,6 @@
       <DependentUpon>SubCommandListView.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Page Include="SubViews\VehicleCommandDeleteView.xaml">
       <SubType>Designer</SubType>
@@ -135,7 +132,9 @@
       <Name>OHV.SqliteDAL</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

Dev/OHV/OHV.Module.MainViews/OHV.Module.MainViews.csproj

@@ -135,7 +135,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

Dev/OHV/OHV.SqliteDAL/OHVDbInitializer.cs

@@ -146,9 +146,29 @@ namespace OHV.SqliteDAL
 
             context.Set<Alarm>().AddRange( new List<Alarm>()
             {
-                new Alarm { AlarmId = 1, Kind = eAlarmKind.Axis, Name = "LeftClampServoError", Text="Left Clamp Lock Motion Error", Solution="", Description="", Level = eAlarmLevel.Falut, },
-                new Alarm { AlarmId = 2, Kind = eAlarmKind.Axis, Name = "LeftClampServoError", Text="Left Clamp Unlock Motion Error", Solution="", Description="", Level = eAlarmLevel.Falut, },
-            } );
+                new Alarm { AlarmId = 1, Kind = eAlarmKind.Axis,  Name = "LeftClampServo", Text="Left Clamp Lock Motion Error",            Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 2, Kind = eAlarmKind.Axis,  Name = "LeftClampServo", Text="Left Clamp Unlock Motion Error",          Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 3, Kind = eAlarmKind.Axis,  Name = "RightClamServo", Text="Right Clamp Lock Motion Error",           Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 4, Kind = eAlarmKind.Axis,  Name = "RightClamServo", Text="Right Clamp Unlock Motion Error",         Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 5, Kind = eAlarmKind.Axis,  Name = "RightClamServo", Text="Is Not Origin Return",                    Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 6, Kind = eAlarmKind.Axis,  Name = "LeftClampServo", Text="Is Not Origin Return",                    Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 7, Kind = eAlarmKind.Axis,  Name = "RightClamServo", Text="Origin Return Fail",                      Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 8, Kind = eAlarmKind.Axis,  Name = "LeftClampServo", Text="Origin Return Fail",                      Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 9, Kind = eAlarmKind.Axis,  Name = "Conveyor",       Text="Already Exist Carrier",                   Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 10, Kind = eAlarmKind.Axis, Name = "Conveyor",       Text="Loading Time Over",                       Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 11, Kind = eAlarmKind.Axis, Name = "Conveyor",       Text="Not Exist Carrier",                       Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 12, Kind = eAlarmKind.Axis, Name = "Conveyor",       Text="Unloading Time Over",                     Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 13, Kind = eAlarmKind.Axis, Name = "Conveyor",       Text="Lifter Not Unloading Position",           Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 14, Kind = eAlarmKind.Axis, Name = "Conveyor",       Text="Lifter Not Loading Position",             Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 15, Kind = eAlarmKind.Axis, Name = "Conveyor",       Text="Lifter have not Carrier",                 Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 16, Kind = eAlarmKind.Axis, Name = "Conveyor",       Text="Inverter Error",                          Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 17, Kind = eAlarmKind.Axis, Name = "PIO",            Text="Port PIO Ready Off",                      Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 18, Kind = eAlarmKind.Axis, Name = "PIO",            Text="Port PIO Time Out",                       Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 19, Kind = eAlarmKind.Axis, Name = "PIO",            Text="Port PIO InterLock On",                   Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 20, Kind = eAlarmKind.Axis, Name = "Conveyor",       Text="Loading Position Wrong",                  Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 21, Kind = eAlarmKind.Axis, Name = "Conveyor",       Text="Unloading Position Wrong",                Solution="", Description="", Level = eAlarmLevel.Falut, },
+                new Alarm { AlarmId = 21, Kind = eAlarmKind.Axis, Name = "Init",           Text="Vehicle Drive Error",                     Solution="", Description="", Level = eAlarmLevel.Falut, },
+            });
 
             //context.Set<HisAlarm>().Add(new HisAlarm { AlarmId = 1, OccurTime = DateTime.Now.AddDays(-10) });
             context.Set<Route>().Add( new Route { Id = 1, Name = "P01", PrePoint = "P11", NextPoint = "P02", ScaleTolerance = 0.5, Form = eRoadForm.Straight, ScaleValue = 0.0, Type = ePointType.LoadPort, OCSMatchID = "1000", UsePIO = true } );

Dev/OHV/VehicleControlSystem/Managers/AutoManager.cs

@@ -247,7 +247,7 @@ namespace VehicleControlSystem.Managers
             else
             {
                 hisAlarm.AlarmId = alarmID;
-                hisAlarm.Text = alarm.Text;
+                hisAlarm.Text = alarm.Name + " - " + alarm.Text;
                 hisAlarm.Solution = alarm.Solution;
                 //hisAlarm.Alarm = alarm;
             }

Dev/OHV/VehicleControlSystem/VehicleControlSystem.csproj

@@ -128,7 +128,6 @@
       <Name>OHV.SqliteDAL</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>