diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java index 90a58958..177a0c9b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java @@ -93,7 +93,8 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { && (!UtilityString.isNullOrEmpty(x.getPartitaMag()) && x.getPartitaMag().equalsIgnoreCase(mtbColr.getPartitaMag()))) .findFirst(); - if (optionalMtbPartitaMag.isPresent()) mtbColr.setMtbPartitaMag(optionalMtbPartitaMag.get()); + if (optionalMtbPartitaMag.isPresent()) + mtbColr.setMtbPartitaMag(optionalMtbPartitaMag.get()); } } } @@ -182,13 +183,13 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { } String baseSql = "SELECT DISTINCT mtb_colt.* " + - "FROM mtb_colt, " + - " mtb_colr " + - "WHERE mtb_colt.gestione = mtb_colr.gestione " + - " AND mtb_colt.ser_collo = mtb_colr.ser_collo " + - " AND mtb_colt.data_collo = mtb_colr.data_collo " + - " AND mtb_colt.num_collo = mtb_colr.num_collo " + - " AND " + whereCondGestione + + "FROM mtb_colt " + + " INNER JOIN mtb_colr ON " + + " mtb_colt.gestione = mtb_colr.gestione " + + " AND mtb_colt.ser_collo = mtb_colr.ser_collo " + + " AND mtb_colt.data_collo = mtb_colr.data_collo " + + " AND mtb_colt.num_collo = mtb_colr.num_collo " + + " WHERE " + whereCondGestione + " AND mtb_colt.segno = " + UtilityDB.valueToString(segno) + " " + " AND mtb_colt.data_doc IS NULL AND "; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index 85209507..0ea058d8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -78,7 +78,7 @@ public class SpedizioneViewModel { private GestioneEnum mDefaultGestioneOfUL = null; private int mDefaultSegnoCol = -1; private String mDefaultCodMdep = null; - private List mDefaultFiltroOrdine = new ArrayList<>(); + private final List mDefaultFiltroOrdine = new ArrayList<>(); private String mDefaultCodAnagOfUL = null; private String mDefaultRagSocOfUL = null; private String mDefaultRifOrdOfUL = null; @@ -1749,13 +1749,17 @@ public class SpedizioneViewModel { public void recoverLU(MtbColt mtbColt) { + this.sendOnLoadingStarted(); this.mCurrentMtbColt = mtbColt; mMtbColtSessionID = this.mColliDataRecoverService.startNewSession(mtbColt, mTestateOrdini); this.mCurrentMtbColt.generaFiltroOrdineFromDTO(mDefaultFiltroOrdine); - this.resetMatchedRows(); - this.sendLUOpened(this.mCurrentMtbColt); + this.mColliMagazzinoRESTConsumer.saveCollo(this.mCurrentMtbColt, savedMtbColt -> { + this.resetMatchedRows(); + this.sendLUOpened(this.mCurrentMtbColt); + this.sendOnLoadingEnded(); + }, this::sendError); } private void postCloseOperations(List mtbColtList) {