添加路径类型属性到批处理队列项

This commit is contained in:
tian 2026-01-29 14:56:10 +08:00
parent 0ee85bba40
commit c3cbaaf6e0
3 changed files with 6 additions and 2 deletions

View File

@ -11,6 +11,7 @@ namespace NavisworksTransport.Core.Models
public int Id { get; set; }
public string RouteId { get; set; }
public string PathRouteName { get; set; } // 通过 JOIN PathRoutes 获取,用于显示
public PathType PathType { get; set; } // 通过 JOIN PathRoutes 获取,用于显示
public BatchQueueStatus Status { get; set; }
public DateTime CreatedTime { get; set; }
public DateTime? StartTime { get; set; }

View File

@ -1470,6 +1470,7 @@ namespace NavisworksTransport
Id = itemId,
RouteId = reader["RouteId"].ToString(),
PathRouteName = reader["PathRouteName"].ToString(),
PathType = (PathType)Convert.ToInt32(reader["PathType"]),
Status = (BatchQueueStatus)Enum.Parse(typeof(BatchQueueStatus), reader["Status"].ToString()),
CreatedTime = DateTime.Parse(reader["CreatedTime"].ToString()),
StartTime = reader["StartTime"].ToString() != "" ? (DateTime?)DateTime.Parse(reader["StartTime"].ToString()) : null,
@ -1514,7 +1515,7 @@ namespace NavisworksTransport
using (var cmd = new SQLiteCommand(_connection))
{
var sql = @"
SELECT bqi.Id, bqi.RouteId, pr.Name AS PathRouteName, bqi.Status, bqi.CreatedTime, bqi.StartTime, bqi.EndTime, bqi.ErrorMessage,
SELECT bqi.Id, bqi.RouteId, pr.Name AS PathRouteName, pr.PathType, bqi.Status, bqi.CreatedTime, bqi.StartTime, bqi.EndTime, bqi.ErrorMessage,
bqi.FrameRate, bqi.DurationSeconds, bqi.DetectionToleranceMeters,
bqi.IsVirtualVehicle, bqi.VirtualVehicleLength, bqi.VirtualVehicleWidth, bqi.VirtualVehicleHeight,
bqi.DetectAllObjects,
@ -1573,7 +1574,7 @@ namespace NavisworksTransport
using (var cmd = new SQLiteCommand(_connection))
{
cmd.CommandText = @"
SELECT bqi.Id, bqi.RouteId, pr.Name AS PathRouteName, bqi.Status, bqi.CreatedTime, bqi.StartTime, bqi.EndTime, bqi.ErrorMessage,
SELECT bqi.Id, bqi.RouteId, pr.Name AS PathRouteName, pr.PathType, bqi.Status, bqi.CreatedTime, bqi.StartTime, bqi.EndTime, bqi.ErrorMessage,
bqi.FrameRate, bqi.DurationSeconds, bqi.DetectionToleranceMeters,
bqi.IsVirtualVehicle, bqi.VirtualVehicleLength, bqi.VirtualVehicleWidth, bqi.VirtualVehicleHeight,
bqi.DetectAllObjects,

View File

@ -30,6 +30,7 @@ NavisworksTransport 批处理队列管理页签视图 - 采用与其他页签一
<converters:BatchQueueStatusConverter x:Key="BatchQueueStatusConverter"/>
<converters:NullToDashConverter x:Key="NullToDashConverter"/>
<converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter"/>
<converters:PathTypeConverter x:Key="PathTypeConverter"/>
<!-- 批处理队列管理页面特有的样式 -->
<Style x:Key="InfoTextStyle" TargetType="Label">
@ -125,6 +126,7 @@ NavisworksTransport 批处理队列管理页签视图 - 采用与其他页签一
Height="300">
<DataGrid.Columns>
<DataGridTextColumn Header="路径名称" Binding="{Binding PathRouteName}" Width="*" MinWidth="80"/>
<DataGridTextColumn Header="路径类型" Binding="{Binding PathType, Converter={StaticResource PathTypeConverter}}" Width="60"/>
<DataGridTextColumn Header="物流对象" Binding="{Binding MovingObjectName, Converter={StaticResource NullToDashConverter}}" Width="120"/>
<DataGridTextColumn Header="调整角度" Binding="{Binding ObjectRotationCorrection, StringFormat={}{0:F1}°}" Width="80"/>
<DataGridTextColumn Header="手工指定" Binding="{Binding DetectAllObjects, Converter={StaticResource BooleanToYesNoConverter}}" Width="80"/>