From e610b6fed8746831d19b14f5ba9dbb82610aced7 Mon Sep 17 00:00:00 2001
From: haoliang <821644@qq.com>
Date: Wed, 13 May 2026 15:36:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E8=AF=A6?=
=?UTF-8?q?=E6=83=85500=E9=94=99=E8=AF=AF=EF=BC=9A=E7=A7=BB=E9=99=A4?=
=?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93?=
=?UTF-8?q?=E5=88=97last=5Ftotal=5Fpart=5Fcount=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/CncModels/Entity/Machine.cs | 3 ---
src/CncRepository/Impl/MachineRepository.cs | 2 +-
src/CncService/Impl/MachineService.cs | 2 +-
3 files changed, 2 insertions(+), 5 deletions(-)
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,