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

Merge branch 'develop' into feature/FastPickingSpedizione

Browse Source 
# Conflicts:
#	app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
#	app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java
#	app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
This commit is contained in:
Giuseppe Scorrano 2025-03-18 12:18:56 +01:00
commit 6c6fd38482
3 changed files with 19 additions and 12 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 = 483 def appVersionCode = 484
def appVersionName = '1.45.01' def appVersionName = '1.45.02'
signingConfigs { signingConfigs {
release { release {

8
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneModule.java
View File

@ -1,5 +1,7 @@
package it.integry.integrywmsnative.gest.spedizione; package it.integry.integrywmsnative.gest.spedizione;
import android.os.Handler;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import dagger.Module; import dagger.Module;
@ -41,7 +43,8 @@ public class SpedizioneModule {
MagazzinoAutomaticoRESTConsumer magazzinoAutomaticoRESTConsumer, MagazzinoAutomaticoRESTConsumer magazzinoAutomaticoRESTConsumer,
ImballiRESTConsumer imballiRESTConsumer, ImballiRESTConsumer imballiRESTConsumer,
MagazzinoRESTConsumer magazzinoRESTConsumer, MagazzinoRESTConsumer magazzinoRESTConsumer,
ExecutorService executorService) { ExecutorService executorService,
Handler handler) {
return new SpedizioneViewModel(articoloRESTConsumer, return new SpedizioneViewModel(articoloRESTConsumer,
barcodeRESTConsumer, barcodeRESTConsumer,
colliDataRecoverService, colliDataRecoverService,
@ -55,7 +58,8 @@ public class SpedizioneModule {
magazzinoAutomaticoRESTConsumer, magazzinoAutomaticoRESTConsumer,
imballiRESTConsumer, imballiRESTConsumer,
magazzinoRESTConsumer, magazzinoRESTConsumer,
executorService); executorService,
handler);
} }
} }

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

@ -1,7 +1,6 @@
package it.integry.integrywmsnative.gest.spedizione; package it.integry.integrywmsnative.gest.spedizione;
import android.os.Handler; import android.os.Handler;
import android.os.Looper;
import android.util.Pair; import android.util.Pair;
import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableArrayList;
@ -148,11 +147,11 @@ public class SpedizioneViewModel {
private final ImballiRESTConsumer mImballiRESTConsumer; private final ImballiRESTConsumer mImballiRESTConsumer;
private final ExecutorService executorService; private final ExecutorService executorService;
private final Handler handler;
private ColliScaricoRESTConsumerInterface mColliScaricoRESTConsumer; private ColliScaricoRESTConsumerInterface mColliScaricoRESTConsumer;
private MagazzinoRESTConsumer magazzinoRESTConsumer; private MagazzinoRESTConsumer magazzinoRESTConsumer;
private Handler handler = new Handler(Looper.getMainLooper());
@Inject @Inject
public SpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer, public SpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer,
@ -168,7 +167,8 @@ public class SpedizioneViewModel {
MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer, MagazzinoAutomaticoRESTConsumer mMagazzinoAutomaticoRESTConsumer,
ImballiRESTConsumer imballiRESTConsumer, ImballiRESTConsumer imballiRESTConsumer,
MagazzinoRESTConsumer magazzinoRESTConsumer, MagazzinoRESTConsumer magazzinoRESTConsumer,
ExecutorService executorService) { ExecutorService executorService,
Handler handler) {
this.mArticoloRESTConsumer = articoloRESTConsumer; this.mArticoloRESTConsumer = articoloRESTConsumer;
this.mBarcodeRESTConsumer = barcodeRESTConsumer; this.mBarcodeRESTConsumer = barcodeRESTConsumer;
this.mColliDataRecoverService = colliDataRecoverService; this.mColliDataRecoverService = colliDataRecoverService;
@ -183,6 +183,7 @@ public class SpedizioneViewModel {
this.mImballiRESTConsumer = imballiRESTConsumer; this.mImballiRESTConsumer = imballiRESTConsumer;
this.magazzinoRESTConsumer = magazzinoRESTConsumer; this.magazzinoRESTConsumer = magazzinoRESTConsumer;
this.executorService = executorService; this.executorService = executorService;
this.handler = handler;
} }
@ -2094,12 +2095,14 @@ public class SpedizioneViewModel {
} }
public void resetMatchedRows() { public void resetMatchedRows() {
handler.post(() -> {
for (PickingObjectDTO pickingObjectDTO : this.mPickingList.getValue()) { for (PickingObjectDTO pickingObjectDTO : this.mPickingList.getValue()) {
pickingObjectDTO.setTempPickData(null).setHidden(false); pickingObjectDTO.setTempPickData(null).setHidden(false);
} }
this.mPickingList.postValue(this.mPickingList.getValue()); this.mPickingList.postValue(this.mPickingList.getValue());
this.sendFilterRemoved(); this.sendFilterRemoved();
});
} }
public void closeOrder() { public void closeOrder() {