|
|
|
|
@ -84,10 +84,10 @@ namespace CncCollector.Core
|
|
|
|
|
foreach (var r in records)
|
|
|
|
|
{
|
|
|
|
|
conn.Execute(@"INSERT INTO cnc_collect_record (machine_id, collect_time, device_time, program_name, part_count,
|
|
|
|
|
total_part_count, device_status, run_status, operate_mode,
|
|
|
|
|
device_status, run_status, operate_mode,
|
|
|
|
|
power_on_time, run_time, extra_data, created_at)
|
|
|
|
|
VALUES (@MachineId, @CollectTime, @DeviceTime, @ProgramName, @PartCount,
|
|
|
|
|
@TotalPartCount, @DeviceStatus, @RunStatus, @OperateMode,
|
|
|
|
|
@DeviceStatus, @RunStatus, @OperateMode,
|
|
|
|
|
@PowerOnTime, @RunTime, @ExtraData, @CreatedAt)",
|
|
|
|
|
new
|
|
|
|
|
{
|
|
|
|
|
@ -96,7 +96,6 @@ namespace CncCollector.Core
|
|
|
|
|
DeviceTime = r.DeviceTime,
|
|
|
|
|
ProgramName = r.ProgramName ?? (string)null,
|
|
|
|
|
PartCount = r.PartCount,
|
|
|
|
|
TotalPartCount = r.TotalPartCount,
|
|
|
|
|
DeviceStatus = r.DeviceStatus ?? (string)null,
|
|
|
|
|
RunStatus = r.RunStatus ?? (string)null,
|
|
|
|
|
OperateMode = r.OperateMode ?? (string)null,
|
|
|
|
|
@ -123,7 +122,6 @@ namespace CncCollector.Core
|
|
|
|
|
conn.Execute(@"UPDATE cnc_machine SET last_collect_time = @CollectTime,
|
|
|
|
|
last_device_status = @DeviceStatus, last_run_status = @RunStatus,
|
|
|
|
|
last_program_name = @ProgramName, last_part_count = @PartCount,
|
|
|
|
|
last_total_part_count = @TotalPartCount,
|
|
|
|
|
last_operate_mode = @OperateMode
|
|
|
|
|
WHERE id = @MachineId",
|
|
|
|
|
new
|
|
|
|
|
@ -134,7 +132,6 @@ namespace CncCollector.Core
|
|
|
|
|
RunStatus = r.RunStatus ?? (string)null,
|
|
|
|
|
ProgramName = r.ProgramName ?? (string)null,
|
|
|
|
|
r.PartCount,
|
|
|
|
|
r.TotalPartCount,
|
|
|
|
|
OperateMode = r.OperateMode ?? (string)null
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|