avatic/lcc_tool
avatic/lcc_tool
1
0
Fork 0
Code Issues 31 Pull requests 5 Projects Releases Packages Wiki Activity Actions

Bugfix shippingfrequency

Browse source
This commit is contained in:
Jan 2026-01-05 14:10:56 +01:00
parent d606e3e33a
commit eb5aecb1b5
2 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/de/avatic/lcc/service/calculation/execution/CalculationExecutionService.java
View file

@ -213,7 +213,10 @@ public class CalculationExecutionService {
destinationCalculationJob.setHuCount(sections.getFirst().containerResult().getHuUnitCount()); destinationCalculationJob.setHuCount(sections.getFirst().containerResult().getHuUnitCount());
destinationCalculationJob.setAnnualAmount(BigDecimal.valueOf(destination.getAnnualAmount())); destinationCalculationJob.setAnnualAmount(BigDecimal.valueOf(destination.getAnnualAmount()));
destinationCalculationJob.setShippingFrequency(shippingFrequencyCalculationService.doCalculation(setId, destination.getAnnualAmount(), selectedContainerCalculation.getHuPerContainer(),!premise.getHuMixable()));
double huAnnualAmount = BigDecimal.valueOf(destination.getAnnualAmount()).divide(BigDecimal.valueOf(premise.getHuUnitCount()),4, RoundingMode.UP ).doubleValue();
destinationCalculationJob.setShippingFrequency(Double.valueOf(shippingFrequencyCalculationService.doCalculation(setId, huAnnualAmount, selectedContainerCalculation.getHuPerContainer(),!premise.getHuMixable())).intValue());
var commonCost = destinationCalculationJob.getAnnualHandlingCost() var commonCost = destinationCalculationJob.getAnnualHandlingCost()
.add(destinationCalculationJob.getAnnualDisposalCost()) .add(destinationCalculationJob.getAnnualDisposalCost())

19
src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java
View file

@ -13,23 +13,6 @@ public class ShippingFrequencyCalculationService {
this.propertyRepository = propertyRepository; this.propertyRepository = propertyRepository;
} }
public int doCalculation(Integer setId, int huAnnualAmount, int maxHuPerContainer, boolean fillContainer) {
var minAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MIN, setId).orElseThrow().getCurrentValue());
var maxAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MAX, setId).orElseThrow().getCurrentValue());
var fullContainers = huAnnualAmount / maxHuPerContainer;
if(fillContainer && huAnnualAmount > maxAnnualFrequency)
return fullContainers;
if (huAnnualAmount > maxAnnualFrequency)
return maxAnnualFrequency;
return Math.max(huAnnualAmount, minAnnualFrequency);
}
public double doCalculation(Integer setId, double huAnnualAmount, int maxHuPerContainer, boolean fillContainer) { public double doCalculation(Integer setId, double huAnnualAmount, int maxHuPerContainer, boolean fillContainer) {
int minAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MIN, setId).orElseThrow().getCurrentValue()); int minAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MIN, setId).orElseThrow().getCurrentValue());
int maxAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MAX, setId).orElseThrow().getCurrentValue()); int maxAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MAX, setId).orElseThrow().getCurrentValue());
@ -42,7 +25,7 @@ public class ShippingFrequencyCalculationService {
if (huAnnualAmount > (double) maxAnnualFrequency) if (huAnnualAmount > (double) maxAnnualFrequency)
return maxAnnualFrequency; return maxAnnualFrequency;
return Math.max(huAnnualAmount, (double) minAnnualFrequency); return Math.max(huAnnualAmount, minAnnualFrequency);
} }