From cfbb27a67b6620f8c314727a0ac926fc105bc4d8 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 3 Apr 2023 18:03:23 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Abilitato=20controllo=20del=20num=5Fcnf=20s?= =?UTF-8?q?olo=20se=20l'articolo=20non=20=C3=A8=20a=20qta=5Fcnf=20fissa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../input_quantity_v2/DialogInputQuantityV2ViewModel.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java index 9fab765f..b30cf2a6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java @@ -483,7 +483,8 @@ public class DialogInputQuantityV2ViewModel { return false; } - if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfOrd)) { + if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfOrd) && + !this.mtbAart.get().isFlagQtaCnfFissaBoolean()) { this.mListener.onError(new OverflowNumCnfOrderedQuantityException()); return false; @@ -495,7 +496,8 @@ public class DialogInputQuantityV2ViewModel { return false; } - if (UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfAvailable)) { + if (UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfAvailable) && + !this.mtbAart.get().isFlagQtaCnfFissaBoolean()) { this.mListener.onError(new OverflowNumCnfAvailableQuantityException()); return false; From c6bbde2b6742c2459c65576c7f8fd8754b044af5 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 4 Apr 2023 10:35:57 +0200 Subject: [PATCH 2/3] Implementato in Rettifica Giacenze il controllo della setup che determina la creazione dei documenti in Spedizione --- .../core/settings/DBSettingsModel.java | 10 +++++ .../core/settings/SettingsManager.java | 5 +++ .../RettificaGiacenzeFragment.java | 3 +- .../RettificaGiacenzeViewModel.java | 40 ++----------------- 4 files changed, 21 insertions(+), 37 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 360bf8bf..09204f60 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 @@ -58,6 +58,7 @@ public class DBSettingsModel { private boolean flagCanAddUnknownItemsInventario = true; private boolean flagShouldAskToCreateOrUpdateRowInventario = false; private String commessaMagazzino; + private boolean flagGeneraDocumentoSpedizione = false; public boolean isFlagSpedizioneEnableFakeGiacenza() { return flagSpedizioneEnableFakeGiacenza; @@ -446,4 +447,13 @@ public class DBSettingsModel { this.commessaMagazzino = commessaMagazzino; return this; } + + public boolean isFlagGeneraDocumentoSpedizione() { + return flagGeneraDocumentoSpedizione; + } + + public DBSettingsModel setFlagGeneraDocumentoSpedizione(boolean flagGeneraDocumentoSpedizione) { + this.flagGeneraDocumentoSpedizione = flagGeneraDocumentoSpedizione; + 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 d8e40df3..49055621 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 @@ -372,6 +372,10 @@ public class SettingsManager { .setGestName("PICKING") .setSection("SETUP") .setKeySection("COMMESSA_MAGAZZINO")); + stbGestSetupList.add(new StbGestSetup() + .setGestName("PICKING") + .setSection("SPEDIZIONE") + .setKeySection("GENERA_DOC")); String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); mGestSetupRESTConsumer.getValues(codMdep, stbGestSetupList, list -> { @@ -409,6 +413,7 @@ public class SettingsManager { dbSettingsModelIstance.setFlagCanAddUnknownItemsInventario(getValueFromList(list, "INVENTARIO", "FLAG_CAN_ADD_UNKNOWN_ITEMS", Boolean.class, Boolean.TRUE)); dbSettingsModelIstance.setFlagShouldAskToCreateOrUpdateRowInventario(getValueFromList(list, "INVENTARIO", "FLAG_SHOULD_ASK_TO_CREATE_OR_UPDATE_ROW", Boolean.class, Boolean.FALSE)); dbSettingsModelIstance.setCommessaMagazzino(getValueFromList(list, "SETUP", "COMMESSA_MAGAZZINO", String.class, CommonConst.Config.COMMESSA_MAG)); + dbSettingsModelIstance.setFlagGeneraDocumentoSpedizione(getValueFromList(list, "SPEDIZIONE", "GENERA_DOC", Boolean.class, Boolean.FALSE)); String notePerdita = getValueFromList(list, "DOC_INTERNI", "NOTE_PERDITA", String.class); if (notePerdita != null) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java index 8470117d..a749d2e9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java @@ -217,7 +217,8 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr mViewModel.init( SettingsManager.i().getUser().getFullname(), SettingsManager.i().getUserSession().getDepo().getCodMdep(), - mCurrentGestione); + mCurrentGestione, + SettingsManager.iDB().isFlagGeneraDocumentoSpedizione()); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index 11f3e4fb..4f91e780 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -57,6 +57,7 @@ public class RettificaGiacenzeViewModel { private String mCurrentUser; private String mCurrentCodMdep; private boolean mIsCreatedLU; + private boolean generaDocIfVendita; private boolean mAnyEditDone = false; @@ -74,10 +75,11 @@ public class RettificaGiacenzeViewModel { } - public void init(String currentUser, String currentCodMdep, GestioneEnum defaultGestione) { + public void init(String currentUser, String currentCodMdep, GestioneEnum defaultGestione, boolean generaDocIfVendita) { this.mCurrentUser = currentUser; this.mCurrentCodMdep = currentCodMdep; this.mDefaultGestione = defaultGestione; + this.generaDocIfVendita = generaDocIfVendita; this.sendOnLoadingStarted(); @@ -352,7 +354,6 @@ public class RettificaGiacenzeViewModel { mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); -// if (!mIsCreatedLU && mCurrentMtbColt.isDocumentPresent()) { mtbColr .setQtaCol(BigDecimal.ZERO) .setNumCnf(BigDecimal.ZERO) @@ -382,39 +383,6 @@ public class RettificaGiacenzeViewModel { if (shouldCloseLU) closeLU(true, null); }, this::sendError); -// } else { -// mtbColr -// .setQtaCol(qtaTot) -// .setQtaCnf(qtaCnf) -// .setNumCnf(numCnf); -// -// MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone(); -// cloneMtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP); -// -// cloneMtbColt.setMtbColr(new ObservableArrayList<>()); -// -// cloneMtbColt.getMtbColr().add(mtbColr); -// -// mColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, value -> { -// mtbColr -// .setDataCollo(value.getDataColloS()) -// .setNumCollo(value.getNumCollo()) -// .setGestione(value.getGestione()) -// .setSerCollo(value.getSerCollo()) -// .setRiga(value.getMtbColr().get(0).getRiga()) -// .setUntMis(pickingObjectDTO.getMtbAart().getUntMis()) -// .setMtbAart(pickingObjectDTO.getMtbAart()); -// -// mCurrentMtbColt.getMtbColr().add(mtbColr); -// -// this.mAnyEditDone = true; -// -// this.sendOnRowSaved(); -// this.sendOnLoadingEnded(); -// -// if (shouldCloseLU) closeLU(true, null); -// }, this::sendError); -// } } @@ -482,7 +450,7 @@ public class RettificaGiacenzeViewModel { } private void createDoc(MtbColt mtbColt, Runnable onComplete) { - if (!(mtbColt.getGestioneEnum() == GestioneEnum.VENDITA && mtbColt.getSegno() == -1)) { + if (!(mtbColt.getGestioneEnum() == GestioneEnum.VENDITA && mtbColt.getSegno() == -1) || !generaDocIfVendita) { onComplete.run(); return; } From b02e12d76e566682f38c24d87a0d73ba4fad205e Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 4 Apr 2023 10:36:46 +0200 Subject: [PATCH 3/3] -> v1.32.28 (368) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 27e7f5ee..3f99e774 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 367 - def appVersionName = '1.32.27' + def appVersionCode = 368 + def appVersionName = '1.32.28' signingConfigs { release {