Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/Popup_InfoArticolo

Browse Source
This commit is contained in:
Giuseppe Scorrano 2023-03-13 16:32:30 +01:00
commit 62f8ee61d3
3 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 344 def appVersionCode = 345
def appVersionName = '1.32.04' def appVersionName = '1.32.05'
signingConfigs { signingConfigs {
release { release {

18
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java
View File

@ -20,7 +20,6 @@ import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
import it.integry.integrywmsnative.core.CommonConst; import it.integry.integrywmsnative.core.CommonConst;
import it.integry.integrywmsnative.core.exception.AlreadyUsedAnonymousLabelException; import it.integry.integrywmsnative.core.exception.AlreadyUsedAnonymousLabelException;
import it.integry.integrywmsnative.core.exception.InvalidLUMultiGestioneException; import it.integry.integrywmsnative.core.exception.InvalidLUMultiGestioneException;
import it.integry.integrywmsnative.core.exception.InvalidOrderTypeException;
import it.integry.integrywmsnative.core.exception.LUScanNotGrantedException; import it.integry.integrywmsnative.core.exception.LUScanNotGrantedException;
import it.integry.integrywmsnative.core.exception.NoArtsFoundException; import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException; import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
@ -126,18 +125,13 @@ public class AccettazionePickingViewModel {
.distinctBy(x -> x) .distinctBy(x -> x)
.toList(); .toList();
if (foundGestioni != null) { if (foundGestioni.size() == 1) {
if (isOrdTrasf && (foundGestioni.get(0) == GestioneEnum.PRODUZIONE || foundGestioni.get(0) == GestioneEnum.LAVORAZIONE)) {
if (foundGestioni.size() == 1) { defaultGestioneOfUL = GestioneEnum.ACQUISTO;
if (isOrdTrasf && (foundGestioni.get(0) == GestioneEnum.PRODUZIONE || foundGestioni.get(0) == GestioneEnum.LAVORAZIONE)) { } else
defaultGestioneOfUL = GestioneEnum.ACQUISTO; defaultGestioneOfUL = foundGestioni.get(0) == GestioneEnum.PRODUZIONE ? GestioneEnum.LAVORAZIONE : foundGestioni.get(0);
} else
defaultGestioneOfUL = foundGestioni.get(0) == GestioneEnum.PRODUZIONE ? GestioneEnum.LAVORAZIONE : foundGestioni.get(0);
} else {
this.sendError(new InvalidLUMultiGestioneException());
}
} else { } else {
this.sendError(new InvalidOrderTypeException()); this.sendError(new InvalidLUMultiGestioneException());
} }
} }

15
app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoViewModel.java
View File

@ -32,24 +32,19 @@ public class ProdOrdineProduzioneElencoViewModel {
this.codMdep = codMdep; this.codMdep = codMdep;
this.sendOnLoadingStarted(); this.sendOnLoadingStarted();
new Thread(() -> {
mProdOrdineProduzioneRESTConsumer.getOrdiniInevasi(codMdep, orderList -> { mProdOrdineProduzioneRESTConsumer.getOrdiniInevasi(codMdep, orderList -> {
this.mOrderList.setValue(orderList); this.mOrderList.setValue(orderList);
this.sendOnLoadingEnded(); this.sendOnLoadingEnded();
}, this::sendError); }, this::sendError);
}).start();
} }
public void loadPicking(List<OrdineAccettazioneInevasoDTO> selectedOrders) { public void loadPicking(List<OrdineAccettazioneInevasoDTO> selectedOrders) {
this.sendOnLoadingStarted(); this.sendOnLoadingStarted();
new Thread(() -> {
this.mProdOrdineProduzioneRESTConsumer.retrievePickingListNew(selectedOrders, sitArtOrds -> { this.mProdOrdineProduzioneRESTConsumer.retrievePickingListNew(selectedOrders, sitArtOrds -> {
this.sendOnOrdersDispatched(selectedOrders, sitArtOrds); this.sendOnOrdersDispatched(selectedOrders, sitArtOrds);
@ -57,8 +52,6 @@ public class ProdOrdineProduzioneElencoViewModel {
}, this::sendError); }, this::sendError);
}).start();
} }