Merge remote-tracking branch 'origin/develop' into develop

2024-04-19 17:33:03 +02:00
parent 925cb6ae07 e18ac7a390
commit 55db6d362d
2 changed files with 3 additions and 3 deletions
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/dto/StatoArtInventarioDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/dto/StatoArtInventarioDTO.java
@@ -151,7 +151,7 @@ public class StatoArtInventarioDTO {
    }

    public Integer getPedMag() {
-        if (pedMag < 0)
+        if (pedMag == null || pedMag < 0)
            return 0;
        else
            return pedMag;