修复设备详情500错误:移除不存在的数据库列last_total_part_count引用

main
haoliang 1 month ago
parent b5c92dbd30
commit e610b6fed8

@ -52,9 +52,6 @@ namespace CncModels.Entity
/// <summary>最近零件数</summary>
public decimal? LastPartCount { get; set; }
/// <summary>最近累计零件总数Tag1历史终身值</summary>
public decimal? LastTotalPartCount { get; set; }
/// <summary>最近操作模式</summary>
public string LastOperateMode { get; set; }

@ -20,7 +20,7 @@ namespace CncRepository.Impl
/// <summary>在线判断SQL片段last_ping_time在20秒内视为在线</summary>
private const string OnlineExpr = "(CASE WHEN last_ping_time IS NOT NULL AND last_ping_time >= NOW() - INTERVAL 20 SECOND THEN 1 ELSE 0 END)";
private const string SelectColumns = @"id as Id, device_code as DeviceCode, name as Name, workshop_id as WorkshopId, collect_address_id as CollectAddressId, ip_address as IpAddress, brand_id as BrandId, is_enabled as IsEnabled, {0} as IsOnline, last_ping_time as LastPingTime, last_ping_latency as LastPingLatency, last_collect_time as LastCollectTime, last_device_status as LastDeviceStatus, last_run_status as LastRunStatus, last_program_name as LastProgramName, last_part_count as LastPartCount, last_total_part_count as LastTotalPartCount, last_operate_mode as LastOperateMode, last_machining_status as LastMachiningStatus, created_at as CreatedAt, updated_at as UpdatedAt";
private const string SelectColumns = @"id as Id, device_code as DeviceCode, name as Name, workshop_id as WorkshopId, collect_address_id as CollectAddressId, ip_address as IpAddress, brand_id as BrandId, is_enabled as IsEnabled, {0} as IsOnline, last_ping_time as LastPingTime, last_ping_latency as LastPingLatency, last_collect_time as LastCollectTime, last_device_status as LastDeviceStatus, last_run_status as LastRunStatus, last_program_name as LastProgramName, last_part_count as LastPartCount, last_operate_mode as LastOperateMode, last_machining_status as LastMachiningStatus, created_at as CreatedAt, updated_at as UpdatedAt";
public Machine GetById(int id)
{

@ -136,7 +136,7 @@ namespace CncService.Impl
PartCount = machine.LastPartCount,
RunStatus = machine.LastRunStatus ?? latest?.RunStatus,
OperationMode = machine.LastOperateMode,
TotalPartCount = machine.LastTotalPartCount,
TotalPartCount = null,
SpindleSpeedSet = null,
FeedSpeedSet = null,
SpindleSpeedActual = null,

Loading…
Cancel
Save