diff --git a/ems-engine/src/main/java/it/integry/ems/production/service/OrtoFruttaProductionService.java b/ems-engine/src/main/java/it/integry/ems/production/service/OrtoFruttaProductionService.java index b7c3b292fe..5e6bce5d8d 100644 --- a/ems-engine/src/main/java/it/integry/ems/production/service/OrtoFruttaProductionService.java +++ b/ems-engine/src/main/java/it/integry/ems/production/service/OrtoFruttaProductionService.java @@ -378,7 +378,7 @@ public class OrtoFruttaProductionService { //alla creazione della bolla (DDT) creare documento di acquisto e scarico di materiale alla pianta - if (!UtilityBigDecimal.isNullOrZero(dto.getQtaCol()) && !UtilityBigDecimal.isNullOrZero(dto.getValUnt())) { + if (!UtilityBigDecimal.isNullOrZero(dto.getQtaCol()) && !UtilityBigDecimal.isNullOrZero(dto.getPrezzoFinale())) { DtbOrdt ordAcq = getOrdineAcquistoCollegato(dto.getGestione(), UtilityLocalDate.localDateToDate(dto.getDataOrd()), dto.getNumOrd()); DtbDoct ddt = generaDdtAcq(dto, ordAcq, activityId); DtbDoct slav = generaScaricoLav(dto, ordAcq, activityId); @@ -478,7 +478,7 @@ public class OrtoFruttaProductionService { .setQtaDoc(qtaDoc) .setNumCnf(numCnf) .setQtaCnf(qtaCnf) - .setValUnt(dto.getValUnt()) + .setValUnt(UtilityBigDecimal.isNullOrZero(dto.getValUnt(),dto.getPrezzoContratto())) .setSconto5(dto.getIndiceVariazione().negate()) .setOperation(OperationType.INSERT); @@ -547,7 +547,7 @@ public class OrtoFruttaProductionService { .setNumCnf(dto.getNumCnf()) .setQtaCnf(qtaCnf) .setPesoLordo(dto.getPesoLordoPedane()) - .setValUnt(dto.getValUnt()) + .setValUnt(UtilityBigDecimal.isNullOrZero(dto.getValUnt(),dto.getPrezzoContratto())) .setSconto5(dto.getIndiceVariazione().negate()) .setOperation(OperationType.INSERT); ddt.getDtbDocr().add(rowPlus); @@ -565,7 +565,7 @@ public class OrtoFruttaProductionService { .setNumCnf(numCnf.negate()) .setQtaCnf(qtaCnf) .setPesoLordo(dto.getPesoLordoPedane()) - .setValUnt(dto.getValUnt()) + .setValUnt(UtilityBigDecimal.isNullOrZero(dto.getValUnt(),dto.getPrezzoContratto())) .setSconto5(dto.getIndiceVariazione().negate()) .setNote("SCARTO: " + dto.getTassoRiduzione() + "%") .setOperation(OperationType.INSERT);