feat: én traktor, flere vogne i samme flow — skifter vogn mellem ture; kæden laver kombinerede flows (1.62.337)
Brugerønske 18/10 18:36: færre traktorer. spareWagons pr. traktor, ADWagonSwap vurderer vognene før hver tur og bruger flowets vognbytte.
This commit is contained in:
@@ -49,6 +49,20 @@ function ADChainRun.choosePair(implements, tractors, fillTypeIndex, used, blocke
|
||||
return nil
|
||||
end
|
||||
|
||||
-- Kun en pallevogn (Universal Autoload) fra puljen — rene pallevogne først, ikke en allerede brugt. -> redskab eller nil
|
||||
function ADChainRun.chooseAutoloadWagon(implements, used, blocked)
|
||||
used, blocked = used or {}, blocked or {}
|
||||
for _, pureFirst in ipairs({true, false}) do
|
||||
for _, implement in ipairs(implements or {}) do
|
||||
if implement.autoload == true and not used[implement.id] and not blocked[implement.id]
|
||||
and (not pureFirst or not isUnloader(implement)) then
|
||||
return implement
|
||||
end
|
||||
end
|
||||
end
|
||||
return nil
|
||||
end
|
||||
|
||||
-- ---- marker ----
|
||||
|
||||
local function fieldById(fields, id)
|
||||
@@ -159,6 +173,63 @@ local function startWithPair(adEnv, run, runId, pair, used, verb)
|
||||
return started
|
||||
end
|
||||
|
||||
local undoStaffing -- defineret ved staffIdleFlows (slipper traktoren igen, når en start afvises)
|
||||
|
||||
-- Én traktor, tipvogn + pallevogn (brugerønske 18/10 18:36: "vil reducere brugen af traktorer og dermed spare
|
||||
-- penge"): flowet får traktor + løsvare-vogn som aktiv og en pallevogn som ekstra vogn (ADWagonSwap skifter mellem
|
||||
-- ture). -> true når det lykkedes (ellers kører varerne i hvert sit flow).
|
||||
local function staffCombined(adEnv, run, runId, bulkIndex, pool, used, verb)
|
||||
if pool.implements == nil then pool.implements, pool.tractors = collectPool(adEnv) end
|
||||
if pool.blocked == nil then pool.blocked = ADPool.blocked(ADFieldJobs.now or 0) end
|
||||
local pair = ADChainRun.choosePair(pool.implements, pool.tractors, bulkIndex, used, pool.blocked, false)
|
||||
if pair == nil then return false end
|
||||
local probe = {}
|
||||
for id in pairs(used) do probe[id] = true end
|
||||
probe[pair.implement.id], probe[pair.tractor.id] = true, true
|
||||
local spare = ADChainRun.chooseAutoloadWagon(pool.implements, probe, pool.blocked)
|
||||
if spare == nil then return false end
|
||||
used[spare.id] = true
|
||||
local started = startWithPair(adEnv, run, runId, pair, used, verb)
|
||||
local fresh = ADRuns.getRun(ADRunsController.store, runId)
|
||||
if started == 0 or fresh == nil then
|
||||
-- start afvist: traktoren slippes igen (review H2 — ellers holdt et dødt flow den)
|
||||
used[spare.id] = nil
|
||||
undoStaffing(adEnv, runId, pair)
|
||||
return false
|
||||
end
|
||||
local spares = ADRuns.copySpares(fresh.spareWagons)
|
||||
spares[pair.tractor.id] = {spare.id}
|
||||
fresh.spareWagons = spares
|
||||
log("flow '%s': '%s' skifter mellem '%s' og pallevognen '%s' (én traktor)", tostring(fresh.name), tostring(pair.tractor.name),
|
||||
tostring(pair.implement.name), tostring(spare.name))
|
||||
return true
|
||||
end
|
||||
|
||||
-- Nyt kombineret flow (løsvarer + paller, én traktor) til en bygning uden kædeflows. -> true når oprettet og bemandet.
|
||||
local function createCombinedFlow(adEnv, data, group, bulk, pallets, pool, used)
|
||||
local goods = {}
|
||||
for _, name in ipairs(bulk) do table.insert(goods, name) end
|
||||
for _, name in ipairs(pallets) do table.insert(goods, name) end
|
||||
local bulkIndex = data.fillIndex[bulk[1]]
|
||||
if bulkIndex == nil then return false end
|
||||
-- prøv først uden at oprette noget: findes traktor + tipvogn + pallevogn?
|
||||
if pool.implements == nil then pool.implements, pool.tractors = collectPool(adEnv) end
|
||||
if pool.blocked == nil then pool.blocked = ADPool.blocked(ADFieldJobs.now or 0) end
|
||||
local pair = ADChainRun.choosePair(pool.implements, pool.tractors, bulkIndex, used, pool.blocked, false)
|
||||
local probe = {}
|
||||
for id in pairs(used) do probe[id] = true end
|
||||
if pair ~= nil then probe[pair.implement.id], probe[pair.tractor.id] = true, true end
|
||||
if pair == nil or ADChainRun.chooseAutoloadWagon(pool.implements, probe, pool.blocked) == nil then return false end
|
||||
local created = ADRunsController.createRun(ADChain.flowName(flowTitle(data, goods), group.consumerName or group.consumer), "supply")
|
||||
ADRunsController.updateRun(created.id, {targetBuildingIds = {group.consumer}, ingredientMode = "manual", ingredients = goods,
|
||||
waitPoolGroup = ADChain.waitPoolFor(ADRunsController.store.runs, group.consumer), chain = group.rootKey})
|
||||
local run = ADRuns.getRun(ADRunsController.store, created.id)
|
||||
if staffCombined(adEnv, run, created.id, bulkIndex, pool, used, "oprettet med") then return true end
|
||||
-- start afvist: flowet bliver stående som tomt kædeflow (deles og bemandes senere)
|
||||
createStopped(ADRuns.getRun(ADRunsController.store, created.id), "noVehicle", "ingen ledig traktor + vogne til %s", tostring(created.name))
|
||||
return true
|
||||
end
|
||||
|
||||
local function createGroupFlow(adEnv, data, group, fillTypes, pool, used)
|
||||
local title = flowTitle(data, fillTypes)
|
||||
local created = ADRunsController.createRun(ADChain.flowName(title, group.consumerName or group.consumer), "supply")
|
||||
@@ -215,11 +286,25 @@ end
|
||||
function ADChainRun.splitMixedFlows(adEnv, data, active)
|
||||
local kindOf, isPalletName = kindOfFor(data)
|
||||
local split = 0
|
||||
local pool, used = nil, nil
|
||||
for _, run in ipairs(ADChain.runsView(ADRunsController.store.runs)) do
|
||||
if run.chain ~= nil and run.chain ~= "" and #(run.vehicleIds or {}) == 0 and (active or {})[run.chain]
|
||||
and kindOf(run) == "mixed" then
|
||||
local bulk, pallets = {}, {}
|
||||
local bulk, pallets = {}, {}
|
||||
local mixed = run.chain ~= nil and run.chain ~= "" and #(run.vehicleIds or {}) == 0 and (active or {})[run.chain]
|
||||
and kindOf(run) == "mixed"
|
||||
if mixed then
|
||||
for _, name in ipairs(run.ingredients or {}) do table.insert(isPalletName(name) and pallets or bulk, name) end
|
||||
-- først: én traktor med tipvogn + pallevogn (flowet beholder alle varer)
|
||||
pool = pool or {}
|
||||
used = used or {}
|
||||
local full = ADRuns.getRun(ADRunsController.store, run.id)
|
||||
if full ~= nil and data.fillIndex[bulk[1]] ~= nil and staffCombined(adEnv, full, run.id, data.fillIndex[bulk[1]], pool, used, "får traktor") then
|
||||
local fresh = ADRuns.getRun(ADRunsController.store, run.id)
|
||||
if fresh ~= nil then fresh.chainIdle = nil end
|
||||
mixed = false
|
||||
split = split + 1
|
||||
end
|
||||
end
|
||||
if mixed then
|
||||
ADRunsController.updateRun(run.id, {ingredients = bulk})
|
||||
local consumerName = tostring(run.name or ""):match("→%s*(.+)$") or tostring((run.targetBuildingIds or {})[1])
|
||||
local created = ADRunsController.createRun(ADChain.flowName(flowTitle(data, pallets), consumerName), "supply")
|
||||
@@ -298,7 +383,7 @@ end
|
||||
|
||||
-- Bemandingen lykkedes ikke (valideringen afviste traktor/vogn): traktoren slippes igen, flowet stoppes og venter
|
||||
-- (review: ellers holdt det traktor + vogn uden at køre og blev aldrig prøvet igen).
|
||||
local function undoStaffing(adEnv, runId, pair)
|
||||
undoStaffing = function(adEnv, runId, pair)
|
||||
pcall(ADRunsController.unassignVehicle, pair.tractor.vehicle)
|
||||
local run = ADRuns.getRun(ADRunsController.store, runId)
|
||||
if run ~= nil then
|
||||
@@ -306,6 +391,9 @@ local function undoStaffing(adEnv, runId, pair)
|
||||
local wagons = ADRuns.copyWagons(run.wagons)
|
||||
wagons[pair.tractor.id] = nil
|
||||
run.wagons = wagons
|
||||
local spares = ADRuns.copySpares(run.spareWagons)
|
||||
spares[pair.tractor.id] = nil
|
||||
run.spareWagons = spares
|
||||
end
|
||||
warn("flow '%s': '%s' + '%s' kunne ikke starte — prøver igen senere", tostring(run ~= nil and run.name or runId),
|
||||
tostring(pair.tractor.name), tostring(pair.implement.name))
|
||||
@@ -379,7 +467,14 @@ function ADChainRun.createFlows(adEnv, data, edges)
|
||||
end
|
||||
local kindOf = kindOfFor(data)
|
||||
local ok, err = pcall(function()
|
||||
-- løsvarer og paller i hvert sit flow (hver sin traktor + vogn)
|
||||
-- begge slags og intet kædeflow til bygningen endnu: helst ét flow med én traktor (tipvogn + pallevogn)
|
||||
if #bulk > 0 and #pallets > 0 and ADChainActions.chainRunFor(runs, group.consumer, "bulk", kindOf) == nil
|
||||
and ADChainActions.chainRunFor(runs, group.consumer, "pallet", kindOf) == nil
|
||||
and createCombinedFlow(adEnv, data, group, bulk, pallets, pool, used) then
|
||||
count = count + 1
|
||||
return
|
||||
end
|
||||
-- ellers løsvarer og paller i hvert sit flow (hver sin traktor + vogn)
|
||||
for _, part in ipairs({{kind = "bulk", goods = bulk}, {kind = "pallet", goods = pallets}}) do
|
||||
if #part.goods > 0 then
|
||||
local existing = ADChainActions.chainRunFor(runs, group.consumer, part.kind, kindOf)
|
||||
|
||||
Reference in New Issue
Block a user