diff --git a/src/CncModels/Entity/Machine.cs b/src/CncModels/Entity/Machine.cs index 983b738..384425f 100644 --- a/src/CncModels/Entity/Machine.cs +++ b/src/CncModels/Entity/Machine.cs @@ -52,9 +52,6 @@ namespace CncModels.Entity /// 最近零件数 public decimal? LastPartCount { get; set; } - /// 最近累计零件总数(Tag1历史终身值) - public decimal? LastTotalPartCount { get; set; } - /// 最近操作模式 public string LastOperateMode { get; set; } diff --git a/src/CncRepository/Impl/MachineRepository.cs b/src/CncRepository/Impl/MachineRepository.cs index 864ef28..0ff4846 100644 --- a/src/CncRepository/Impl/MachineRepository.cs +++ b/src/CncRepository/Impl/MachineRepository.cs @@ -20,7 +20,7 @@ namespace CncRepository.Impl /// 在线判断SQL片段:last_ping_time在20秒内视为在线 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) { diff --git a/src/CncService/Impl/MachineService.cs b/src/CncService/Impl/MachineService.cs index 7124273..22db9c1 100644 --- a/src/CncService/Impl/MachineService.cs +++ b/src/CncService/Impl/MachineService.cs @@ -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,