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

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

Browse Source
This commit is contained in:
Giuseppe Scorrano 2025-04-16 10:36:30 +02:00
commit 39dce4d23f
2 changed files with 32 additions and 21 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 {
def appVersionCode = 493
def appVersionName = '1.46.05'
def appVersionCode = 494
def appVersionName = '1.46.06'
signingConfigs {
release {

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

@ -515,7 +515,6 @@ public class SpedizioneViewModel {
}
private Pair<Boolean, MtbDepoPosizione> sendLUPositionChangeRequest() {
final CountDownLatch latch = new CountDownLatch(1);
AtomicReference<Pair<Boolean, MtbDepoPosizione>> result = new AtomicReference<>();
@ -533,9 +532,22 @@ public class SpedizioneViewModel {
return null;
}
private void sendBatchLotSelectionRequest(List<MtbPartitaMag> availableBatchLots, RunnableArgs<MtbPartitaMag> onComplete) {
if (this.mListener != null)
mListener.onBatchLotSelectionRequest(availableBatchLots, onComplete);
private MtbPartitaMag sendBatchLotSelectionRequest(List<MtbPartitaMag> availableBatchLots) {
final CountDownLatch latch = new CountDownLatch(1);
AtomicReference<MtbPartitaMag> result = new AtomicReference<>();
mListener.onBatchLotSelectionRequest(availableBatchLots, item -> {
result.set(item);
latch.countDown();
});
try {
latch.await(); // Attende che il dialog venga chiuso
return result.get();
} catch (InterruptedException e) {
this.sendError(e);
}
return null;
}
public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) throws Exception {
@ -1016,7 +1028,7 @@ public class SpedizioneViewModel {
.collect(Collectors.toList()));
}
this.sendBatchLotSelectionRequest(tmp, selected -> {
var selected = this.sendBatchLotSelectionRequest(tmp);
this.sendOnLoadingEnded();
if (selected != null) {
@ -1033,7 +1045,6 @@ public class SpedizioneViewModel {
this.sendError(e);
}
}
});
} else {
dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, scannedMtbColrs.get(0), canPartitaMagBeChanged, executeImmediately);