Corretto calcolo delle qta_cnf

This commit is contained in:
Giuseppe Scorrano 2019-12-12 17:42:46 +01:00
parent a18a755f0a
commit eb87785fca

View File

@ -1116,6 +1116,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
if(item.getTempPickData() != null) { if(item.getTempPickData() != null) {
PickingObjectDTO.PickData tmpPickData = item.getTempPickData(); PickingObjectDTO.PickData tmpPickData = item.getTempPickData();
if(tmpPickData.getQtaCnf() == null && tmpPickData.getNumCnf() != null && tmpPickData.getQtaTot() != null) {
tmpPickData.setQtaCnf(tmpPickData.getQtaTot().divide(tmpPickData.getNumCnf(), 3, RoundingMode.HALF_EVEN));
}
boolean isTakenFromUL = tmpPickData.getSourceMtbColt() != null; boolean isTakenFromUL = tmpPickData.getSourceMtbColt() != null;
if(tmpPickData.getMtbPartitaMag() != null) { if(tmpPickData.getMtbPartitaMag() != null) {
@ -1140,13 +1144,16 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
dto.setQtaTot(qtaDaEvadere); dto.setQtaTot(qtaDaEvadere);
dto.setMaxQta(qtaDaEvadere); dto.setMaxQta(qtaDaEvadere);
//Aggiungere calcolo if(isTakenFromUL) {
dto.setNumCnf(qtaDaEvadere.divide(tmpPickData.getQtaCnf(), 0, RoundingMode.HALF_UP).intValue());
}
} else { } else {
dto.setQtaTot(tmpPickData.getQtaTot()); dto.setQtaTot(tmpPickData.getQtaTot());
dto.setMaxQta(tmpPickData.getQtaTot()); dto.setMaxQta(tmpPickData.getQtaTot());
if(tmpPickData.getNumCnf() != null) { if(tmpPickData.getNumCnf() != null) {
dto.setQtaCnf(tmpPickData.getQtaTot().divide(tmpPickData.getNumCnf())); dto.setQtaCnf(tmpPickData.getQtaTot().divide(tmpPickData.getNumCnf(), 3, RoundingMode.HALF_UP));
} else { } else {
dto.setQtaCnf(tmpPickData.getQtaTot()); dto.setQtaCnf(tmpPickData.getQtaTot());
} }