Finish v1.13.24(170)

app/build.gradle

@@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 167
+    def appVersionCode = 170
-    def appVersionName = '1.13.21'
+    def appVersionName = '1.13.24'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/rest/PickingResiRESTConsumer.java

@@ -99,7 +99,7 @@ public class PickingResiRESTConsumer {
                 "      ,dtb_docr.[qta_doc2]" +
                 "      ,dtb_docr.[unt_doc3]" +
                 "      ,dtb_docr.[qta_doc3]" +
-                "      ,dtb_docr.[num_cnf]" +
+                "      ,dtb_docr.[num_cnf] - ISNULL(mtb_colr.num_cnf, 0) AS num_cnf" +
                 "      ,dtb_docr.[peso_lordo]" +
                 "      ,dtb_docr.[posizione]" +
                 "      ,dtb_docr.[cod_anag_comp]" +

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

@@ -648,7 +648,23 @@ public class SpedizioneViewModel {
         if (matchedRows == null || matchedRows.size() == 0) {
             this.sendError(new NoArtsFoundException());
         } else if (matchedRows.size() == 1) {
-            this.dispatchOrdineRow(matchedRows.get(0), matchedRows.get(0).getRefMtbColt());
+            PickingObjectDTO matchedItem = matchedRows.get(0);
+
+
+            if (matchedItem.getMtbColts() != null && matchedItem.getMtbColts().size() > 1) {
+
+                List<PickingObjectDTO> pickingList = mPickingList.getValue();
+
+                Stream.of(pickingList)
+                        .filter(x -> x != matchedItem)
+                        .forEach(x -> x.setHidden(true));
+
+                this.sendFilterApplied(null);
+                this.getPickingList().postValue(pickingList);
+            } else {
+                this.dispatchOrdineRow(matchedItem, matchedItem.getRefMtbColt());
+            }
+
         } else {
             List<PickingObjectDTO> pickingList = mPickingList.getValue();
 
@@ -1201,15 +1217,17 @@ public class SpedizioneViewModel {
                     .setMtbAart(pickingObjectDTO.getMtbAart());
 
 
-            mtbColr.setRefMtbColr(new MtbColr()
+            if(mEnableGiacenza) {
-                    .setCodMart(mtbColr.getCodMart())
+                mtbColr.setRefMtbColr(new MtbColr()
-                    .setPartitaMag(mtbColr.getPartitaMag())
+                        .setCodMart(mtbColr.getCodMart())
-                    .setCodTagl(mtbColr.getCodTagl())
+                        .setPartitaMag(mtbColr.getPartitaMag())
-                    .setCodCol(mtbColr.getCodCol())
+                        .setCodTagl(mtbColr.getCodTagl())
-                    .setNumCollo(refMtbColt.getNumCollo())
+                        .setCodCol(mtbColr.getCodCol())
-                    .setDataCollo(refMtbColt.getDataColloS())
+                        .setNumCollo(refMtbColt.getNumCollo())
-                    .setSerCollo(refMtbColt.getSerCollo())
+                        .setDataCollo(refMtbColt.getDataColloS())
-                    .setGestione(refMtbColt.getGestione()));
+                        .setSerCollo(refMtbColt.getSerCollo())
+                        .setGestione(refMtbColt.getGestione()));
+            }
 
             pickingObjectDTO.getWithdrawMtbColrs().add(mtbColr);
             mCurrentMtbColt.getMtbColr().add(mtbColr);