From a18a755f0a8bef2b3b822d6455648e490d31379a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 12 Dec 2019 15:38:53 +0100 Subject: [PATCH] Prime modifiche --- .../core/settings/DBSettingsModel.java | 10 +++++++ .../core/settings/SettingsManager.java | 5 ++++ .../core/utility/UtilityBarcode.java | 2 +- .../core/VenditaOrdineInevasoHelper.java | 2 +- .../VenditaOrdineInevasoViewModel.java | 29 +++++++++++-------- 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java index 8cd781ee..ad60d10f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java @@ -26,6 +26,7 @@ public class DBSettingsModel { private boolean flagCanAutoOpenNewULAccettazione; private boolean flagCanAddExtraQuantitySpedizione; private boolean flagEnableCheckDepositoSpedizione; + private boolean flagForceAllToColli; public List getAvailableProfiles() { return availableProfiles; @@ -150,4 +151,13 @@ public class DBSettingsModel { this.flagEnableCheckDepositoSpedizione = flagEnableCheckDepositoSpedizione; return this; } + + public boolean isFlagForceAllToColli() { + return flagForceAllToColli; + } + + public DBSettingsModel setFlagForceAllToColli(boolean flagForceAllToColli) { + this.flagForceAllToColli = flagForceAllToColli; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index e4b4a43d..bf64b2a7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -218,6 +218,10 @@ public class SettingsManager { .setGestName("PICKING") .setSection("SPEDIZIONE") .setKeySection("ENABLE_CHECK_DEPOSITO")); + stbGestSetupList.add(new StbGestSetup() + .setGestName("PICKING") + .setSection("SETUP") + .setKeySection("FLAG_FORCE_ALL_TO_COLLI")); GestSetupRESTConsumer.getValues(stbGestSetupList, list -> { @@ -231,6 +235,7 @@ public class SettingsManager { dbSettingsModelIstance.setFlagCanAutoOpenNewULAccettazione(getValueFromList(list, "FLAG_AUTO_OPEN_NEW_UL", Boolean.class)); dbSettingsModelIstance.setFlagCanAddExtraQuantitySpedizione(getValueFromList(list, "FLAG_CAN_ADD_EXTRA_QUANTITY", Boolean.class)); dbSettingsModelIstance.setFlagEnableCheckDepositoSpedizione(getValueFromList(list, "ENABLE_CHECK_DEPOSITO", Boolean.class)); + dbSettingsModelIstance.setFlagForceAllToColli(getValueFromList(list, "FLAG_FORCE_ALL_TO_COLLI", Boolean.class)); if(onComplete != null) onComplete.run(); }, onFailed); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java index c87ce266..e6203668 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java @@ -50,7 +50,7 @@ public class UtilityBarcode { } public static boolean isEanPeso(BarcodeScanDTO barcodeScanDTO) { - return isEan13(barcodeScanDTO) && barcodeScanDTO.getStringValue().startsWith("2"); + return (isEtichetta128(barcodeScanDTO) || isEan13(barcodeScanDTO)) && barcodeScanDTO.getStringValue().startsWith("2"); } public static boolean isEan13(BarcodeScanDTO barcodeScanDTO) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java index 39273041..f560a325 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java @@ -77,7 +77,7 @@ public class VenditaOrdineInevasoHelper { if(tmpList.get(i).isHidden() == null || forceHiddenCheck) { PickingObjectDTO tmpItem = tmpList.get(i); - tmpItem.setHidden(tmpItem.getQtaCollo().floatValue() < 0); + tmpItem.setHidden(tmpItem.getQtaCollo().compareTo(BigDecimal.ZERO) <= 0 || (!tmpItem.getMtbAart().isFlagQtaCnfFissa() && tmpItem.getNumCnfCollo().compareTo(BigDecimal.ZERO) <= 0)); tmpItem.setTempHidden(false); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index aea24f2c..67c7861e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -357,18 +357,18 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO //invece se esiste apro un collo nuovo e cerco gli articoli presenti nell'ul //dell'etichetta anonima this.executeEtichettaAnonimaNotOpenedLU(data, progressDialog); - } else if(UtilityBarcode.isEtichetta128(data)) { - - //Creo una nuova ul e cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL) - this.createNewUL(null, null, progressDialog, false, false, () -> { - this.executeEtichettaEan128(data, progressDialog); - }); } else if(UtilityBarcode.isEanPeso(data)) { //Creo una nuova ul e cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL) this.createNewUL(null, null, progressDialog, false, false, () -> { this.executeEtichettaEanPeso(data, progressDialog); }); + } else if(UtilityBarcode.isEtichetta128(data)) { + + //Creo una nuova ul e cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL) + this.createNewUL(null, null, progressDialog, false, false, () -> { + this.executeEtichettaEan128(data, progressDialog); + }); } else { this.createNewUL(null, null, progressDialog, false, false, () -> { this.loadArticolo(data.getStringValue(), null, progressDialog); @@ -380,16 +380,16 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO this.executeEtichettaLU(data.getStringValue(), progressDialog); - } else if(UtilityBarcode.isEtichetta128(data)) { - //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL) - this.executeEtichettaEan128(data, progressDialog); - - } else if(UtilityBarcode.isEanPeso(data)) { //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL) this.executeEtichettaEanPeso(data, progressDialog); + } else if(UtilityBarcode.isEtichetta128(data)) { + //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL) + this.executeEtichettaEan128(data, progressDialog); + + } else if(UtilityBarcode.isEtichettaPosizione(data)) { //Cerco l'UL presente all'interno della posizione this.executeEtichettaPosizione(data.getStringValue(), progressDialog); @@ -1045,6 +1045,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO public void onOrdineRowDispatch(final PickingObjectDTO item) { if(mArticoliInColloBottomSheetViewModel.mtbColt.get() != null){ + List currentMtbColrs = mArticoliInColloBottomSheetViewModel.mtbColt.get().getMtbColr(); List filteredMtbColrs = Stream.of(currentMtbColrs).filter( @@ -1115,6 +1116,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO if(item.getTempPickData() != null) { PickingObjectDTO.PickData tmpPickData = item.getTempPickData(); + boolean isTakenFromUL = tmpPickData.getSourceMtbColt() != null; + if(tmpPickData.getMtbPartitaMag() != null) { if (!UtilityString.isNullOrEmpty(tmpPickData.getMtbPartitaMag().getPartitaMag())) { @@ -1132,10 +1135,12 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO boolean useQtaDaEvadere = false; if(tmpPickData.getQtaTot() != null) { - useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissa(); + useQtaDaEvadere = isTakenFromUL || (qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissa()); if (useQtaDaEvadere) { dto.setQtaTot(qtaDaEvadere); dto.setMaxQta(qtaDaEvadere); + + //Aggiungere calcolo } else { dto.setQtaTot(tmpPickData.getQtaTot()); dto.setMaxQta(tmpPickData.getQtaTot());