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,