diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java index e9bd6875..31fb8720 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java @@ -333,13 +333,13 @@ public class AccettazioneBollaPickingViewModel { pickingObjectDTO.setTempPickData(pickData); } - this.loadMatchedRows(matchPickingObject, mtbAart); + this.loadMatchedRows(matchPickingObject, mtbAart, pickData); onComplete.run(); } - private void loadMatchedRows(List matchedRows, MtbAart mtbAart) { + private void loadMatchedRows(List matchedRows, MtbAart mtbAart, PickDataDTO pickDataDTO) { if (matchedRows == null || matchedRows.size() == 0) { - manageNoArtFound(mtbAart); + manageNoArtFound(mtbAart, pickDataDTO); } else if (matchedRows.size() == 1) { this.manageDispatchBollaRow(matchedRows.get(0)); } else { @@ -375,11 +375,12 @@ public class AccettazioneBollaPickingViewModel { } - private void manageNoArtFound(MtbAart mtbAart) { + private void manageNoArtFound(MtbAart mtbAart, PickDataDTO pickDataDTO) { if (SettingsManager.iDB().isFlagCanAddUnknownItemsAccettazioneBolla()) { this.manageDispatchBollaRow(new PickingObjectDTO() - .setMtbAart(mtbAart)); + .setMtbAart(mtbAart) + .setTempPickData(pickDataDTO)); } else this.sendError(new NoArtsFoundException()); } @@ -418,12 +419,21 @@ public class AccettazioneBollaPickingViewModel { } public void manageDispatchBollaRow(final PickingObjectDTO pickingObjectDTO) { + String partitaMag = null; + if(pickingObjectDTO.getTempPickData() != null){ + if(pickingObjectDTO.getTempPickData().getManualPickDTO() != null){ + if(pickingObjectDTO.getTempPickData().getManualPickDTO().getMtbPartitaMag() != null){ + partitaMag = pickingObjectDTO.getTempPickData().getManualPickDTO().getMtbPartitaMag().getPartitaMag(); + } + } + } + if (SettingsManager.iDB().isFlagEnableFastPickAccettazioneBolla()) { this.saveNewRow(pickingObjectDTO, BigDecimal.ONE, pickingObjectDTO.getMtbAart().getQtaCnf(), pickingObjectDTO.getMtbAart().getQtaCnf(), - null, + partitaMag, null, false);