Finish v1.33.05(376)

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 374
+    def appVersionCode = 376
-    def appVersionName = '1.33.03'
+    def appVersionName = '1.33.05'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/core/exception/GridNotSelectedException.java

@@ -0,0 +1,12 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public class GridNotSelectedException extends Exception {
+
+    public GridNotSelectedException() {
+        super(UtilityResources.getString(R.string.grid_not_selected));
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java

@@ -63,7 +63,7 @@ public class RESTBuilder {
 
         OkHttpClient client = clientBuilder.build();
 
-        String endpoint = protocol + "://" + host + ":" + port + "/" + (addEmsApi ? "ems-api/" : "");
+        String endpoint = protocol + "://" + host + (port > 0 ? ":" + port : "") + "/" + (addEmsApi ? "ems-api/" : "");
 
 
         Gson gson = new GsonBuilder()

app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java

@@ -39,6 +39,7 @@ public class DBSettingsModel {
     private boolean flagOrdinaNuoviArticoliInGriglia;
     private boolean flagOrdinaArticoliOnScan;
     private boolean flagConsentiFuoriPianoLogistico;
+    private boolean flagConsentiOrdineSenzaGriglia;
     private String docInterniCheckFornitore;
     private String produzioneDefaultCodAnag;
     private boolean flagPrintPackingListOnOrderClose;
@@ -449,6 +450,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public boolean isFlagConsentiOrdineSenzaGriglia() {
+        return flagConsentiOrdineSenzaGriglia;
+    }
+
+    public DBSettingsModel setFlagConsentiOrdineSenzaGriglia(boolean flagConsentiOrdineSenzaGriglia) {
+        this.flagConsentiOrdineSenzaGriglia = flagConsentiOrdineSenzaGriglia;
+        return this;
+    }
+
     public String getCommessaMagazzino() {
         return commessaMagazzino;
     }

app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java

@@ -312,6 +312,10 @@ public class SettingsManager {
                 .setGestName("PVM")
                 .setSection("ORDINI_A")
                 .setKeySection("FLAG_CONSENTI_ORIDNE_DA_GRIGLIA"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PVM")
+                .setSection("ORDINI_A")
+                .setKeySection("FLAG_CONSENTI_ORIDNE_SENZA_GRIGLIA"));
         stbGestSetupList.add(new StbGestSetup()
                 .setGestName("PVM")
                 .setSection("DOC_INTERNI")
@@ -405,6 +409,7 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagPickLiberoAllowEmptyDest(getValueFromList(list, "PICKING_LIBERO", "FLAG_ALLOW_EMPTY_DEST", Boolean.class));
             dbSettingsModelIstance.setFlagOrdinaArticoliOnScan(getValueFromList(list, "ORDINI_A", "ORDINA_ARTICOLI_ON_SCAN", Boolean.class));
             dbSettingsModelIstance.setFlagConsentiFuoriPianoLogistico(getValueFromList(list, "ORDINI_A", "FLAG_CONSENTI_ORIDNE_DA_GRIGLIA", Boolean.class));
+            dbSettingsModelIstance.setFlagConsentiOrdineSenzaGriglia(getValueFromList(list, "ORDINI_A", "FLAG_CONSENTI_ORIDNE_SENZA_GRIGLIA", Boolean.class));
             dbSettingsModelIstance.setFlagPrintPackingListOnOrderClose(getValueFromList(list, "SPEDIZIONE", "FLAG_PRINT_PACKING_LIST_ON_CLOSE", Boolean.class));
             dbSettingsModelIstance.setFlagPrintEtichetteOnOrderClose(getValueFromList(list, "SPEDIZIONE", "FLAG_PRINT_ETICHETTE_ON_CLOSE", Boolean.class));
             dbSettingsModelIstance.setFlagPrintEtichetteOnLUClose(getValueFromList(list, "SPEDIZIONE", "FLAG_PRINT_ETICHETTE_ON_LU_CLOSE", Boolean.class, true));

app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java

@@ -27,9 +27,11 @@ public class UpdatesManager {
     public void init(AppCompatActivity activityContext) {
         this.mContext = activityContext;
 
+        final String baseEndpoint = SettingsManager.i().getServer().getProtocol() + "://" + SettingsManager.i().getServer().getHost() +
+                (SettingsManager.i().getServer().getPort() > 0 ? ":" + SettingsManager.i().getServer().getPort() : "");
 
-        String currentVersionUrl = SettingsManager.i().getServer().getProtocol() + "://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/currentVersion";
+        final String currentVersionUrl = baseEndpoint + "/ems-api/wms/currentVersion";
-        String currentDownloadUrl = SettingsManager.i().getServer().getProtocol() + "://" + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + "/ems-api/wms/android-release.apk";
+        final String currentDownloadUrl = baseEndpoint + "/ems-api/wms/android-release.apk";
 
 
         AppUpdater appUpdater = new AppUpdater(mContext)

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityServer.java

@@ -41,9 +41,15 @@ public class UtilityServer {
     public static void isEmsApiAvailable(final String protocol, final String serverAddress, final int serverTCPport, final Runnable onComplete, final RunnableArgs<Exception> onFailed) {
         new Thread(() -> {
 
+            String url = null;
+
+            if(serverTCPport > 0)
+                url = String.format("%s://%s:%d/ems-api/system/ok", protocol, serverAddress, serverTCPport);
+            else
+                url = String.format("%s://%s/ems-api/system/ok", protocol, serverAddress);
 
             Request request = new Request.Builder()
-                    .url(String.format("%s://%s:%d/ems-api/system/ok", protocol, serverAddress, serverTCPport))
+                    .url(url)
                     .build();
 
             try {

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java

@@ -195,7 +195,7 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi
                         Toast.makeText(this, "Articolo aggiunto all'ordine!", Toast.LENGTH_SHORT).show();
                     }
                     this.mViewModel.refreshListArticoli(onSuccess);
-                }, null).show(this.getSupportFragmentManager(), "DialogEditArticoloView");
+                }, this::onLoadingEnded).show(this.getSupportFragmentManager(), "DialogEditArticoloView");
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/edit_articolo/DialogEditArticoloView.java

@@ -85,7 +85,7 @@ public class DialogEditArticoloView extends BaseDialogFragment implements Dialog
         this.mViewModel
                 .setListener(this)
                 .setCurrentArticolo(this.mArticolo)
-                .setInitialQtaCnf(BigDecimal.valueOf(mArticolo.getQtaCnf()))
+                .setInitialQtaCnf(BigDecimal.valueOf(mArticolo.getQtaCnf()).setScale(5, RoundingMode.HALF_UP))
                 .setInitialNumCnf(UtilityBigDecimal.divide(BigDecimal.valueOf(mArticolo.getQtaOrd()), BigDecimal.valueOf(mArticolo.getQtaCnf())).setScale(0, RoundingMode.CEILING))
                 .setInitialQtaTot(BigDecimal.valueOf(mArticolo.getQtaOrd()));
 

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java

@@ -23,6 +23,7 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
 import it.integry.integrywmsnative.core.data_store.db.view_model.ArticoloOrdinabileDTO;
 import it.integry.integrywmsnative.core.exception.GridNotFoundException;
+import it.integry.integrywmsnative.core.exception.GridNotSelectedException;
 import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
 import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
@@ -36,6 +37,7 @@ public class DialogScanGrigliaAcquistoView extends BaseDialogFragment {
 
     private DialogScanCodiceGrigliaBinding mBinding;
     private int mBarcodeScannerIstanceID;
+    public boolean canIgnoreGrid;
 
     private final RunnableArgss<Griglia, List<ArticoloOrdinabileDTO>> mOnDialogDismiss;
 
@@ -53,6 +55,7 @@ public class DialogScanGrigliaAcquistoView extends BaseDialogFragment {
     private DialogScanGrigliaAcquistoView(RunnableArgss<Griglia, List<ArticoloOrdinabileDTO>> onDialogDismiss) {
         super();
         mOnDialogDismiss = onDialogDismiss;
+        canIgnoreGrid = SettingsManager.iDB().isFlagConsentiOrdineSenzaGriglia();
     }
 
     @NonNull
@@ -80,6 +83,12 @@ public class DialogScanGrigliaAcquistoView extends BaseDialogFragment {
     }
 
     public void ignore() {
+
+        if (!this.canIgnoreGrid) {
+            this.onError(new GridNotSelectedException());
+            return;
+        }
+
         BarcodeManager.disable();
 
         RunnableArgs<Exception> mOnError = exception -> {

app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java

@@ -47,10 +47,13 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
     @Inject
     public AppContext appContext;
+
     @Inject
     public SystemRESTConsumer systemRESTConsumer;
+
     @Inject
     public DialogProgressView mCurrentProgress;
+
     @Inject
     public ExecutorService executorService;
 

app/src/main/res/layout/dialog_scan_codice_griglia.xml

@@ -8,6 +8,8 @@
         <variable
             name="view"
             type="it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs.DialogScanGrigliaAcquistoView" />
+
+        <import type="android.view.View" />
     </data>
 
     <androidx.cardview.widget.CardView
@@ -95,6 +97,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/Button.PrimaryOutline"
+                        android:visibility="@{view.canIgnoreGrid ? View.VISIBLE : View.GONE}"
                         android:onClick="@{() -> view.ignore()}"
                         app:strokeColor="@color/blue_600"
                         app:icon="@drawable/baseline_skip_next_24"

app/src/main/res/values-it/strings.xml

@@ -450,6 +450,7 @@
     <string name="no_arts_in_grid">Nessun articolo presente in griglia</string>
     <string name="invalid_quantity_ordered">La quantità ordinata non è valida</string>
     <string name="grid_not_found">La griglia selezionata non esiste o non presenta articoli</string>
+    <string name="grid_not_selected">Nessuna griglia selezionata!</string>
     <string name="ignore">Ignora</string>
     <string name="max_orderable_qty">Qta massima ordinabile</string>
     <string name="max_qty_exceeded">Quantità massima superata</string>

app/src/main/res/values/strings.xml

@@ -459,6 +459,7 @@
     <string name="no_arts_in_grid">No product found in grid</string>
     <string name="invalid_quantity_ordered">Invalid quantity ordered</string>
     <string name="grid_not_found">The selected grid was not found or is empty</string>
+    <string name="grid_not_selected">No grid was selected</string>
     <string name="ignore">Ignore</string>
     <string name="max_orderable_qty">Max orderable qty</string>
     <string name="max_qty_exceeded">Max quantity exceeded</string>

build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.8.0'
-        agp_version = '8.0.0'
+        agp_version = '8.0.1'
     }
 
     repositories {