fix: autoload-køretøjer måles i paller, ikke liter — en tom pallebil er ikke 'ingen vogn' (v1.12.8.0)
This commit is contained in:
@@ -260,6 +260,8 @@ end
|
||||
|
||||
-- ---- validering ----
|
||||
|
||||
-- Liter-kapacitet for vognen; nil uden vogn. Universal Autoload opgiver ikke liter men ANTAL paller
|
||||
-- (læssede + 1), så et autoload-køretøj får nil her og markeres via isAutoload i valideringen.
|
||||
local function getLoadCapacity(adEnv, vehicle)
|
||||
local trailers = adEnv.AutoDrive.getAllUnits(vehicle)
|
||||
if trailers == nil then
|
||||
@@ -402,7 +404,7 @@ local function validateOutboundVehicle(adEnv, run, vehicle, result)
|
||||
result.reason = "noSource"
|
||||
return result
|
||||
end
|
||||
if result.capacity == nil then
|
||||
if result.capacity == nil and not result.isAutoload then
|
||||
result.reason = "noTrailer"
|
||||
return result
|
||||
end
|
||||
@@ -458,7 +460,7 @@ end
|
||||
-- udkørsel desuden "noSource" | "noProducts" | "needsAutoload".
|
||||
function ADRunsController.validateVehicle(adEnv, run, vehicle)
|
||||
local carriable = ADRunsController.getCarriableFillTypes(adEnv, vehicle)
|
||||
local result = {ok = false, carriable = carriable, capacity = getLoadCapacity(adEnv, vehicle)}
|
||||
local result = {ok = false, carriable = carriable, capacity = getLoadCapacity(adEnv, vehicle), isAutoload = hasAutoload(adEnv, vehicle)}
|
||||
if run.kind == "outbound" then
|
||||
return validateOutboundVehicle(adEnv, run, vehicle, result)
|
||||
end
|
||||
@@ -472,7 +474,8 @@ function ADRunsController.validateVehicle(adEnv, run, vehicle)
|
||||
result.reason = "noTarget"
|
||||
return result
|
||||
end
|
||||
if result.capacity == nil then
|
||||
-- en pallebil har ingen liter-kapacitet, men er ikke "uden vogn" — den falder på cannotCarry nedenfor
|
||||
if result.capacity == nil and not result.isAutoload then
|
||||
result.reason = "noTrailer"
|
||||
return result
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user