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

Fix tasto abort in Dialog Info UL

Browse Source
This commit is contained in:
Giuseppe Scorrano 2020-06-09 11:37:57 +02:00
parent efb27760e4
commit e42c49762f
3 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,13 @@
package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.viewmodel;
import android.app.Dialog;
import android.text.SpannableString;
import androidx.appcompat.app.AlertDialog;
import androidx.databinding.ObservableArrayList;
import androidx.databinding.ObservableField;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.text.SpannableString;
import com.annimon.stream.Stream;
import com.tfb.fbtoast.FBToast;
@ -17,16 +16,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.CommonConst;
import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
import it.integry.integrywmsnative.core.rest.model.Ean128Model;
import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.model.CommonModelConsts;
@ -35,6 +27,14 @@ import it.integry.integrywmsnative.core.model.MtbColr;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
import it.integry.integrywmsnative.core.report.ReportManager;
import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
import it.integry.integrywmsnative.core.rest.model.Ean128Model;
import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityBarcode;
import it.integry.integrywmsnative.core.utility.UtilityDate;
@ -49,15 +49,12 @@ import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.IOnOrdi
import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.MainListOrdineAccettazioneAdapter;
import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto.AccettazioneOrdineInevasoOrderBy;
import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.rest.OrdineAccettazioneInevasoRESTConsumerService;
import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback;
import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO;
import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
import static br.com.zbra.androidlinq.Linq.stream;
import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloClosedCallback, IOnOrdineAccettazioneRowDispatchCallback {
@ -463,8 +460,8 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
}
List<String> codAnags =
stream(mOrders)
.select(OrdineAccettazioneDTO::getCodAnag)
Stream.of(mOrders)
.map(OrdineAccettazioneDTO::getCodAnag)
.distinct()
.toList();
@ -473,8 +470,8 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
}
List<String> rifOrds =
stream(mOrders)
.select(OrdineAccettazioneDTO::getRifOrd)
Stream.of(mOrders)
.map(OrdineAccettazioneDTO::getRifOrd)
.distinct()
.toList();
@ -483,8 +480,8 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
}
List<String> numDataOrds =
stream(mOrders)
.select(value -> ("" + value.getNumero()) + value.getData())
Stream.of(mOrders)
.map(value -> value.getNumero() + value.getData())
.distinct()
.toList();
@ -528,7 +525,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
});
}, ex -> UtilityExceptions.defaultException(mActivity, ex, finalProgress));
}).show();
}, finalProgress::dismiss).show();
}

2
app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
View File

@ -385,6 +385,8 @@ public class PickingResiActivity extends BaseActivity implements IOnColloClosedC
} else postNoteSave.run();
}, () -> {
}).show();
} else {
deleteCollo(progress, onComplete);

8
app/src/main/java/it/integry/integrywmsnative/view/dialogs/note_aggiuntive_lu/NoteAggiuntiveLUDialog.java
View File

@ -16,11 +16,11 @@ public class NoteAggiuntiveLUDialog {
private Dialog mDialog;
public static Dialog make(Context context, final RunnableArgs<String> onComplete) {
return new NoteAggiuntiveLUDialog(context, onComplete).mDialog;
public static Dialog make(Context context, final RunnableArgs<String> onComplete, final Runnable onAbort) {
return new NoteAggiuntiveLUDialog(context, onComplete, onAbort).mDialog;
}
private NoteAggiuntiveLUDialog(Context context, final RunnableArgs<String> onComplete){
private NoteAggiuntiveLUDialog(Context context, final RunnableArgs<String> onComplete, final Runnable onAbort){
LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
DialogNoteAggiuntiveNuovaUlBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_note_aggiuntive_nuova_ul, null, false);
@ -39,7 +39,7 @@ public class NoteAggiuntiveLUDialog {
bindings.buttonAbort.setOnClickListener(v -> {
mDialog.dismiss();
if(onComplete != null) onComplete.run(null);
if(onAbort != null) onAbort.run();
});