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

Fix su loading che appare sul popup di conferma chiusura ordine

Browse Source
This commit is contained in:
Giuseppe Scorrano 2025-09-10 16:31:50 +02:00
parent 4861c689d7
commit 5ae9371c51
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -149,3 +149,5 @@ crashlytics.properties
crashlytics-build.properties crashlytics-build.properties
### AndroidStudio Patch ### ### AndroidStudio Patch ###
!/gradle/wrapper/gradle-wrapper.jar !/gradle/wrapper/gradle-wrapper.jar
/.idea/copilot.data.migration.agent.xml
/.idea/copilot.data.migration.edit.xml

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

@ -855,9 +855,11 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
public void closeOrder() { public void closeOrder() {
this.fabPopupMenu.dismiss(); this.fabPopupMenu.dismiss();
this.onLoadingStarted();
executorService.execute(() -> { executorService.execute(() -> {
try { try {
this.mViewmodel.closeOrder(); this.mViewmodel.closeOrder();
this.onLoadingEnded();
} catch (Exception e) { } catch (Exception e) {
onError(e); onError(e);
} }

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

@ -2124,7 +2124,6 @@ public class SpedizioneViewModel {
} }
public void closeOrder() { public void closeOrder() {
this.sendOnLoadingStarted();
if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) { if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) {
var printRequestResult = this.sendOnCloseOrderPrintRequest(); var printRequestResult = this.sendOnCloseOrderPrintRequest();
@ -2134,8 +2133,6 @@ public class SpedizioneViewModel {
if (this.mIsOrdTrasf && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV())) { if (this.mIsOrdTrasf && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV())) {
this.sendCreateDocsRequest(); this.sendCreateDocsRequest();
} }
this.sendOnOrderClosed();
} }
private void onCloseOrderPrintRequested(PrintOrderCloseDTO dto) { private void onCloseOrderPrintRequested(PrintOrderCloseDTO dto) {

2
build.gradle
View File

@ -3,7 +3,7 @@
buildscript { buildscript {
ext { ext {
kotlin_version = '2.1.0' kotlin_version = '2.1.0'
agp_version = '8.12.2' agp_version = '8.13.0'
} }
repositories { repositories {