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

Merge tag 'Hotfix-AccettazioneIME' into develop

Browse Source 
Finish v1_8_3(90)
This commit is contained in:
Giuseppe Scorrano 2019-10-21 13:00:31 +02:00
commit 26cd14eb9d
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 89
def appVersionName = '1.8.2'
def appVersionCode = 90
def appVersionName = '1.8.3'
signingConfigs {
release {

40
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java
View File

@ -953,32 +953,32 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
private void onRowDeleted(MtbColr deletedValue) {
if(getColloRef() != null) {
// if(getColloRef() != null) {
Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity);
// Dialog progress = UtilityProgress.createDefaultProgressDialog(mActivity);
MtbColr mtbColrToDeleteOfAccettazione = Stream.of(getColloRef().getMtbColr())
.filter(x -> x.getQtaCol().compareTo(deletedValue.getQtaCol()) == 0 &&
x.getCodMart().equalsIgnoreCase(deletedValue.getCodMart()) &&
x.getPartitaMag().equalsIgnoreCase(deletedValue.getPartitaMag()) &&
x.getCodJcom().equalsIgnoreCase(deletedValue.getCodJcom()))
.findFirst()
.get();
// MtbColr mtbColrToDeleteOfAccettazione = Stream.of(getColloRef().getMtbColr())
// .filter(x -> x.getQtaCol().compareTo(deletedValue.getQtaCol()) == 0 &&
// x.getCodMart().equalsIgnoreCase(deletedValue.getCodMart()) &&
// x.getPartitaMag().equalsIgnoreCase(deletedValue.getPartitaMag()) &&
// x.getCodJcom().equalsIgnoreCase(deletedValue.getCodJcom()))
// .findFirst()
// .get();
ColliMagazzinoRESTConsumer.deleteRiga(mtbColrToDeleteOfAccettazione, () -> {
getColloRef().getMtbColr().remove(mtbColrToDeleteOfAccettazione);
// ColliMagazzinoRESTConsumer.deleteRiga(mtbColrToDeleteOfAccettazione, () -> {
// getColloRef().getMtbColr().remove(mtbColrToDeleteOfAccettazione);
//
// progress.dismiss();
// this.refreshOrderBy(false);
// }, ex -> {
// UtilityExceptions.defaultException(mActivity, ex, progress);
// this.refreshOrderBy(false);
// });
progress.dismiss();
this.refreshOrderBy(false);
}, ex -> {
UtilityExceptions.defaultException(mActivity, ex, progress);
this.refreshOrderBy(false);
});
} else {
// } else {
this.refreshOrderBy(false);
}
// }
}
}