Finish v1.36.07(400)

Cambiata condizione su gestione anag fornitore per documenti di trasferimento interno

.idea/runConfigurations/app.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
-    <module name="WMS.app.main" />
+    <module name="WMS_Native.app.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
@@ -9,7 +9,6 @@
     <option name="ALL_USERS" value="false" />
     <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
     <option name="CLEAR_APP_STORAGE" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS.dynamic__base,WMS.dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="false" />
@@ -25,6 +24,8 @@
       <option name="WORKING_DIR" value="" />
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Auto>
     <Hybrid>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -32,14 +33,21 @@
       <option name="WORKING_DIR" value="" />
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Hybrid>
-    <Java />
+    <Java>
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Java>
     <Native>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
       <option name="SHOW_STATIC_VARS" value="true" />
       <option name="WORKING_DIR" value="" />
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Native>
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 393
-    def appVersionName = '1.36.00'
+    def appVersionCode = 400
+    def appVersionName = '1.36.07'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java

@@ -182,8 +182,11 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
-        return new ColliMagazzinoRESTConsumer(systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer);
+    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer,
+                                                                 ArticoloRESTConsumer articoloRESTConsumer,
+                                                                 EntityRESTConsumer entityRESTConsumer,
+                                                                 SettingsManager settingsManager) {
+        return new ColliMagazzinoRESTConsumer(systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer, settingsManager);
     }
 
     @Provides
@@ -272,8 +275,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    ColliLavorazioneRESTConsumer provideColliLavorazioneRESTConsumer() {
-        return new ColliLavorazioneRESTConsumer();
+    ColliLavorazioneRESTConsumer provideColliLavorazioneRESTConsumer(SettingsManager settingsManager) {
+        return new ColliLavorazioneRESTConsumer(settingsManager);
     }
 
     @Provides

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumer.java

@@ -1,10 +1,14 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import java.math.BigDecimal;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliCaricoRESTConsumerInterface;
 import it.integry.integrywmsnative.core.rest.consumers.interfaces.ColliScaricoRESTConsumerInterface;
@@ -18,6 +22,7 @@ import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSFromArtRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
@@ -27,6 +32,7 @@ import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDCRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.InsertUDSRowResponseDTO;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -35,6 +41,12 @@ import retrofit2.Response;
 public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements ColliCaricoRESTConsumerInterface, ColliScaricoRESTConsumerInterface {
 
 
+    private final SettingsManager settingsManager;
+
+    public ColliLavorazioneRESTConsumer(SettingsManager settingsManager) {
+        this.settingsManager = settingsManager;
+    }
+
     @Override
     public void createUDC(CreateUDCRequestDTO createUDCRequestDTO, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
@@ -213,4 +225,43 @@ public class ColliLavorazioneRESTConsumer extends _BaseRESTConsumer implements C
                     }
                 });
     }
+
+
+    public void createColloScaricoDaArticolo(MtbAart mtbAart,
+                                             String partitaMag,
+                                             MtbDepoPosizione posizione,
+                                             BigDecimal qta, BigDecimal qtaCnf, BigDecimal numCnf,
+                                             BigDecimal pesoNettoKg, BigDecimal pesoLordoKg,
+                                             Runnable onComplete, RunnableArgs<Exception> onFailed) {
+
+        CreateUDSFromArtRequestDTO createUDSFromArtRequestDTO = new CreateUDSFromArtRequestDTO()
+                .setCodMart(mtbAart.getCodMart())
+                .setCodMdep(settingsManager.getSettings().getUserSession().getDepo().getCodMdep())
+                .setPartitaMag(partitaMag)
+                .setPosizione(posizione != null ? posizione.getPosizione() : null)
+                .setQta(qta)
+                .setQtaCnf(qtaCnf)
+                .setNumCnf(numCnf)
+                .setPesoLordoKg(pesoLordoKg)
+                .setPesoNettoKg(pesoNettoKg);
+
+        if (posizione != null && posizione.isFlagLineaProduzione()) {
+            createUDSFromArtRequestDTO
+                    .setCodJfas(posizione.getPosizione());
+        }
+        ColliLavorazioneRESTConsumerService colliLavorazioneRESTConsumerService = RESTBuilder.getService(ColliLavorazioneRESTConsumerService.class);
+
+        colliLavorazioneRESTConsumerService.createUDSFromArt(createUDSFromArtRequestDTO)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<Void>> call, Response<ServiceRESTResponse<Void>> response) {
+                        analyzeAnswer(response, "lavorazione/createUDSFromArt", data -> onComplete.run(), onFailed);
+                    }
+
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<Void>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliLavorazioneRESTConsumerService.java

@@ -10,6 +10,7 @@ import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.udc.EditUDCRowResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CloseUDSResponseDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSFromArtRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.CreateUDSResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.uds.DeleteUDSRowRequestDTO;
@@ -55,4 +56,7 @@ public interface ColliLavorazioneRESTConsumerService {
     @POST("wms/lavorazione/deleteUDCRow")
     Call<ServiceRESTResponse<Void>> deleteUDCRow(@Body DeleteUDCRowRequestDTO deleteUDCRowRequestDTO);
 
+    @POST("wms/lavorazione/createUDSFromArt")
+    Call<ServiceRESTResponse<Void>> createUDSFromArt(@Body CreateUDSFromArtRequestDTO createUDSFromArtRequestDTO);
+
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java

@@ -50,13 +50,16 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     private final SystemRESTConsumer mSystemRESTConsumer;
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
     private final EntityRESTConsumer mEntityRESTConsumer;
+    private final SettingsManager mSettingsManager;
 
     public ColliMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer,
                                       ArticoloRESTConsumer articoloRESTConsumer,
-                                      EntityRESTConsumer entityRESTConsumer) {
+                                      EntityRESTConsumer entityRESTConsumer,
+                                      SettingsManager settingsManager) {
         this.mSystemRESTConsumer = systemRESTConsumer;
         this.mArticoloRESTConsumer = articoloRESTConsumer;
         this.mEntityRESTConsumer = entityRESTConsumer;
+        this.mSettingsManager = settingsManager;
     }
 
     public void saveCollo(MtbColt mtbColtToSave, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
@@ -171,6 +174,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         saveCollo(newMtbColt, onComplete, onFailed);
     }
 
+
     public void createColliScaricoDaOrdineLavorazione(MtbColt sourceMtbColt, MtbColr sourceMtbColr, MtbDepoPosizione posizione, List<OrdineLavorazioneDTO> ordini, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         MtbColt newMtbColt = new MtbColt()
@@ -302,6 +306,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     public void fillMtbAartsOfMtbColts(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         fillMtbAartsOfMtbColtsStatic(mtbColts, onComplete, onFailed);
     }
+
     public static void fillMtbAartsOfMtbColtsStatic(List<MtbColt> mtbColts, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
         List<String> codMarts = new ArrayList<>();
 
@@ -651,7 +656,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-
     public void canULBeDeleted(MtbColt mtbColt, RunnableArgs<Boolean> onComplete, RunnableArgs<Exception> onFailed) {
         CanULBeDeletedRequestDTO canULBeDeletedRequestDTO = new CanULBeDeletedRequestDTO()
                 .setMtbColt(mtbColt);
@@ -710,5 +714,4 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/CommessaRESTConsumer.java

@@ -13,6 +13,7 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.JtbComt;
 import it.integry.integrywmsnative.core.utility.UtilityQuery;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 
 @Singleton
 public class CommessaRESTConsumer extends _BaseRESTConsumer {
@@ -26,6 +27,8 @@ public class CommessaRESTConsumer extends _BaseRESTConsumer {
 
     public void getJtbComts(List<String> itemsToFind, RunnableArgs<List<JtbComt>> onComplete, RunnableArgs<Exception> onFailed) {
         var whereCondMap = Stream.of(itemsToFind)
+                .withoutNulls()
+                .filter(x -> !UtilityString.isNullOrEmpty(x))
                 .map(x -> {
                     HashMap<String, Object> vars = new HashMap<>();
                     vars.put("cod_jcom", x);
@@ -33,6 +36,11 @@ public class CommessaRESTConsumer extends _BaseRESTConsumer {
                 })
                 .toList();
 
+        if(whereCondMap.isEmpty()) {
+            onComplete.run(new ArrayList<>());
+            return;
+        }
+
         var whereCond = " WHERE " + UtilityQuery.concatFieldListInWhereCond(whereCondMap);
 
         Type typeOfObjectsList = new TypeToken<ArrayList<JtbComt>>() {}.getType();

app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/CreateUDSFromArtRequestDTO.java

@@ -0,0 +1,108 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import java.math.BigDecimal;
+
+public class CreateUDSFromArtRequestDTO {
+
+    private String codMart;
+    private String partitaMag;
+    private String codMdep;
+    private String posizione;
+    private String codJfas;
+    private BigDecimal qta;
+    private BigDecimal qtaCnf;
+    private BigDecimal numCnf;
+    private BigDecimal pesoNettoKg;
+    private BigDecimal pesoLordoKg;
+
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public CreateUDSFromArtRequestDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public CreateUDSFromArtRequestDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public CreateUDSFromArtRequestDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public String getPosizione() {
+        return posizione;
+    }
+
+    public CreateUDSFromArtRequestDTO setPosizione(String posizione) {
+        this.posizione = posizione;
+        return this;
+    }
+
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public CreateUDSFromArtRequestDTO setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
+
+    public BigDecimal getQta() {
+        return qta;
+    }
+
+    public CreateUDSFromArtRequestDTO setQta(BigDecimal qta) {
+        this.qta = qta;
+        return this;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public CreateUDSFromArtRequestDTO setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+        return this;
+    }
+
+    public BigDecimal getNumCnf() {
+        return numCnf;
+    }
+
+    public CreateUDSFromArtRequestDTO setNumCnf(BigDecimal numCnf) {
+        this.numCnf = numCnf;
+        return this;
+    }
+
+    public BigDecimal getPesoNettoKg() {
+        return pesoNettoKg;
+    }
+
+    public CreateUDSFromArtRequestDTO setPesoNettoKg(BigDecimal pesoNettoKg) {
+        this.pesoNettoKg = pesoNettoKg;
+        return this;
+    }
+
+    public BigDecimal getPesoLordoKg() {
+        return pesoLordoKg;
+    }
+
+    public CreateUDSFromArtRequestDTO setPesoLordoKg(BigDecimal pesoLordoKg) {
+        this.pesoLordoKg = pesoLordoKg;
+        return this;
+    }
+}

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

@@ -69,6 +69,7 @@ public class DBSettingsModel {
     private boolean flagCanAddUnknownBarcodesAccettazioneBolla = false;
     private boolean flagEnableFastPickAccettazioneBolla = false;
     private boolean flagDisableMandatoryTracciabilitaAccettazioneBolla = false;
+    private boolean flagOverflowQuantityWarning = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -556,4 +557,13 @@ public class DBSettingsModel {
         this.flagDisableMandatoryTracciabilitaAccettazioneBolla = flagDisableMandatoryTracciabilitaAccettazioneBolla;
         return this;
     }
+
+    public boolean isFlagOverflowQuantityWarning() {
+        return flagOverflowQuantityWarning;
+    }
+
+    public DBSettingsModel setFlagOverflowQuantityWarning(boolean flagOverflowQuantityWarning) {
+        this.flagOverflowQuantityWarning = flagOverflowQuantityWarning;
+        return this;
+    }
 }

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

@@ -470,6 +470,12 @@ public class SettingsManager {
                 .setKeySection("FLAG_DISABLE_MANDATORY_TRACCIABILITA")
                 .setSetter(dbSettingsModelIstance::setFlagDisableMandatoryTracciabilitaAccettazioneBolla)
                 .setDefaultValue(false));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("FLAG_OVERFLOW_QUANTITY_WARNING")
+                .setSetter(dbSettingsModelIstance::setFlagOverflowQuantityWarning)
+                .setDefaultValue(false));
 
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/MainAccettazioneBollaElencoFragment.java

@@ -165,7 +165,9 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
         //TODO: Filter here
 
         this.mBolleInevaseMutableData.clear();
-        this.mBolleInevaseMutableData.addAll(convertDataModelToListModel(tmpList));
+
+        if(tmpList != null)
+            this.mBolleInevaseMutableData.addAll(convertDataModelToListModel(tmpList));
     }
 
     @Override
@@ -184,12 +186,13 @@ public class MainAccettazioneBollaElencoFragment extends BaseFragment implements
 
 
     private List<MainAccettazioneBolleElencoListModel> convertDataModelToListModel(List<TestataBollaAccettazioneDTO> dataList) {
+        if(dataList == null)
+            return null;
 
         final Comparator<TestataBollaAccettazioneDTO> comparer = Comparator.comparing(TestataBollaAccettazioneDTO::getListino)
                 .thenComparing(TestataBollaAccettazioneDTO::getRagSoc)
                 .thenComparing(TestataBollaAccettazioneDTO::getNumDoc);
 
-
         return Stream.of(dataList)
                 .sorted(comparer)
                 .map(x -> {

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java

@@ -333,13 +333,13 @@ public class AccettazioneBollaPickingViewModel {
             pickingObjectDTO.setTempPickData(pickData);
         }
 
-        this.loadMatchedRows(matchPickingObject, mtbAart);
+        this.loadMatchedRows(matchPickingObject, mtbAart, pickData);
         onComplete.run();
     }
 
-    private void loadMatchedRows(List<PickingObjectDTO> matchedRows, MtbAart mtbAart) {
+    private void loadMatchedRows(List<PickingObjectDTO> matchedRows, MtbAart mtbAart, PickDataDTO pickDataDTO) {
         if (matchedRows == null || matchedRows.size() == 0) {
-            manageNoArtFound(mtbAart);
+            manageNoArtFound(mtbAart, pickDataDTO);
         } else if (matchedRows.size() == 1) {
             this.manageDispatchBollaRow(matchedRows.get(0));
         } else {
@@ -375,11 +375,12 @@ public class AccettazioneBollaPickingViewModel {
     }
 
 
-    private void manageNoArtFound(MtbAart mtbAart) {
+    private void manageNoArtFound(MtbAart mtbAart, PickDataDTO pickDataDTO) {
         if (SettingsManager.iDB().isFlagCanAddUnknownItemsAccettazioneBolla()) {
 
             this.manageDispatchBollaRow(new PickingObjectDTO()
-                    .setMtbAart(mtbAart));
+                    .setMtbAart(mtbAart)
+                    .setTempPickData(pickDataDTO));
         } else
             this.sendError(new NoArtsFoundException());
     }
@@ -418,12 +419,21 @@ public class AccettazioneBollaPickingViewModel {
     }
 
     public void manageDispatchBollaRow(final PickingObjectDTO pickingObjectDTO) {
+        String partitaMag = null;
+        if(pickingObjectDTO.getTempPickData() != null){
+            if(pickingObjectDTO.getTempPickData().getManualPickDTO() != null){
+                if(pickingObjectDTO.getTempPickData().getManualPickDTO().getMtbPartitaMag() != null){
+                    partitaMag = pickingObjectDTO.getTempPickData().getManualPickDTO().getMtbPartitaMag().getPartitaMag();
+                }
+            }
+        }
+
         if (SettingsManager.iDB().isFlagEnableFastPickAccettazioneBolla()) {
             this.saveNewRow(pickingObjectDTO,
                     BigDecimal.ONE,
                     pickingObjectDTO.getMtbAart().getQtaCnf(),
                     pickingObjectDTO.getMtbAart().getQtaCnf(),
-                    null,
+                    partitaMag,
                     null,
                     false);
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/dto/SitArtOrdDTO.java

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.accettazione_ordini_elenco.dto;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.Date;
 
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 
@@ -33,6 +34,17 @@ public class SitArtOrdDTO {
     private String descrizioneCommessa;
     private String termCons;
     private String descrizioneEstesaArt;
+    private String descrizioneEstesaOrd;
+    private Date dataCons;
+
+    public String getDescrizioneEstesaOrd() {
+        return descrizioneEstesaOrd;
+    }
+
+    public SitArtOrdDTO setDescrizioneEstesaOrd(String descrizioneEstesaOrd) {
+        this.descrizioneEstesaOrd = descrizioneEstesaOrd;
+        return this;
+    }
 
     public String getCodJcom() {
         return codJcom;
@@ -280,4 +292,13 @@ public class SitArtOrdDTO {
         this.descrizioneEstesaArt = descrizioneEstesaArt;
         return this;
     }
+
+    public Date getDataCons() {
+        return dataCons;
+    }
+
+    public SitArtOrdDTO setDataCons(Date dataCons) {
+        this.dataCons = dataCons;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java

@@ -47,6 +47,7 @@ import it.integry.integrywmsnative.core.report.ReportManager;
 import it.integry.integrywmsnative.core.rest.model.VersamentoAutomaticoULResponseDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
@@ -415,6 +416,8 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
                     accettazioneOrdiniPickingListModel.setBadge1(UtilityString.isNull(x.getSitArtOrdDTO().getCodJcom(), CommonConst.Config.COMMESSA_MAG));
                     accettazioneOrdiniPickingListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
+                    accettazioneOrdiniPickingListModel.setSubDescrizione1("Consegna: " + UtilityDate.formatDate(x.getSitArtOrdDTO().getDataCons(), UtilityDate.COMMONS_DATE_FORMATS.DMY_SLASH));
+
                     accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
                     if (x.getMtbAart() != null)
                         accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
@@ -585,8 +588,9 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
                         accettazioneOrdiniPickingListModel.setSecUntMis(UtilityResources.getString(R.string.unt_mis_col));
                     }
 
+                    accettazioneOrdiniPickingListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneEstesaOrd());
+
                     if (x.getMtbAart() != null) {
-                        accettazioneOrdiniPickingListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());
                         accettazioneOrdiniPickingListModel.setPosizione(x.getMtbAart().getPosizione());
                     }
 
@@ -788,7 +792,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     }
 
     @Override
-    public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canPartitaMagBeChanged, boolean canOverflowQuantity, RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
+    public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal qtaCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, String partitaMag, LocalDate dataScad, boolean canPartitaMagBeChanged, boolean canOverflowQuantity, String customArtDescription, RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
         DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
                 .setMtbAart(mtbAart)
                 .setInitialNumCnf(initialNumCnf)
@@ -807,7 +811,8 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
                 .setDataScad(dataScad)
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
                 .setCanLUBeClosed(true)
-                .setCanOverflowOrderQuantity(canOverflowQuantity);
+                .setCanOverflowOrderQuantity(canOverflowQuantity)
+                .setCustomArtDescription(customArtDescription);
 
         if (!mDialogInputQuantityV2View.isVisible())
             mDialogInputQuantityV2View

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java

@@ -371,11 +371,23 @@ public class AccettazioneOrdiniPickingViewModel {
         this.sendOnInfoAggiuntiveRequest((additionalNotes, tCol) -> {
 
             final List<CreateUDCRequestOrderDTO> orders = Stream.of(this.mOrders)
-                    .map(x -> new CreateUDCRequestOrderDTO()
-                            .setDataCons(x.getDataConsD() != null ? UtilityDate.toLocalDate(x.getDataConsD()) : null)
-                            .setDataOrd(UtilityDate.toLocalDate(x.getDataD()))
-                            .setGestione(x.getGestione())
-                            .setNumOrd(x.getNumero()))
+                    .map(x -> {
+                        final CreateUDCRequestOrderDTO createUDCRequestOrderDTO = new CreateUDCRequestOrderDTO()
+                                .setDataCons(x.getDataConsD() != null ? UtilityDate.toLocalDate(x.getDataConsD()) : null)
+                                .setDataOrd(UtilityDate.toLocalDate(x.getDataD()))
+                                .setNumOrd(x.getNumero());
+
+                        if(x.getGestioneEnum() == GestioneEnum.PRODUZIONE) {
+                            if(x.isOrdTrasf())
+                                createUDCRequestOrderDTO.setGestione(GestioneEnum.ACQUISTO.getText());
+                            else
+                                createUDCRequestOrderDTO.setGestione(GestioneEnum.LAVORAZIONE.getText());
+                        } else {
+                            createUDCRequestOrderDTO.setGestione(x.getGestione());
+                        }
+
+                        return createUDCRequestOrderDTO;
+                    })
                     .toList();
 
             final CreateUDCRequestDTO createUDCRequestDTO = new CreateUDCRequestDTO()
@@ -527,6 +539,7 @@ public class AccettazioneOrdiniPickingViewModel {
                 partitaMag,
                 dataScad,
                 true,
+                pickingObjectDTO.getSitArtOrdDTO().getDescrizioneEstesaOrd(),
                 (pickedQuantityDTO, shouldCloseLU) -> {
                     this.saveNewRow(pickingObjectDTO,
                             pickedQuantityDTO.getNumCnf(),
@@ -613,6 +626,7 @@ public class AccettazioneOrdiniPickingViewModel {
                 mtbColrToEdit.getPartitaMag(),
                 mtbColrToEdit.getDataScadPartita(),
                 true,
+                null,
                 (pickedQuantityDTO, shouldCloseLU) -> {
 
                     this.saveEditedRow(mtbColrToEdit,
@@ -871,6 +885,7 @@ public class AccettazioneOrdiniPickingViewModel {
                                       String partitaMag,
                                       LocalDate dataScad,
                                       boolean canPartitaMagBeChanged,
+                                      String customArtDescription,
                                       RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
         if (this.mListener != null) mListener.onItemDispatched(pickingObjectDTO,
                 mtbAart,
@@ -890,6 +905,7 @@ public class AccettazioneOrdiniPickingViewModel {
                 dataScad,
                 canPartitaMagBeChanged,
                 true,
+                customArtDescription,
                 onComplete);
     }
 
@@ -946,6 +962,7 @@ public class AccettazioneOrdiniPickingViewModel {
                               LocalDate dataScad,
                               boolean canPartitaMagBeChanged,
                               boolean canOverflowQuantity,
+                              String customArtDescription,
                               RunnableArgss<PickedQuantityDTO, Boolean> onComplete);
 
         void onFilterCodMartApplied(String codMartToFilter);

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java

@@ -21,6 +21,7 @@ import java.util.List;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.AccettazioneOrdineInevasoMainListGroupHeaderBinding;
@@ -119,7 +120,10 @@ public class AccettazioneOrdiniPickingListAdapter extends SectionedRecyclerViewA
 
         holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());
         holder.mBinding.descrizione.setTextColor(pickingObjectDTO.isDescrizionePresente() ? Color.BLACK : Color.GRAY);
+        holder.mBinding.descrizione.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getDescrizione()) ? View.GONE : View.VISIBLE);
 
+        holder.mBinding.descrizioneSub1.setText(pickingObjectDTO.getSubDescrizione1());
+        holder.mBinding.descrizioneSub1.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getSubDescrizione1()) ? View.GONE : View.VISIBLE);
 
         holder.mBinding.badge1.setText(pickingObjectDTO.getBadge1());
         holder.mBinding.badge2.setText(pickingObjectDTO.getBadge2());

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListModel.java

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.gest.accettazione_ordini_picking.ui;
 import org.jetbrains.annotations.NotNull;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 import it.integry.integrywmsnative.gest.accettazione_ordini_picking.dto.PickingObjectDTO;
 

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java

@@ -65,7 +65,7 @@ public class DialogSelectDocInfoViewModel extends ViewModel {
                         if (val.getGestioneDoc().equalsIgnoreCase("T")) {
                             return forn.getTipoAnag().equalsIgnoreCase("D") &&
                                     forn.getGestioneAnag().equalsIgnoreCase(
-                                            val.getGestione().equalsIgnoreCase("V") ? "V" : "A"
+                                            val.getGestione().equalsIgnoreCase("V") ? "V" : "L"
                                     );
                         } else {
                             return forn.getTipoAnag().equalsIgnoreCase("F");

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java

@@ -266,7 +266,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
                     var dataScad = data.getDataScad();
 
                     String partitaMag = null;
-                    if (dataScad != null) partitaMag = UtilityDate.formatDate(dataScad, "yyyymmdd");
+                    if (dataScad != null) partitaMag = UtilityDate.formatDate(dataScad, "yyyyMMdd");
 
                     return partitaMag;
                 });

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java

@@ -93,6 +93,8 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
                         //Load fabbisogno
                         this.mViewModel.loadFabbisogno(startDate, endDate, codMdep, this::startPickingActivity);
 //                    }
+                }, () -> {
+                    popMe();
                 })
                 .show(getActivity().getSupportFragmentManager(), "tag");
     }

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaView.java

@@ -36,20 +36,22 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme
     DialogAskMagazzinoProssimitaViewModel mViewModel;
 
     private final RunnableArgsss<JtbFasi, Date, Date> mOnItemSelected;
+    private final Runnable mOnAbort;
 
     private Context mContext;
     private DialogAskMagazzinoProssimitaBinding mBindings;
 
 //    private JtbFasi mSelectedItem;
 
-    public static DialogAskMagazzinoProssimitaView newInstance(RunnableArgsss<JtbFasi, Date, Date> onItemSelected) {
-        return new DialogAskMagazzinoProssimitaView(onItemSelected);
+    public static DialogAskMagazzinoProssimitaView newInstance(RunnableArgsss<JtbFasi, Date, Date> onItemSelected, Runnable onAbort) {
+        return new DialogAskMagazzinoProssimitaView(onItemSelected, onAbort);
     }
 
 
-    private DialogAskMagazzinoProssimitaView(RunnableArgsss<JtbFasi, Date, Date> onItemSelected) {
+    private DialogAskMagazzinoProssimitaView(RunnableArgsss<JtbFasi, Date, Date> onItemSelected, Runnable onAbort) {
         super();
         this.mOnItemSelected = onItemSelected;
+        this.mOnAbort = onAbort;
     }
 
     @Nullable
@@ -79,6 +81,7 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme
 //                } else {
 //                    FBToast.warningToast(mContext, getResources().getString(R.string.please_select_an_item), Toast.LENGTH_LONG);
 //                }
+                mOnItemSelected.run(null, mViewModel.startDate, mViewModel.endDate);
             }
         });
 
@@ -86,6 +89,7 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme
             @Override
             public void onSingleClick(View v) {
                 getDialog().dismiss();
+                mOnAbort.run();
             }
         });
 
@@ -111,7 +115,6 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
         super.onDismiss(dialog);
-        mOnItemSelected.run(null, mViewModel.startDate, mViewModel.endDate);
     }
 
     private final View.OnClickListener onStartDateClickListener = new OnSingleClickListener() {

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumer.java

@@ -10,10 +10,17 @@ import java.util.List;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.consumers.MagazzinoBufferRESTConsumerService;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 
 @Singleton
 public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
@@ -26,254 +33,20 @@ public class ProdFabbisognoLineeProdRESTConsumer extends _BaseRESTConsumer {
 
 
     public void loadFabbisogno(Date startDate, Date endDate, String codMdep, RunnableArgs<List<ProdFabbisognoLineeProdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        String sql = "WITH input_values AS ( " +
-                "    SELECT " + UtilityDB.valueToString(startDate) + " AS data_inizio, " +
-                "           " + UtilityDB.valueToString(endDate) + " AS data_fine, " +
-//                "           " + UtilityDB.valueToString(lineaProd) + " AS linea_prod, " +
-                "           " + UtilityDB.valueToString(codMdep) + " AS cod_mdep)," +
-                " withdraw_mtb_colr AS ( " +
-                "         SELECT cod_mart, " +
-                "                SUM(ISNULL(qta_col, 0)) as qta_col, " +
-                "                SUM(ISNULL(num_cnf, 0)) as num_cnf, " +
-                "                mtb_colr.data_ord, " +
-                "                mtb_colr.num_ord, " +
-                "                mtb_colr.gestione " +
-                "         FROM mtb_colr " +
-                "                  INNER JOIN mtb_colt mc on mtb_colr.gestione = mc.gestione and mtb_colr.data_collo = mc.data_collo and " +
-                "                                            mtb_colr.ser_collo = mc.ser_collo and mtb_colr.num_collo = mc.num_collo " +
-                "         WHERE segno = -1 " +
-                "           AND cod_dtip IS NULL " +
-                "         GROUP BY cod_mart, " +
-                "                  mtb_colr.data_ord, " +
-                "                  mtb_colr.num_ord, " +
-                "                  mtb_colr.gestione " +
-                "     ), " +
-                "     custom_mtb_colr AS (SELECT cod_mart, " +
-                "                                SUM(qta_col) AS qta_col, " +
-                "                                SUM(num_cnf) AS num_cnf, " +
-                "                                posizione " +
-                "                         FROM mvw_sitart_udc_det_inventario " +
-                "                         GROUP BY cod_mart, posizione), " +
-                "     grouped_ord AS ( " +
-                "         SELECT dtb_ordr.cod_mart, " +
-                "                dtb_ordt.cod_jfas, " +
-                "                dtb_ordt.cod_mdep, " +
-                "                dtb_ordt.gestione, " +
-                "                CONVERT(NUMERIC(15, 5), SUM(dtb_ordr.qta_ord * dtb_ordr.rap_conv) - " +
-                "                                        SUM(dtb_ordr.qta_evasa * dtb_ordr.rap_conv)) AS qta_ord, " +
-                "                SUM(dtb_ordr.num_cnf - dtb_ordr.num_cnf_evasa)                       AS num_cnf_ord, " +
-                "                SUM(ISNULL(withdraw_mtb_colr.qta_col, 0))                            AS qta_col_scaricata, " +
-                "                SUM(ISNULL(withdraw_mtb_colr.num_cnf, 0))                            AS num_cnf_scaricata " +
-                "         FROM dtb_ordr " +
-                "                  INNER JOIN dtb_ordt on dtb_ordr.gestione = dtb_ordt.gestione AND " +
-                "                                         dtb_ordr.data_ord = dtb_ordt.data_ord AND " +
-                "                                         dtb_ordr.num_ord = dtb_ordt.num_ord " +
-                "                  LEFT OUTER JOIN withdraw_mtb_colr " +
-                "                                  ON withdraw_mtb_colr.gestione = dtb_ordt.gestione AND " +
-                "                                     withdraw_mtb_colr.num_ord = dtb_ordt.num_ord AND " +
-                "                                     withdraw_mtb_colr.data_ord = dtb_ordt.data_ord AND " +
-                "                                     withdraw_mtb_colr.cod_mart = dtb_ordr.cod_mart " +
-                "                  CROSS APPLY input_values " +
-                "         WHERE dtb_ordt.gestione = 'L' " +
-                "           AND flag_evaso = 'I' " +
-                "           AND flag_evaso_prod = 'I' " +
-                "           AND dtb_ordr.flag_evaso_forzato = 'N' " +
-                "           AND flag_annulla = 'N' " +
-                "           AND dtb_ordt.cod_mdep = input_values.cod_mdep " +
-                "           AND dtb_ordt.data_ord BETWEEN input_values.data_inizio AND input_values.data_fine " +
-                "         GROUP BY dtb_ordr.cod_mart, dtb_ordt.cod_jfas, dtb_ordt.cod_mdep, dtb_ordt.gestione " +
-                "     ), " +
-                "     tmp_ord AS (SELECT grouped_ord.cod_mart, " +
-                "                        mtb_aart.unt_mis, " +
-                "                        grouped_ord.cod_jfas, " +
-                "                        SUM(qta_ord) - SUM(qta_col_scaricata)     AS qta_ord, " +
-                "                        SUM(num_cnf_ord) - SUM(num_cnf_scaricata) AS num_cnf_ord " +
-                "                 FROM grouped_ord " +
-                "                          INNER JOIN mtb_aart ON grouped_ord.cod_mart = mtb_aart.cod_mart " +
-                "                          CROSS APPLY input_values " +
-                "                 GROUP BY grouped_ord.cod_mart, mtb_aart.unt_mis, grouped_ord.cod_jfas " +
-                "     ), " +
-                "     ord_without_positioned_mtb_colt AS ( " +
-                "         SELECT tmp_ord.cod_mart, " +
-                "                tmp_ord.cod_jfas, " +
-                "                ISNULL(custom_mtb_colr_on_linea.posizione, tmp_ord.cod_jfas) AS posizione, " +
-                "                unt_mis, " +
-                "                qta_ord                                                      AS qta_ord_calc, " +
-                "                num_cnf_ord                                                  AS num_cnf_ord_calc, " +
-                "                ISNULL(custom_mtb_colr_on_linea.qta_col, 0)                  AS qta_gia_posizionata, " +
-                "                ISNULL(custom_mtb_colr_on_linea.num_cnf, 0)                  AS num_cnf_gia_posizionata, " +
-                "                qta_ord - ISNULL(custom_mtb_colr_on_linea.qta_col, 0)        AS qta_fabbisogno, " +
-                "                num_cnf_ord - ISNULL(custom_mtb_colr_on_linea.num_cnf, 0)    AS num_cnf_fabbisogno " +
-                "         FROM tmp_ord " +
-                "                  INNER JOIN jrl_fase_posizioni ON tmp_ord.cod_jfas = jrl_fase_posizioni.cod_jfas " +
-                "             AND tmp_ord.cod_jfas = jrl_fase_posizioni.posizione " +
-                "                  LEFT OUTER JOIN custom_mtb_colr custom_mtb_colr_on_linea " +
-                "                                  ON tmp_ord.cod_mart = custom_mtb_colr_on_linea.cod_mart AND " +
-                "                                     tmp_ord.cod_jfas = custom_mtb_colr_on_linea.posizione " +
-                " " +
-                "         UNION ALL " +
-                " " +
-                "         SELECT DISTINCT tmp_ord.cod_mart, " +
-                "                         null                                        AS cod_jfas, " +
-                "                         jrl_fase_posizioni.posizione, " +
-                "                         unt_mis, " +
-                "                         0                                           AS qta_ord_calc, " +
-                "                         0                                           AS num_cnf_ord_calc, " +
-                "                         ISNULL(custom_mtb_colr_on_linea.qta_col, 0) AS qta_gia_posizionata, " +
-                "                         ISNULL(custom_mtb_colr_on_linea.num_cnf, 0) AS num_cnf_gia_posizionata, " +
-                "                         0                                           AS qta_fabbisogno, " +
-                "                         0                                           AS num_cnf_fabbisogno " +
-                "         FROM tmp_ord " +
-                "                  INNER JOIN jrl_fase_posizioni ON tmp_ord.cod_jfas = jrl_fase_posizioni.cod_jfas " +
-                "             AND tmp_ord.cod_jfas <> jrl_fase_posizioni.posizione " +
-                " " +
-                " " +
-                "                  LEFT OUTER JOIN custom_mtb_colr custom_mtb_colr_on_linea " +
-                "                                  ON tmp_ord.cod_mart = custom_mtb_colr_on_linea.cod_mart AND " +
-                "                                     jrl_fase_posizioni.posizione = custom_mtb_colr_on_linea.posizione " +
-                "     ) " +
-                "SELECT cod_mart, " +
-                "       unt_mis, " +
-                "       input_values.data_inizio, " +
-                "       input_values.data_fine, " +
-                "       SUM(qta_ord_calc)                               AS qta_ord, " +
-                "       SUM(num_cnf_ord_calc)                           AS num_cnf_ord, " +
-                "       SUM(qta_gia_posizionata)                        AS qta_col_versata, " +
-                "       SUM(num_cnf_gia_posizionata)                    AS num_cnf_versata, " +
-                "       SUM(qta_ord_calc - qta_gia_posizionata)         AS qta_fabbisogno, " +
-                "       SUM(num_cnf_ord_calc - num_cnf_gia_posizionata) AS num_cnf_fabbisogno " +
-                "FROM ord_without_positioned_mtb_colt " +
-                "CROSS APPLY input_values " +
-                "GROUP BY cod_mart, unt_mis, input_values.data_inizio, input_values.data_fine " +
-                "HAVING SUM(qta_ord_calc - qta_gia_posizionata) > 0 AND SUM(num_cnf_ord_calc - num_cnf_gia_posizionata) > 0 " +
-                "ORDER BY cod_mart";
+        ProdFabbisognoLineeProdRESTConsumerService prodFabbisognoLineeProdRESTConsumerService = RESTBuilder.getService(ProdFabbisognoLineeProdRESTConsumerService.class);
+        prodFabbisognoLineeProdRESTConsumerService.loadFabbisogno(UtilityDate.formatDate(startDate, "yyyy-MM-dd"), UtilityDate.formatDate(endDate, "yyyy-MM-dd"), codMdep)
+                .enqueue(new Callback<>() {
+                    @Override
+                    public void onResponse(Call<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> call,
+                                           Response<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> response) {
+                        analyzeAnswer(response, "retrieveFabbisogno", onComplete, onFailed);
+                    }
 
-
-
-        /*
-        * Query splittata per cod_jfas (più pesante)
-        WITH input_values AS (SELECT '2021-02-15' AS data_inizio,
-                             '2021-02-28' AS data_fine,
-                             --'SC06'     AS linea_prod,
-                             '34'         AS cod_mdep),
-     withdraw_mtb_colr AS (
-         SELECT cod_mart,
-                SUM(ISNULL(qta_col, 0)) as qta_col,
-                SUM(ISNULL(num_cnf, 0)) as num_cnf,
-                mtb_colr.data_ord,
-                mtb_colr.num_ord,
-                mtb_colr.gestione
-         FROM mtb_colr
-                  INNER JOIN mtb_colt mc on mtb_colr.gestione = mc.gestione and mtb_colr.data_collo = mc.data_collo and
-                                            mtb_colr.ser_collo = mc.ser_collo and mtb_colr.num_collo = mc.num_collo
-         WHERE segno = -1
-           and cod_dtip IS NULL
-         GROUP BY cod_mart,
-                  mtb_colr.data_ord,
-                  mtb_colr.num_ord,
-                  mtb_colr.gestione
-     ),
-     custom_mtb_colr AS (SELECT cod_mart,
-                                SUM(qta_col) AS qta_col,
-                                SUM(num_cnf) AS num_cnf,
-                                posizione
-                         FROM mvw_sitart_udc_det_inventario
-                         GROUP BY cod_mart, posizione),
-     grouped_ord AS (
-         SELECT dtb_ordr.cod_mart,
-                dtb_ordt.cod_jfas,
-                dtb_ordt.cod_mdep,
-                dtb_ordt.gestione,
-                CONVERT(NUMERIC(15, 5), SUM(dtb_ordr.qta_ord * dtb_ordr.rap_conv) -
-                                        SUM(dtb_ordr.qta_evasa * dtb_ordr.rap_conv)) AS qta_ord,
-                SUM(dtb_ordr.num_cnf - dtb_ordr.num_cnf_evasa)                       AS num_cnf_ord,
-                SUM(ISNULL(withdraw_mtb_colr.qta_col, 0))                            AS qta_col_scaricata,
-                SUM(ISNULL(withdraw_mtb_colr.num_cnf, 0))                            AS num_cnf_scaricata
-         FROM dtb_ordr
-                  INNER JOIN dtb_ordt on dtb_ordr.gestione = dtb_ordt.gestione AND
-                                         dtb_ordr.data_ord = dtb_ordt.data_ord AND
-                                         dtb_ordr.num_ord = dtb_ordt.num_ord
-                  LEFT OUTER JOIN withdraw_mtb_colr
-                                  ON withdraw_mtb_colr.gestione = dtb_ordt.gestione AND
-                                     withdraw_mtb_colr.num_ord = dtb_ordt.num_ord AND
-                                     withdraw_mtb_colr.data_ord = dtb_ordt.data_ord AND
-                                     withdraw_mtb_colr.cod_mart = dtb_ordr.cod_mart
-                  CROSS APPLY input_values
-         WHERE dtb_ordt.gestione = 'L'
-           AND flag_evaso = 'I'
-           AND dtb_ordr.flag_evaso_forzato = 'N'
-           AND flag_annulla = 'N'
-           AND dtb_ordt.cod_mdep = input_values.cod_mdep
-           AND dtb_ordt.data_ord BETWEEN input_values.data_inizio AND input_values.data_fine
-         GROUP BY dtb_ordr.cod_mart, dtb_ordt.cod_jfas, dtb_ordt.cod_mdep, dtb_ordt.gestione
-     ),
-     tmp_ord AS (SELECT grouped_ord.cod_mart,
-                        mtb_aart.unt_mis,
-                        grouped_ord.cod_jfas,
-                        SUM(qta_ord) - SUM(qta_col_scaricata)     AS qta_ord,
-                        SUM(num_cnf_ord) - SUM(num_cnf_scaricata) AS num_cnf_ord
-                 FROM grouped_ord
-                          INNER JOIN mtb_aart ON grouped_ord.cod_mart = mtb_aart.cod_mart
-                          CROSS APPLY input_values
-                 GROUP BY grouped_ord.cod_mart, mtb_aart.unt_mis, grouped_ord.cod_jfas
-     ),
-     ord_without_positioned_mtb_colt AS (
-         SELECT tmp_ord.cod_mart,
-                tmp_ord.cod_jfas,
-                ISNULL(custom_mtb_colr_on_linea.posizione, tmp_ord.cod_jfas) AS posizione,
-                unt_mis,
-                qta_ord                                                      AS qta_ord_calc,
-                num_cnf_ord                                                  AS num_cnf_ord_calc,
-                ISNULL(custom_mtb_colr_on_linea.qta_col, 0)                  AS qta_gia_posizionata,
-                ISNULL(custom_mtb_colr_on_linea.num_cnf, 0)                  AS num_cnf_gia_posizionata,
-                qta_ord - ISNULL(custom_mtb_colr_on_linea.qta_col, 0)        AS qta_fabbisogno,
-                num_cnf_ord - ISNULL(custom_mtb_colr_on_linea.num_cnf, 0)    AS num_cnf_fabbisogno
-         FROM tmp_ord
-                  INNER JOIN jrl_fase_posizioni ON tmp_ord.cod_jfas = jrl_fase_posizioni.cod_jfas
-             AND tmp_ord.cod_jfas = jrl_fase_posizioni.posizione
-                  LEFT OUTER JOIN custom_mtb_colr custom_mtb_colr_on_linea
-                                  ON tmp_ord.cod_mart = custom_mtb_colr_on_linea.cod_mart AND
-                                     tmp_ord.cod_jfas = custom_mtb_colr_on_linea.posizione
-
-         UNION ALL
-
-         SELECT DISTINCT tmp_ord.cod_mart,
-                         null                                        AS cod_jfas,
-                         jrl_fase_posizioni.posizione,
-                         unt_mis,
-                         0                                           AS qta_ord_calc,
-                         0                                           AS num_cnf_ord_calc,
-                         ISNULL(custom_mtb_colr_on_linea.qta_col, 0) AS qta_gia_posizionata,
-                         ISNULL(custom_mtb_colr_on_linea.num_cnf, 0) AS num_cnf_gia_posizionata,
-                         0                                           AS qta_fabbisogno,
-                         0                                           AS num_cnf_fabbisogno
-         FROM tmp_ord
-                  INNER JOIN jrl_fase_posizioni ON tmp_ord.cod_jfas = jrl_fase_posizioni.cod_jfas
-             AND tmp_ord.cod_jfas <> jrl_fase_posizioni.posizione
-
-
-                  LEFT OUTER JOIN custom_mtb_colr custom_mtb_colr_on_linea
-                                  ON tmp_ord.cod_mart = custom_mtb_colr_on_linea.cod_mart AND
-                                     jrl_fase_posizioni.posizione = custom_mtb_colr_on_linea.posizione
-     )
-SELECT cod_mart,
-       cod_jfas,
-       posizione,
-       unt_mis,
-       qta_ord_calc            AS qta_ord,
-       num_cnf_ord_calc        AS num_cnf_ord,
-       qta_gia_posizionata     AS qta_col_versata,
-       num_cnf_gia_posizionata AS num_cnf_versata,
-       qta_ord_calc - qta_gia_posizionata AS qta_fabbisogno,
-       num_cnf_ord_calc - num_cnf_gia_posizionata AS num_cnf_fabbisogno
-FROM ord_without_positioned_mtb_colt
-
-ORDER BY cod_mart, posizione
-        * */
-
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<ProdFabbisognoLineeProdDTO>>() {}.getType();
-        this.mSystemRESTConsumer.processSql(sql, typeOfObjectsList, onComplete, onFailed);
+                    @Override
+                    public void onFailure(Call<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> call, Throwable t) {
+                        onFailed.run(new Exception(t));
+                    }
+                });
     }
 
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java

@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest;
+
+import java.util.Date;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface ProdFabbisognoLineeProdRESTConsumerService
+{
+    @GET("wms/approvvigionamento/retrieveFabbisogno")
+    Call<ServiceRESTResponse<List<ProdFabbisognoLineeProdDTO>>> loadFabbisogno(@Query("startDate") String startDate,
+                                                                               @Query("endDate") String endDate,
+                                                                               @Query("codMdep") String codMdep);
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java

@@ -45,7 +45,9 @@ public class ProdRecuperoMaterialeViewModel {
 
 
     @Inject
-    public ProdRecuperoMaterialeViewModel(ProdRecuperMaterialeRESTConsumer prodRecuperMaterialeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer) {
+    public ProdRecuperoMaterialeViewModel(ProdRecuperMaterialeRESTConsumer prodRecuperMaterialeRESTConsumer,
+                                          ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
+                                          PrinterRESTConsumer printerRESTConsumer) {
         this.mProdRecuperMaterialeRESTConsumer = prodRecuperMaterialeRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
         this.mPrinterRESTConsumer = printerRESTConsumer;
@@ -53,27 +55,25 @@ public class ProdRecuperoMaterialeViewModel {
 
     public void init(String codJfas) {
         this.sendOnLoadingStarted();
-        new Thread(() -> {
 
-            mProdRecuperMaterialeRESTConsumer.loadLastULVersate(codJfas, ulList -> {
-                this.mUlList.setValue(ulList);
+        mProdRecuperMaterialeRESTConsumer.loadLastULVersate(codJfas, ulList -> {
+            this.mUlList.setValue(ulList);
 
-                this.sendOnLoadingEnded();
-            }, this::sendError);
-
-        }).start();
+            this.sendOnLoadingEnded();
+        }, this::sendError);
     }
 
     public void processBarcodeDTO(BarcodeScanDTO data) {
         if (UtilityBarcode.isEtichettaAnonima(data) || UtilityBarcode.isEtichetta128(data)) {
-            this.executeEtichettaUL(data);
+            this.executeEtichettaLU(data.getStringValue());
+
         }
     }
 
-    private void executeEtichettaUL(BarcodeScanDTO barcodeScanDTO) {
+    private void executeEtichettaLU(String sscc) {
         this.sendOnLoadingStarted();
 
-        this.mColliMagazzinoRESTConsumer.getBySSCC(barcodeScanDTO.getStringValue(), true, false, mtbColt -> {
+        this.mColliMagazzinoRESTConsumer.getBySSCC(sscc, true, false, mtbColt -> {
             this.sendOnLoadingEnded();
 
             if (mtbColt != null) {
@@ -116,7 +116,7 @@ public class ProdRecuperoMaterialeViewModel {
 
         if (!UtilityBigDecimal.equalsTo(qtaDaEvadere, BigDecimal.ZERO)) {
 
-            if(item.getMtbAart().isFlagQtaCnfFissaBoolean())
+            if (item.getMtbAart().isFlagQtaCnfFissaBoolean())
                 numCnfDaEvadere = UtilityBigDecimal.divide(qtaDaEvadere, item.getQtaCnf());
             else numCnfDaEvadere = item.getNumCnf();
         }

app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java

@@ -18,17 +18,23 @@ import com.annimon.stream.Stream;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.util.List;
 
 import javax.inject.Inject;
 
 import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.di.BindableString;
 import it.integry.integrywmsnative.core.expansion.BaseFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -39,20 +45,27 @@ import it.integry.integrywmsnative.databinding.FragmentProdVersamentoMaterialeBi
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.VersamentoMerceOrdineLavListModel;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ui.ChooseOrdsLavFromListAdapter;
+import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
-import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUView;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 
 public class ProdVersamentoMaterialeFragment extends BaseFragment implements ProdVersamentoMaterialeViewModel.Listener, ITitledFragment {
 
     @Inject
     ProdVersamentoMaterialeViewModel mViewModel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
     private FragmentProdVersamentoMaterialeBinding mBinding;
 
     private final ObservableField<MtbColt> mCurrentMtbColt = new ObservableField<>();
+    private final ObservableField<Boolean> mCurrentMtbColtSet = new ObservableField<>(false);
     private final ObservableArrayList<VersamentoMerceOrdineLavListModel> mCurrentOrders = new ObservableArrayList<>();
 
     public final BindableString codPrimaryArt = new BindableString();
@@ -62,6 +75,8 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
     public final ObservableField<Boolean> fabVisible = new ObservableField<>(false);
 
 
+    private int barcodeScannerIstanceID = -1;
+
     public ProdVersamentoMaterialeFragment() {
         // Required empty public constructor
     }
@@ -98,12 +113,15 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
         this.mViewModel.init(SettingsManager.iDB().isFlagVersamentoDirettoProduzione());
 
         this.initView();
-        this.openLU();
+        this.initBarcodeReader();
     }
 
     private void initView() {
         this.mViewModel.getOpenedOrderLavMutableLiveList().observe(getViewLifecycleOwner(), this::refreshList);
-        this.mViewModel.getMtbColtMutableLiveData().observe(getViewLifecycleOwner(), this.mCurrentMtbColt::set);
+        this.mViewModel.getMtbColtMutableLiveData().observe(getViewLifecycleOwner(), value -> {
+            this.mCurrentMtbColt.set(value);
+            this.mCurrentMtbColtSet.set(true);
+        });
 
         this.mViewModel.getMtbColrMutableLiveData().observe(getViewLifecycleOwner(), firstMtbColr -> {
             codPrimaryArt.set(firstMtbColr.getCodMart());
@@ -173,36 +191,45 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
                 .toList();
     }
 
-    private void openLU() {
-        DialogScanOrCreateLUView.newInstance(false, false, true, false, true, (mtbColt, created) -> {
-            if (mtbColt == null) {
-                popMe();
-            } else if ((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE || mtbColt.getGestioneEnum() == GestioneEnum.VENDITA) && mtbColt.getSegno().equals(+1)) {
 
-                if (mtbColt.getMtbColr() == null || mtbColt.getMtbColr().size() == 0) {
-                    DialogSimpleMessageView.makeWarningDialog(
-                                    new SpannableString(Html.fromHtml("E' stata scansionata una UL già vuota")),
-                                    null, this::openLU)
-                            .show((requireActivity()).getSupportFragmentManager(), "tag");
+    private void initBarcodeReader() {
+        barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessful(mViewModel::processBarcodeDTO)
+                .setOnScanFailed(this::onError));
 
-                } else {
-                    mViewModel.setMtbColt(mtbColt);
-                    choosePosition();
-                }
-
-            } else {
-                this.onError(new Exception("Sono accettate solamente UL di <b>Acquisto</b> o <b>Lavorazione</b> di <b>CARICO</b>"));
-            }
-        }).show(requireActivity().getSupportFragmentManager(), "tag");
+        BarcodeManager.enable();
     }
 
-    private void choosePosition() {
+//    private void openLU() {
+//        DialogScanOrCreateLUView.newInstance(false, false, true, false, true, (mtbColt, created) -> {
+//            if (mtbColt == null) {
+//                popMe();
+//            } else if ((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE || mtbColt.getGestioneEnum() == GestioneEnum.VENDITA) && mtbColt.getSegno().equals(+1)) {
+//
+//                if (mtbColt.getMtbColr() == null || mtbColt.getMtbColr().size() == 0) {
+//                    DialogSimpleMessageView.makeWarningDialog(
+//                                    new SpannableString(Html.fromHtml("E' stata scansionata una UL già vuota")),
+//                                    null, this::openLU)
+//                            .show((requireActivity()).getSupportFragmentManager(), "tag");
+//
+//                } else {
+//                    mViewModel.setMtbColt(mtbColt);
+//                    choosePosition();
+//                }
+//
+//            } else {
+//                this.onError(new Exception("Sono accettate solamente UL di <b>Acquisto</b> o <b>Lavorazione</b> di <b>CARICO</b>"));
+//            }
+//        }).show(requireActivity().getSupportFragmentManager(), "tag");
+//    }
+
+    private void choosePosition(RunnableArgs<MtbDepoPosizione> onComplete) {
         DialogAskPositionOfLUView.makeBase(false, (status, mtbDepoPosizione) -> {
 
                     if (status == DialogConsts.Results.ABORT) {
                         popMe();
                     } else {
-                        mViewModel.setPosizione(mtbDepoPosizione);
+                        onComplete.run(mtbDepoPosizione);
                     }
 
                 }, this::onError)
@@ -315,6 +342,12 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
     }
 
 
+
+
+    public ObservableField<Boolean> isCurrentMtbColtSettedObservable() {
+        return mCurrentMtbColtSet;
+    }
+
     @Override
     public void onCreateActionBar(AppCompatTextView titleText, Context context) {
         titleText.setText(context.getText(R.string.prod_versamento_materiale_title_fragment).toString());
@@ -322,7 +355,47 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
 
     @Override
     public void requestLUOpen() {
-        this.openLU();
+//        this.openLU();
+    }
+
+    @Override
+    public void onRequestChoosePosition(RunnableArgs<MtbDepoPosizione> onComplete) {
+        choosePosition(onComplete);
+    }
+
+    @Override
+    public void onItemDispatched(PickingObjectDTO pickingObjectDTO, MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, BigDecimal initialQtaTot, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable, BigDecimal qtaCnfAvailable, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, String partitaMag, LocalDate dataScad, boolean canOverflowOrderQuantity, boolean canPartitaMagBeChanged, RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
+        DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
+                .setMtbAart(mtbAart)
+                .setInitialNumCnf(initialNumCnf)
+                .setInitialQtaCnf(initialQtaCnf)
+                .setInitialQtaTot(initialQtaTot)
+                .setTotalQtaAvailable(totalQtaAvailable)
+                .setTotalNumCnfAvailable(totalNumCnfAvailable)
+                .setQtaCnfAvailable(qtaCnfAvailable)
+                .setTotalQtaToBeTaken(totalQtaToBeTaken)
+                .setTotalNumCnfToBeTaken(totalNumCnfToBeTaken)
+                .setQtaCnfToBeTaken(qtaCnfToBeTaken)
+                .setPartitaMag(partitaMag)
+                .setDataScad(dataScad)
+                .setCanOverflowOrderQuantity(canOverflowOrderQuantity)
+                .setCanPartitaMagBeChanged(canPartitaMagBeChanged);
+
+        if (!mDialogInputQuantityV2View.isVisible())
+            mDialogInputQuantityV2View.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                    .setOnComplete((resultDTO, shouldCloseLU) -> {
+                        PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
+                                .setNumCnf(resultDTO.getNumCnf())
+                                .setQtaCnf(resultDTO.getQtaCnf())
+                                .setQtaTot(resultDTO.getQtaTot())
+                                .setPartitaMag(resultDTO.getPartitaMag())
+                                .setDataScad(resultDTO.getDataScad());
+
+                        this.onLoadingStarted();
+                        onComplete.run(pickedQuantityDTO, shouldCloseLU);
+                    })
+                    .setOnAbort(this::onLoadingEnded)
+                    .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeModule.java

@@ -2,15 +2,24 @@ package it.integry.integrywmsnative.gest.prod_versamento_materiale;
 
 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 
 @Module(subcomponents = ProdVersamentoMaterialeComponent.class)
 public class ProdVersamentoMaterialeModule {
 
     @Provides
-    ProdVersamentoMaterialeViewModel providesProdVersamentoMaterialeViewModel(ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, MesRESTConsumer mesRESTConsumer) {
-        return new ProdVersamentoMaterialeViewModel(colliMagazzinoRESTConsumer, mesRESTConsumer);
+    ProdVersamentoMaterialeViewModel providesProdVersamentoMaterialeViewModel(PosizioniRESTConsumer posizioniRESTConsumer,
+                                                                              ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
+                                                                              ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
+                                                                              MesRESTConsumer mesRESTConsumer,
+                                                                              BarcodeRESTConsumer barcodeRESTConsumer,
+                                                                              ArticoloRESTConsumer articoloRESTConsumer) {
+        return new ProdVersamentoMaterialeViewModel(posizioniRESTConsumer, colliMagazzinoRESTConsumer, colliLavorazioneRESTConsumer, mesRESTConsumer, barcodeRESTConsumer, articoloRESTConsumer);
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeViewModel.java

@@ -2,28 +2,53 @@ package it.integry.integrywmsnative.gest.prod_versamento_materiale;
 
 import androidx.lifecycle.MutableLiveData;
 
+import com.annimon.stream.Stream;
+
 import org.jetbrains.annotations.NotNull;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Iterator;
 import java.util.List;
 
 import javax.inject.Inject;
 
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.exception.NoLUFoundException;
+import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
+import it.integry.integrywmsnative.core.exception.TooManyLUFoundInMonoLUPositionException;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.Ean128Model;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
+import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGException;
+import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
+import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 
 public class ProdVersamentoMaterialeViewModel {
 
+    private final PosizioniRESTConsumer mPosizioniRESTConsumer;
     private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
+    private final ColliLavorazioneRESTConsumer mColliLavorazioneRESTConsumer;
     private final MesRESTConsumer mMesRESTConsumer;
+    private final BarcodeRESTConsumer mBarcodeRESTConsumer;
+    private final ArticoloRESTConsumer mArticoloRESTConsumer;
 
     private boolean mFlagVersamentoDirettoProduzione;
 
@@ -35,9 +60,18 @@ public class ProdVersamentoMaterialeViewModel {
     private Listener mListener;
 
     @Inject
-    public ProdVersamentoMaterialeViewModel(ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, MesRESTConsumer mesRESTConsumer) {
+    public ProdVersamentoMaterialeViewModel(PosizioniRESTConsumer posizioniRESTConsumer,
+                                            ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
+                                            ColliLavorazioneRESTConsumer colliLavorazioneRESTConsumer,
+                                            MesRESTConsumer mesRESTConsumer,
+                                            BarcodeRESTConsumer barcodeRESTConsumer,
+                                            ArticoloRESTConsumer articoloRESTConsumer) {
+        this.mPosizioniRESTConsumer = posizioniRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
+        this.mColliLavorazioneRESTConsumer = colliLavorazioneRESTConsumer;
         this.mMesRESTConsumer = mesRESTConsumer;
+        this.mBarcodeRESTConsumer = barcodeRESTConsumer;
+        this.mArticoloRESTConsumer = articoloRESTConsumer;
     }
 
 
@@ -46,8 +80,213 @@ public class ProdVersamentoMaterialeViewModel {
     }
 
 
-    public void setMtbColt(MtbColt mtbColt) {
+    public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) {
+        if (UtilityBarcode.isEtichettaPosizione(barcodeScanDTO)) {
+            this.executeEtichettaPosizione(barcodeScanDTO);
+        } else if (UtilityBarcode.isEtichettaAnonima(barcodeScanDTO)) {
+            this.executeEtichettaLU(barcodeScanDTO.getStringValue());
+        } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
+            this.executeEtichettaEan128(barcodeScanDTO);
+        } else if (UtilityBarcode.isEan13(barcodeScanDTO)) {
+//            this.executeEAN13(barcodeScanDTO);
+        }
+    }
+
+
+    private void executeEtichettaPosizione(BarcodeScanDTO barcodeScanDTO) {
+
+        MtbDepoPosizione foundPosizione = Stream.of(SettingsManager.iDB().getAvailablePosizioni())
+                .filter(x -> x.getPosizione().equalsIgnoreCase(barcodeScanDTO.getStringValue()))
+                .single();
+        this.executePosizione(foundPosizione);
+
+    }
+
+    private void executePosizione(MtbDepoPosizione posizione) {
+        this.mPosizioniRESTConsumer.getBancaliInPosizione(posizione, mtbColtList -> {
+
+            if (mtbColtList == null || mtbColtList.size() == 0) {
+                this.sendError(new NoLUFoundException());
+            } else if (mtbColtList.size() == 1) {
+                this.mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> {
+                    this.onLUOpened(mtbColt);
+                }, this::sendError);
+            } else {
+                this.sendError(new TooManyLUFoundInMonoLUPositionException());
+            }
+
+        }, this::sendError);
+    }
+
+
+    private void executeEtichettaLU(String sscc) {
+        this.mColliMagazzinoRESTConsumer.getBySSCC(sscc, true, false, mtbColt -> {
+
+            this.onLUOpened(mtbColt);
+
+        }, this::sendError);
+    }
+
+
+    private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO) {
+        mBarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> {
+
+            String barcodeProd = null;
+
+            if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc;
+            if (!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin;
+            if (!UtilityString.isNullOrEmpty(ean128Model.Content))
+                barcodeProd = ean128Model.Content;
+
+
+            if (!UtilityString.isNullOrEmpty(barcodeProd)) {
+
+                if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
+                    this.executeEtichettaLU(ean128Model.Sscc);
+                } else if (!UtilityString.isNullOrEmpty(barcodeProd)) {
+                    this.loadArticolo(barcodeProd, ean128Model);
+                } else {
+                    this.sendError(new NoLUFoundException());
+                }
+
+
+            } else {
+                //EAN 128 non completo o comunque mancano i riferimenti al prodotto
+                this.sendError(new NoLUFoundException());
+            }
+        }, this::sendError);
+    }
+
+    private void loadArticolo(String barcodeProd, Ean128Model ean128Model) {
+        mArticoloRESTConsumer.searchByBarcode(barcodeProd, mtbAartList -> {
+            if (mtbAartList != null && mtbAartList.size() > 0) {
+                MtbAart articolo = mtbAartList.get(0);
+                this.dispatchArt(articolo, ean128Model);
+
+            } else {
+                this.sendError(new NoResultFromBarcodeException(barcodeProd));
+            }
+
+        }, this::sendError);
+    }
+
+
+    private void dispatchArt(MtbAart mtbAart, Ean128Model ean128Model) {
+        PickingObjectDTO pickingObjectDTO = new PickingObjectDTO()
+                .setMtbAart(mtbAart)
+                .setTempPickData(PickDataDTO.fromEan128(ean128Model));
+
+        BigDecimal numCnfDaPrelevare = null;
+        BigDecimal qtaColDaPrelevare = null;
+        BigDecimal qtaCnfDaPrelevare = null;
+
+        BigDecimal initialNumCnf;
+        BigDecimal initialQtaCnf;
+        BigDecimal initialQtaTot;
+
+        String partitaMag = null;
+        LocalDate dataScad = null;
+
+        if (pickingObjectDTO.getTempPickData() != null && pickingObjectDTO.getTempPickData().getManualPickDTO() != null) {
+            //Oppure le info del barcode scansionato
+            PickDataDTO.ManualPickDTO manualPickDTO = pickingObjectDTO.getTempPickData().getManualPickDTO();
+
+            qtaColDaPrelevare = manualPickDTO.getQtaTot();
+            numCnfDaPrelevare = manualPickDTO.getNumCnf();
+
+            if (mtbAart.isFlagQtaCnfFissaBoolean()) {
+                qtaCnfDaPrelevare = mtbAart.getQtaCnf();
+
+                if (manualPickDTO.isEanPeso()) {
+                    if (mtbAart.getUntMisRifPeso() == MtbAart.UntMisRifPesoEnum.M) {
+                        if (UtilityBigDecimal.equalsTo(mtbAart.getPesoKg(), BigDecimal.ZERO)) {
+                            this.sendError(new InvalidPesoKGException());
+                        } else {
+                            qtaColDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, mtbAart.getPesoKg());
+                        }
+                    }
+                }
+
+            } else if (qtaColDaPrelevare != null && numCnfDaPrelevare != null) {
+                qtaCnfDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, numCnfDaPrelevare);
+            }
+
+
+            if (qtaColDaPrelevare != null && numCnfDaPrelevare == null) {
+                if (!mtbAart.isFlagQtaCnfFissaBoolean()) {
+                    numCnfDaPrelevare = UtilityBigDecimal.divideAndRoundToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf());
+                    if (UtilityBigDecimal.equalsTo(numCnfDaPrelevare, BigDecimal.ZERO))
+                        numCnfDaPrelevare = BigDecimal.ONE;
+                    qtaCnfDaPrelevare = UtilityBigDecimal.divide(qtaColDaPrelevare, numCnfDaPrelevare);
+                } else {
+                    numCnfDaPrelevare = UtilityBigDecimal.divideToInteger(qtaColDaPrelevare, mtbAart.getQtaCnf());
+                }
+
+            } else if (numCnfDaPrelevare != null && qtaColDaPrelevare == null) {
+                qtaCnfDaPrelevare = mtbAart.getQtaCnf();
+                qtaColDaPrelevare = UtilityBigDecimal.multiply(numCnfDaPrelevare, qtaCnfDaPrelevare);
+            }
+
+            if (manualPickDTO.getMtbPartitaMag() != null) {
+                partitaMag = manualPickDTO.getMtbPartitaMag().getPartitaMag();
+                dataScad = manualPickDTO.getMtbPartitaMag().getDataScad();
+            }
+
+            initialNumCnf = numCnfDaPrelevare;
+            initialQtaCnf = qtaCnfDaPrelevare;
+            initialQtaTot = qtaColDaPrelevare;
+        } else {
+            initialNumCnf = BigDecimal.ONE;
+            initialQtaCnf = mtbAart.getQtaCnf();
+            initialQtaTot = UtilityBigDecimal.multiply(initialNumCnf, initialQtaCnf);
+        }
+
+        if (numCnfDaPrelevare == null && qtaColDaPrelevare == null && initialNumCnf == null && initialQtaTot == null) {
+            initialNumCnf = BigDecimal.ONE;
+            initialQtaCnf = mtbAart.getQtaCnf();
+            initialQtaTot = UtilityBigDecimal.multiply(initialNumCnf, initialQtaCnf);
+        }
+
+
+
+
+        this.sendOnItemDispatched(
+                pickingObjectDTO,
+                mtbAart,
+                initialNumCnf,
+                initialQtaCnf,
+                initialQtaTot,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                partitaMag,
+                dataScad,
+                false,
+                true,
+                (pickedQuantityDTO, shouldCloseLU) -> {
+
+                    this.sendRequestChoosePosition(mtbDepoPosizione -> {
+
+                        mColliLavorazioneRESTConsumer.createColloScaricoDaArticolo(mtbAart,
+                                pickedQuantityDTO.getPartitaMag(),
+                                mtbDepoPosizione,
+                                pickedQuantityDTO.getQtaTot(),
+                                pickedQuantityDTO.getQtaCnf(),
+                                pickedQuantityDTO.getNumCnf(),
+                                null, null,
+                                this::sendOnDataSaved,
+                                this::sendError);
+                    });
+
+                });
+    }
+
+    private void onLUOpened(MtbColt mtbColt) {
         this.mtbColtMutableLiveData.setValue(mtbColt);
+        this.sendRequestChoosePosition(this::setPosizione);
     }
 
 
@@ -77,7 +316,7 @@ public class ProdVersamentoMaterialeViewModel {
                         mtbDepoPosizione.getPosizione(),
                         getIdMaterialeFromCollo(mtbColt),
                         ordini -> {
-                            if(ordini == null || ordini.isEmpty())
+                            if (ordini == null || ordini.isEmpty())
                                 this.sendError(new Exception("Nessun ordine compatibile con " + getIdMaterialeFromCollo(mtbColt) + " sulla linea " + mtbDepoPosizione.getPosizione()), true);
                             else {
                                 setCurrentOrders(ordini, mtbColt.getMtbColr().get(0));
@@ -104,7 +343,6 @@ public class ProdVersamentoMaterialeViewModel {
     }
 
 
-
     private String getIdMaterialeFromCollo(MtbColt mtbColt) {
         MtbAart articolo = mtbColt.getMtbColr().get(0).getMtbAart();
         return UtilityString.isNullOrEmpty(articolo.getIdArtEqui()) ? articolo.getCodMart() : articolo.getIdArtEqui();
@@ -139,7 +377,6 @@ public class ProdVersamentoMaterialeViewModel {
     }
 
 
-
     public void save(List<OrdineLavorazioneDTO> selectedOrders) {
         this.sendOnLoadingStarted();
 
@@ -154,16 +391,6 @@ public class ProdVersamentoMaterialeViewModel {
     }
 
 
-
-
-
-
-
-
-
-
-
-
     public MutableLiveData<MtbColt> getMtbColtMutableLiveData() {
         return mtbColtMutableLiveData;
     }
@@ -186,6 +413,10 @@ public class ProdVersamentoMaterialeViewModel {
         if (this.mListener != null) mListener.requestLUOpen();
     }
 
+    private void sendRequestChoosePosition(RunnableArgs<MtbDepoPosizione> onComplete) {
+        if (this.mListener != null) mListener.onRequestChoosePosition(onComplete);
+    }
+
     private void sendOnLoadingStarted() {
         if (this.mListener != null) mListener.onLoadingStarted();
     }
@@ -194,6 +425,40 @@ public class ProdVersamentoMaterialeViewModel {
         if (this.mListener != null) mListener.onLoadingEnded();
     }
 
+    private void sendOnItemDispatched(PickingObjectDTO pickingObjectDTO,
+                                      MtbAart mtbAart,
+                                      BigDecimal initialNumCnf,
+                                      BigDecimal initialQtaCnf,
+                                      BigDecimal initialQtaTot,
+                                      BigDecimal totalQtaAvailable,
+                                      BigDecimal totalNumCnfAvailable,
+                                      BigDecimal qtaCnfAvailable,
+                                      BigDecimal totalQtaToBeTaken,
+                                      BigDecimal totalNumCnfToBeTaken,
+                                      BigDecimal qtaCnfToBeTaken,
+                                      String partitaMag,
+                                      LocalDate dataScad,
+                                      boolean canOverflowOrderQuantity,
+                                      boolean canPartitaMagBeChanged,
+                                      RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
+        if (this.mListener != null) mListener.onItemDispatched(pickingObjectDTO,
+                mtbAart,
+                initialNumCnf,
+                initialQtaCnf,
+                initialQtaTot,
+                totalQtaAvailable,
+                totalNumCnfAvailable,
+                qtaCnfAvailable,
+                totalQtaToBeTaken,
+                totalNumCnfToBeTaken,
+                qtaCnfToBeTaken,
+                partitaMag,
+                dataScad,
+                canOverflowOrderQuantity,
+                canPartitaMagBeChanged,
+                onComplete);
+    }
+
     private void sendWarning(String warningText, Runnable action) {
         if (this.mListener != null) mListener.onWarning(warningText, action);
     }
@@ -214,6 +479,25 @@ public class ProdVersamentoMaterialeViewModel {
 
         void requestLUOpen();
 
+        void onRequestChoosePosition(RunnableArgs<MtbDepoPosizione> onComplete);
+
+        void onItemDispatched(PickingObjectDTO pickingObjectDTO,
+                              MtbAart mtbAart,
+                              BigDecimal initialNumCnf,
+                              BigDecimal initialQtaCnf,
+                              BigDecimal initialQtaTot,
+                              BigDecimal totalQtaAvailable,
+                              BigDecimal totalNumCnfAvailable,
+                              BigDecimal qtaCnfAvailable,
+                              BigDecimal totalQtaToBeTaken,
+                              BigDecimal totalNumCnfToBeTaken,
+                              BigDecimal qtaCnfToBeTaken,
+                              String partitaMag,
+                              LocalDate dataScad,
+                              boolean canOverflowOrderQuantity,
+                              boolean canPartitaMagBeChanged,
+                              RunnableArgss<PickedQuantityDTO, Boolean> onComplete);
+
         void onError(Exception ex, boolean requestClose);
 
         void onWarning(String warningText, Runnable action);

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java

@@ -849,6 +849,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 .setPartitaMag(partitaMag)
                 .setDataScad(dataScad)
                 .setCanOverflowOrderQuantity(canOverflowOrderQuantity)
+                .setWarnOnQuantityOverflow(SettingsManager.iDB().isFlagOverflowQuantityWarning())
                 .setCanLUBeClosed(true)
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
                 .setStatoPartitaMag(pickingObjectDTO != null ? pickingObjectDTO.getStatoArticoloDTO() : null)

app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java

@@ -1,8 +1,6 @@
 package it.integry.integrywmsnative.ui;
 
-import android.animation.LayoutTransition;
 import android.content.Context;
-import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -10,6 +8,8 @@ import android.view.animation.Animation;
 import android.view.animation.Interpolator;
 import android.view.animation.Transformation;
 
+import androidx.viewpager.widget.ViewPager;
+
 public class DeactivatableViewPager extends ViewPager implements Animation.AnimationListener {
 
     private View mCurrentView;
@@ -57,7 +57,7 @@ public class DeactivatableViewPager extends ViewPager implements Animation.Anima
                 height = getMinimumHeight();
             }
 
-            int displayHeight = (int)(getResources().getDisplayMetrics().heightPixels*0.77);
+            int displayHeight = (int)(getResources().getDisplayMetrics().heightPixels*0.5);
 
             if(height > displayHeight) height = displayHeight;
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java

@@ -44,6 +44,7 @@ public class DialogInputQuantityV2DTO {
     private boolean saveOnImeDone = false;
     private boolean notifyProductLotStatus = false;
     private boolean disableTracciabilitaCheck = false;
+    private boolean warnOnQuantityOverflow = false;
 
     private StatoArticoloDTO statoPartitaMag;
 
@@ -54,6 +55,8 @@ public class DialogInputQuantityV2DTO {
 
     private boolean canOverflowOrderQuantity;
 
+    private String customArtDescription;
+
     public MtbAart getMtbAart() {
         return mtbAart;
     }
@@ -359,4 +362,22 @@ public class DialogInputQuantityV2DTO {
         this.disableTracciabilitaCheck = disableTracciabilitaCheck;
         return this;
     }
+
+    public String getCustomArtDescription() {
+        return customArtDescription;
+    }
+
+    public DialogInputQuantityV2DTO setCustomArtDescription(String customArtDescription) {
+        this.customArtDescription = customArtDescription;
+        return this;
+    }
+
+    public boolean isWarnOnQuantityOverflow() {
+        return warnOnQuantityOverflow;
+    }
+
+    public DialogInputQuantityV2DTO setWarnOnQuantityOverflow(boolean warnOnQuantityOverflow) {
+        this.warnOnQuantityOverflow = warnOnQuantityOverflow;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java

@@ -48,6 +48,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityFocus;
 import it.integry.integrywmsnative.core.utility.UtilityObservable;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.DialogInputQuantityV2Binding;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
@@ -151,6 +152,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
 
         this.mViewModel
                 .setMtbAart(mDialogInputQuantityV2DTO.getMtbAart())
+                .setArtDescription(UtilityString.isNull(mDialogInputQuantityV2DTO.getCustomArtDescription(), mDialogInputQuantityV2DTO.getMtbAart().getDescrizioneEstesa()))
                 .setInitialNumCnf(mDialogInputQuantityV2DTO.getInitialNumCnf())
                 .setInitialQtaCnf(mDialogInputQuantityV2DTO.getInitialQtaCnf())
                 .setInitialQtaTot(mDialogInputQuantityV2DTO.getInitialQtaTot())
@@ -168,6 +170,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                 .setTotalQtaAvailable(mDialogInputQuantityV2DTO.getTotalQtaAvailable())
                 .setCanInputZeroQuantity(mDialogInputQuantityV2DTO.isCanInputZeroQuantity())
                 .setCanOverflowOrderQuantity(mDialogInputQuantityV2DTO.isCanOverflowOrderQuantity())
+                .setWarnOnQuantityOverflow(mDialogInputQuantityV2DTO.isWarnOnQuantityOverflow())
                 .setQtaCnfAvailable(mDialogInputQuantityV2DTO.getQtaCnfAvailable())
                 .setPartitaMag(mDialogInputQuantityV2DTO.getPartitaMag())
                 .setNote(mDialogInputQuantityV2DTO.getNote())
@@ -254,19 +257,23 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
     };
 
     public void save() {
-        if (this.mViewModel.validate()) {
-            this.mAbort = false;
-            dismiss();
-            this.mOnComplete.run(this.mViewModel.getResult(), false);
-        }
+        this.mViewModel.validate(validated -> {
+            if (validated) {
+                this.mAbort = false;
+                dismiss();
+                this.mOnComplete.run(this.mViewModel.getResult(), false);
+            }
+        });
     }
 
     public void saveAndCloseLU() {
-        if (this.mViewModel.validate()) {
-            this.mAbort = false;
-            dismiss();
-            this.mOnComplete.run(this.mViewModel.getResult(), true);
-        }
+        this.mViewModel.validate(validated -> {
+            if (validated) {
+                this.mAbort = false;
+                dismiss();
+                this.mOnComplete.run(this.mViewModel.getResult(), true);
+            }
+        });
     }
 
 //    @Override
@@ -530,4 +537,13 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                 .makeErrorDialog(new SpannableString(Html.fromHtml(ex.getMessage())), null, null)
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
+
+    @Override
+    public void onWarning(String text, RunnableArgs<Boolean> result) {
+        DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(text)),
+                    null,
+                    () -> result.run(true),
+                    () -> result.run(false)
+            ).show(requireActivity().getSupportFragmentManager(), "tag");
+    }
 }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java

@@ -3,11 +3,14 @@ package it.integry.integrywmsnative.view.dialogs.input_quantity_v2;
 import androidx.databinding.ObservableField;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 
 import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.di.BindableString;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgsWithReturn;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
@@ -32,6 +35,7 @@ public class DialogInputQuantityV2ViewModel {
     private final int UPDATE_QTA_TOT = 2;
 
     public ObservableField<MtbAart> mtbAart = new ObservableField<>();
+    public BindableString artDescription = new BindableString();
 
     public ObservableField<Boolean> blockedNumCnf = new ObservableField<>();
     public ObservableField<Boolean> blockedQtaCnf = new ObservableField<>();
@@ -78,6 +82,7 @@ public class DialogInputQuantityV2ViewModel {
     private int onNumCnfInputChanged;
     private int onQtaTotInputChanged;
     private boolean disableTracciabilitaCheck;
+    private boolean warnOnQuantityOverflow;
 
     private Listener mListener;
 
@@ -236,6 +241,11 @@ public class DialogInputQuantityV2ViewModel {
         return this;
     }
 
+    public DialogInputQuantityV2ViewModel setArtDescription(String artDescription) {
+        this.artDescription.set(artDescription);
+        return this;
+    }
+
     public DialogInputQuantityV2ViewModel setInitialNumCnf(BigDecimal initialNumCnf) {
         this.initialNumCnf = initialNumCnf;
         return this;
@@ -326,6 +336,11 @@ public class DialogInputQuantityV2ViewModel {
         return this;
     }
 
+    public DialogInputQuantityV2ViewModel setWarnOnQuantityOverflow(boolean warnOnQuantityOverflow) {
+        this.warnOnQuantityOverflow = warnOnQuantityOverflow;
+        return this;
+    }
+
     public DialogInputQuantityV2ViewModel setCanPartitaMagBeChanged(boolean canPartitaMagBeChanged) {
         this.canPartitaMagBeChanged = canPartitaMagBeChanged;
         return this;
@@ -450,11 +465,12 @@ public class DialogInputQuantityV2ViewModel {
         this.blockedQtaTot.set(false);
     }
 
-    public boolean validate() {
+    public void validate(RunnableArgs<Boolean> onValidated) {
         if (this.internalQtaCnf == null || UtilityBigDecimal.equalsTo(this.internalQtaCnf, BigDecimal.ZERO)) {
 
             this.mListener.onError(new InvalidQtaCnfQuantityException());
-            return false;
+            onValidated.run(false);
+            return;
         }
 
         if (!disableTracciabilitaCheck && mtbAart.get().isFlagTracciabilitaBoolean() && UtilityString.isNullOrEmpty(internalPartitaMag)) {
@@ -462,51 +478,59 @@ public class DialogInputQuantityV2ViewModel {
                 internalPartitaMag = suggestPartitaMagRunnable.run(this);
                 if (internalPartitaMag == null) {
                     this.mListener.onError(new InvalidBatchLotException());
-                    return false;
+                    onValidated.run(false);
+                    return;
                 }
             } else {
                 this.mListener.onError(new InvalidBatchLotException());
-                return false;
+                onValidated.run(false);
+                return;
             }
         }
 
         if (this.shouldAskDataScad && UtilityString.isNullOrEmpty(internalPartitaMag)) {
 
             this.mListener.onError(new InvalidBatchLotException());
-            return false;
+            onValidated.run(false);
+            return;
         }
 
         if (this.shouldAskDataScad && this.internalDataScad == null) {
 
             this.mListener.onError(new InvalidExpireDateException());
-            return false;
+            onValidated.run(false);
+            return;
         }
 
         if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaOrd) &&
                 this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
 
             this.mListener.onError(new OverflowQtaTotOrderedQuantityException());
-            return false;
+            onValidated.run(false);
+            return;
         }
 
         if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfOrd) &&
                 !this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
 
             this.mListener.onError(new OverflowNumCnfOrderedQuantityException());
-            return false;
+            onValidated.run(false);
+            return;
         }
 
         if (UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaAvailable)) {
 
             this.mListener.onError(new OverflowQtaTotAvailableQuantityException());
-            return false;
+            onValidated.run(false);
+            return;
         }
 
         if (UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfAvailable) &&
                 !this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
 
             this.mListener.onError(new OverflowNumCnfAvailableQuantityException());
-            return false;
+            onValidated.run(false);
+            return;
         }
 
         if (!this.canInputZeroQuantity && (this.internalNumCnf == null || this.internalQtaCnf == null || this.internalQtaTot == null ||
@@ -515,17 +539,36 @@ public class DialogInputQuantityV2ViewModel {
                 UtilityBigDecimal.equalsOrLowerThan(this.internalQtaTot, BigDecimal.ZERO))) {
 
             this.mListener.onError(new InvalidQuantityException());
-            return false;
+            onValidated.run(false);
+            return;
         }
 
         if (this.isNoteMandatory() && (this.internalNote == null || this.internalNote.length() <= 0)) {
             this.mListener.onError(new InvalidNotesException());
-            return false;
+            onValidated.run(false);
+            return;
         }
 
         if (!UtilityString.isNullOrEmpty(this.internalPartitaMag))
             this.internalPartitaMag = this.internalPartitaMag.toUpperCase();
-        return true;
+
+        //Gli ultimi due controlli sono in coda a causa della callBack di onWarning, non eseguirebbe i controlli messi dopo
+
+        if (this.warnOnQuantityOverflow && UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaOrd) &&
+                this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
+
+            this.mListener.onWarning("Hai inserito una quantità superiore rispetto a quella presente nell'ordine. <br>Continuare?", onValidated);
+            return;
+        }
+
+        if (this.warnOnQuantityOverflow && UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfOrd) &&
+                !this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
+
+            this.mListener.onWarning("Hai inserito una quantità superiore rispetto a quella presente nell'ordine. <br>Continuare?", onValidated);
+            return;
+        }
+
+        onValidated.run(true);
     }
 
     public DialogInputQuantityV2ResultDTO getResult() {
@@ -536,7 +579,6 @@ public class DialogInputQuantityV2ViewModel {
                 .setQtaCnf(this.internalQtaCnf)
                 .setNote(this.internalNote)
                 .setQtaTot(this.internalQtaTot);
-
     }
 
     public void setListener(Listener listener) {
@@ -570,5 +612,6 @@ public class DialogInputQuantityV2ViewModel {
         void onDataChanged();
 
         void onError(Exception ex);
+        void onWarning(String text, RunnableArgs<Boolean> result);
     }
 }

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

@@ -147,6 +147,18 @@
                     android:textSize="16sp"
                     tools:text="DESCRIZIONE" />
 
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/descrizione_sub_1"
+                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginTop="2dp"
+                    android:layout_toStartOf="@id/secondary_unt_mis"
+                    android:layout_below="@+id/descrizione"
+                    android:textColor="@android:color/black"
+                    android:textSize="14sp"
+                    tools:text="DATA ORD" />
 
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:id="@+id/secondary_unt_mis"

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

@@ -23,7 +23,7 @@
         <it.integry.integrywmsnative.ui.DeactivatableViewPager
             android:id="@+id/viewpager"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:animateLayoutChanges="true">
 

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

@@ -108,7 +108,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
                         android:singleLine="false"
-                        android:text="@{viewmodel.mtbAart.descrizioneEstesa}"
+                        android:text="@{viewmodel.artDescription}"
                         tools:text="RAD 25 D H/L 200 - 10 EL B BIANCO" />
 
 

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

@@ -21,19 +21,47 @@
         app:cardCornerRadius="12dp"
         app:cardElevation="0dp">
 
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:reverse_visibility="@{view.isCurrentMtbColtSettedObservable()}"
+            tools:visibility="visible"
+            android:gravity="center_vertical">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal"
+                android:gravity="center_horizontal">
+
+
+                <ProgressBar
+                    android:id="@+id/progressBar"
+                    style="?android:attr/progressBarStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/MaterialAlertDialog.Material3.Body.Text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="12dp"
+                    android:gravity="center_horizontal"
+                    android:text="Scansiona un codice a barre per iniziare" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/title_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/TextViewMaterial.Dialog.HeadlineText"
-                android:text="@string/distribute_ul"
-                android:gravity="center_horizontal"/>
+            android:orientation="vertical"
+            app:visibility="@{view.isCurrentMtbColtSettedObservable()}"
+            tools:visibility="gone">
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"

build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.0'
-        agp_version = '8.1.1'
+        agp_version = '8.1.4'
     }
 
     repositories {