Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Giuseppe Scorrano 2021-11-26 17:46:58 +01:00
commit d2f262a9b8

View File

@ -284,10 +284,16 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
if (offsetCnf.floatValue() != 0 || offsetCol.floatValue() != 0){
if ( SettingsManager.iDB().isFlagForceAllToColli() || (majorOrder.getOriginalMtbAart() != null && !majorOrder.getOriginalMtbAart().isFlagQtaCnfFissaBoolean())) {
majorOrder.setNumCnfBigDecimal(majorOrder.getNumCnfBigDecimal().add(offsetCnf));
majorOrder.getOriginalOrdineLavorazione().setNumCnfVersamento(majorOrder.getNumCnfBigDecimal().add(offsetCnf).floatValue());
majorOrder.setQtaBigDecimal(majorOrder.getQtaBigDecimal().add(offsetCol));
majorOrder.getOriginalOrdineLavorazione().setQtaColVersamento(majorOrder.getQtaBigDecimal().add(offsetCol).floatValue());
} else {
majorOrder.setQtaBigDecimal(majorOrder.getQtaBigDecimal().add(offsetCol));
majorOrder.getOriginalOrdineLavorazione().setQtaColVersamento(majorOrder.getQtaBigDecimal().add(offsetCol).floatValue());
majorOrder.setNumCnfBigDecimal(UtilityBigDecimal.divide(majorOrder.getQtaBigDecimal(), qtaCnf));
majorOrder.getOriginalOrdineLavorazione().setNumCnfVersamento(UtilityBigDecimal.divide(majorOrder.getQtaBigDecimal(), qtaCnf).floatValue());
}
}
}