feat: flows kan låne en ledig traktor + aflæsnings-skub ved trigger undervejs (1.62.364)

This commit is contained in:
2026-10-19 10:37:26 +02:00
parent b1bb5e1ee8
commit 28fb5332c5
13 changed files with 276 additions and 16 deletions
@@ -444,15 +444,20 @@ function SmartPickupFrame:saveFlowGuide(guide, start)
local result = ADFlowGuide.result(guide)
local runId = result.runId
local oldIds = {}
local wasBorrow = false
if result.isNew then
runId = ADRunsController.createRun(result.name, result.kind).id
else
local existing = ADRuns.getRun(ADRunsController.store, runId)
if existing == nil then return end
oldIds = existing.vehicleIds
wasBorrow = existing.borrowWagonId ~= nil
end
ADRunsController.updateRun(runId, result.changes)
local added, removed = ADFlowGuide.vehicleChanges(oldIds, result.vehicleIds)
-- lånt traktor: en traktor flowet har lånt lige nu, kører turen færdig (slippes af ADFlowSleep) — rør den ikke
local keepBorrowed = result.borrow and wasBorrow
local added, removed = {}, {}
if not keepBorrowed then added, removed = ADFlowGuide.vehicleChanges(oldIds, result.vehicleIds) end
for _, id in ipairs(removed) do
local vehicle = adEnv ~= nil and ADRunsController.findVehicleById(adEnv, id) or nil
if vehicle ~= nil then
@@ -467,7 +472,8 @@ function SmartPickupFrame:saveFlowGuide(guide, start)
end
-- solo-traktorernes vogne fra guiden: flowet husker dem straks og henter dem ved Connect ved start
local savedRun = ADRuns.getRun(ADRunsController.store, runId)
if savedRun ~= nil then
if savedRun ~= nil and result.borrow then savedRun.chainIdle = nil end
if savedRun ~= nil and not keepBorrowed then
local wagons = ADRuns.copyWagons(savedRun.wagons)
for tractorId, wagonId in pairs(result.wagons or {}) do wagons[tractorId] = wagonId end
savedRun.wagons = wagons
@@ -477,7 +483,12 @@ function SmartPickupFrame:saveFlowGuide(guide, start)
ADRunsController.resolveMarkers(adEnv, ADRuns.getRun(ADRunsController.store, runId))
self.selectedRunId = runId
local saved = string.format(self.i18n:getText("spu_guide_flow_saved"), tostring(result.name))
if start and adEnv ~= nil and not ADRunsController.getRunStatus(adEnv, ADRuns.getRun(ADRunsController.store, runId)).isRunning then
if start and adEnv ~= nil and result.borrow then
-- ingen traktor at starte: flowet venter i dvale og låner en, når der er en tur (ADFlowSleep)
local run = ADRuns.getRun(ADRunsController.store, runId)
if run ~= nil and run.stopped then run.sleeping = true end
self:showOverride(saved .. " — " .. self.i18n:getText("spu_guide_flow_borrowStarted"))
elseif start and adEnv ~= nil and not ADRunsController.getRunStatus(adEnv, ADRuns.getRun(ADRunsController.store, runId)).isRunning then
local started, skipped, reasons = self:summarizeStartResults(ADRunsController.startRun(adEnv, runId))
self:showOverride(saved .. " — " .. string.format(self.i18n:getText("spu_status_started"), started, skipped), reasons)
else