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

Finish v1.13.30(176)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2020-12-28 12:18:25 +01:00
commit 73e57e9430
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 175 def appVersionCode = 176
def appVersionName = '1.13.29' def appVersionName = '1.13.30'
signingConfigs { signingConfigs {
release { release {

14
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
View File

@ -61,6 +61,8 @@ public class RettificaGiacenzeViewModel {
private String mCurrentCodMdep; private String mCurrentCodMdep;
private boolean mIsCreatedLU; private boolean mIsCreatedLU;
private boolean mAnyEditDone = false;
@Inject @Inject
public RettificaGiacenzeViewModel(ArticoloRESTConsumer articoloRESTConsumer, public RettificaGiacenzeViewModel(ArticoloRESTConsumer articoloRESTConsumer,
ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
@ -350,6 +352,8 @@ public class RettificaGiacenzeViewModel {
mCurrentMtbColt.getMtbColr().add(mtbColr); mCurrentMtbColt.getMtbColr().add(mtbColr);
this.mAnyEditDone = true;
this.sendOnRowSaved(); this.sendOnRowSaved();
this.sendOnLoadingEnded(); this.sendOnLoadingEnded();
@ -380,6 +384,8 @@ public class RettificaGiacenzeViewModel {
mCurrentMtbColt.getMtbColr().add(mtbColr); mCurrentMtbColt.getMtbColr().add(mtbColr);
this.mAnyEditDone = true;
this.sendOnRowSaved(); this.sendOnRowSaved();
this.sendOnLoadingEnded(); this.sendOnLoadingEnded();
@ -417,9 +423,11 @@ public class RettificaGiacenzeViewModel {
if(shouldChangePosition) { if(shouldChangePosition) {
this.savePosizione(mtbDepoPosizione, () -> { this.savePosizione(mtbDepoPosizione, () -> {
this.mAnyEditDone = false;
postSaveBehaviour(onComplete); postSaveBehaviour(onComplete);
}); });
} else { } else {
this.mAnyEditDone = false;
postSaveBehaviour(onComplete); postSaveBehaviour(onComplete);
} }
@ -427,7 +435,7 @@ public class RettificaGiacenzeViewModel {
}, this::sendError); }, this::sendError);
}; };
if (!UtilityString.isNullOrEmpty(mDefaultCausale)) { if (!UtilityString.isNullOrEmpty(mDefaultCausale) && (saveCausale || mAnyEditDone)) {
this.saveCausaleRettificaGiacenze(saveAction); this.saveCausaleRettificaGiacenze(saveAction);
} else { } else {
saveAction.run(); saveAction.run();
@ -564,6 +572,8 @@ public class RettificaGiacenzeViewModel {
this.mCurrentMtbColt.getMtbColr().remove(mtbColrToUpdate); this.mCurrentMtbColt.getMtbColr().remove(mtbColrToUpdate);
this.mCurrentMtbColt.getMtbColr().add(mtbColrToUpdate); this.mCurrentMtbColt.getMtbColr().add(mtbColrToUpdate);
this.mAnyEditDone = true;
this.sendOnRowSaved(); this.sendOnRowSaved();
}, },
this::sendError this::sendError
@ -602,6 +612,8 @@ public class RettificaGiacenzeViewModel {
this.mCurrentMtbColt.getMtbColr().remove(mtbColrToUpdate); this.mCurrentMtbColt.getMtbColr().remove(mtbColrToUpdate);
this.mCurrentMtbColt.getMtbColr().add(mtbColr); this.mCurrentMtbColt.getMtbColr().add(mtbColr);
this.mAnyEditDone = true;
this.sendOnRowSaved(); this.sendOnRowSaved();
this.sendOnLoadingEnded(); this.sendOnLoadingEnded();