From fa1adc826a74c4919dcf290c7b53e4efd7f55a51 Mon Sep 17 00:00:00 2001 From: haoliang <821644@qq.com> Date: Wed, 13 May 2026 11:56:56 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=BA=93):=20FANUC?= =?UTF-8?q?=E5=93=81=E7=89=8C=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84=20Tag11?= =?UTF-8?q?=E2=86=92=E5=88=A0=E9=99=A4=20Tag26=E2=86=92machining=5Fstatus?= =?UTF-8?q?=E5=B7=B2=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/02-init-data.sql | 2 +- src/CncService/Impl/ReplayService.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/database/02-init-data.sql b/database/02-init-data.sql index aef1fca..7de28d4 100644 --- a/database/02-init-data.sql +++ b/database/02-init-data.sql @@ -24,7 +24,7 @@ INSERT IGNORE INTO cnc_brand_field_mapping (brand_id, standard_field, field_name (@fanuc_brand_id, 'total_part_count', 'Tag1', 'id', 'number', 0), (@fanuc_brand_id, 'device_status', '_io_status', 'id', 'number', 0), (@fanuc_brand_id, 'run_status', 'Tag9', 'id', 'number', 0), -(@fanuc_brand_id, 'operate_mode', 'Tag11', 'id', 'number', 0), +(@fanuc_brand_id, 'machining_status', 'Tag26', 'id', 'string', 0), (@fanuc_brand_id, 'power_on_time', 'Tag22', 'id', 'number', 0), (@fanuc_brand_id, 'run_time', 'Tag23', 'id', 'number', 0); diff --git a/src/CncService/Impl/ReplayService.cs b/src/CncService/Impl/ReplayService.cs index b73eb1d..f1184b1 100644 --- a/src/CncService/Impl/ReplayService.cs +++ b/src/CncService/Impl/ReplayService.cs @@ -119,7 +119,7 @@ namespace CncService.Impl var programName = ExtractTagValue(tags, "Tag5"); var partCount = ParseDecimal(ExtractTagValue(tags, "Tag8")); var runStatus = ExtractTagValue(tags, "Tag9"); - var operateMode = ExtractTagValue(tags, "Tag11"); + // Tag11(操作模式)已废弃，不再提取 var spindleSet = ParseDecimal(ExtractTagValue(tags, "Tag17")); var spindleActual = ParseDecimal(ExtractTagValue(tags, "Tag19")); var machiningStatus = ExtractTagValue(tags, "Tag26"); @@ -133,7 +133,7 @@ namespace CncService.Impl ProgramName = programName, PartCount = partCount, RunStatus = runStatus, - OperateMode = operateMode, + OperateMode = null, SpindleSpeedSet = spindleSet, SpindleSpeedActual = spindleActual, MachiningStatus = machiningStatus,