Finish v1.20.4(251)

app/build.gradle

@@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 248
-    def appVersionName = '1.20.1'
+    def appVersionCode = 251
+    def appVersionName = '1.20.4'
 
     signingConfigs {
         release {

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)

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java

@@ -264,7 +264,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
 
         List<FilterChipDTO> filterList = Stream.of(OrdiniUscitaElencoBindings.AVAILABLE_FILTERS.entrySet()).map(Map.Entry::getValue).sortBy(FilterChipDTO::getPosizione).toList();
 
-        for (FilterChipDTO filterChipDTO : filterList){
+        for (FilterChipDTO filterChipDTO : filterList) {
 
             FilterChipView filterChipView = new FilterChipView(
                     requireActivity(),
@@ -697,28 +697,29 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
 
         //new Thread(() -> {
 
-//            requireActivity().runOnUiThread(() -> {
-                List<OrdiniUscitaElencoDTO> tmpList;
+        requireActivity().runOnUiThread(() -> {
+            List<OrdiniUscitaElencoDTO> tmpList;
 
-                if (filteredList != null) {
-                    tmpList = filteredList;
-                } else if (mAppliedFilterViewModel != null) {
-                    mAppliedFilterViewModel.applyAllTests();
-                    tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
-                } else {
-                    tmpList = mViewModel.getOrderList().getValue();
-                }
+            if (filteredList != null) {
+                tmpList = filteredList;
+            } else if (mAppliedFilterViewModel != null) {
+                mAppliedFilterViewModel.applyAllTests();
+                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
+            } else {
+                tmpList = mViewModel.getOrderList().getValue();
+            }
 
-                var list = convertDataModelToListModel(tmpList);
+            var list = convertDataModelToListModel(tmpList);
 
-                this.mOrdiniInevasiMutableData.clear();
-                this.mOrdiniInevasiMutableData.addAll(list);
+            this.mOrdiniInevasiMutableData.clear();
+            this.mOrdiniInevasiMutableData.addAll(list);
 
-                fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
-                        .anyMatch(y -> y.getSelectedObservable().get()));
-//            });
+            fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
+                    .anyMatch(y -> y.getSelectedObservable().get()));
 
             this.onLoadingEnded();
+        });
+
         //}).start();
 
     }
@@ -831,7 +832,6 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     }
 
 
-
     @Override
     public void addOnPreDestroy(Runnable onPreDestroy) {
         this.mOnPreDestroyList.add(onPreDestroy);

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().floatValue());
+
                     majorOrder.setQtaBigDecimal(majorOrder.getQtaBigDecimal().add(offsetCol));
+                    majorOrder.getOriginalOrdineLavorazione().setQtaColVersamento(majorOrder.getQtaBigDecimal().floatValue());
                 } else {
                     majorOrder.setQtaBigDecimal(majorOrder.getQtaBigDecimal().add(offsetCol));
+                    majorOrder.getOriginalOrdineLavorazione().setQtaColVersamento(majorOrder.getQtaBigDecimal().floatValue());
+
                     majorOrder.setNumCnfBigDecimal(UtilityBigDecimal.divide(majorOrder.getQtaBigDecimal(), qtaCnf));
+                    majorOrder.getOriginalOrdineLavorazione().setNumCnfVersamento(majorOrder.getNumCnfBigDecimal().floatValue());
                 }
             }
         }