From e837132996a56ed0509220abaf223274d482a099 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Fri, 26 Nov 2021 17:46:33 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Corretta=20aggiunta=20quantit=C3=A0=20di=20?= =?UTF-8?q?scarto=20sull'ordine=20maggiore=20in=20versamento=20merce=20a?= =?UTF-8?q?=20produzione=20(frudis)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProdVersamentoMaterialeFragment.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java index d6b16d1f..57b7fc00 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java @@ -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()); } } } From 1fc78d053b0d69951719e8c2afe0f4c901c5020b Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 26 Nov 2021 17:46:55 +0100 Subject: [PATCH 2/3] Aggiunto codice menu su Rientro merce --- .../core/class_router/configs/MenuConfiguration.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java index 8ff17235..d446996f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java @@ -9,6 +9,7 @@ import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment; import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment; import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdFragment; import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment; +import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceFragment; import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment; import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaFragment; import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment; @@ -124,6 +125,14 @@ public class MenuConfiguration extends BaseMenuConfiguration { .setTitleIcon(R.drawable.ic_dashboard_prod_recupero_materiale) .setDrawerIcon(R.drawable.ic_black_external) .setFragmentFactory(ProdRecuperoMaterialeFragment::newInstance)) + + .addItem(new MenuItem() + .setID(it.integry.integrywmsnative.R.id.nav_prod_rientro_merce) + .setCodMenu("MG059") + .setTitleText(it.integry.integrywmsnative.R.string.rientro_merce_fragment_title) + .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_accettazione_produzione) + .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external) + .setFragmentFactory(ProdRientroMerceFragment::newInstance)) ).addGroup( new MenuGroup() .setGroupText(R.string.internal_handling) From 5215d43bf4f356f4cf7dd6d6d19f2fe8e51fc9d8 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 26 Nov 2021 17:47:51 +0100 Subject: [PATCH 3/3] -> v1.20.3 (250) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7452a357..83a0e555 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 249 - def appVersionName = '1.20.2' + def appVersionCode = 250 + def appVersionName = '1.20.3' signingConfigs { release {