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

Finish v1.30.12(330)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2023-02-09 12:08:34 +01:00
commit 8c0639be9b
4 changed files with 17 additions and 11 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 { android {
def appVersionCode = 329 def appVersionCode = 3330
def appVersionName = '1.30.11' def appVersionName = '1.30.12'
signingConfigs { signingConfigs {
release { release {

10
app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java
View File

@ -257,13 +257,15 @@ public class UltimiArriviFornitoreFragment extends BaseFragment implements ITitl
DialogChooseArtsFromMtbColrList DialogChooseArtsFromMtbColrList
.newInstance(scannedMtbColt.getMtbColr(), items -> { .newInstance(scannedMtbColt.getMtbColr(), items -> {
List<MtbAart> mtbAarts = new ArrayList<>();
List<MtbAart> mtbAarts = Stream.of(items) if(items != null && !items.isEmpty()) {
.map(MtbColr::getMtbAart) mtbAarts = Stream.of(items)
.toList(); .map(MtbColr::getMtbAart)
.toList();
}
filterItems(mtbAarts); filterItems(mtbAarts);
}, null) }, null)
.show(requireActivity().getSupportFragmentManager(), "tag"); .show(requireActivity().getSupportFragmentManager(), "tag");
} }

6
app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java
View File

@ -171,7 +171,11 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
public void onArtsChooseRequired(List<MtbColr> mtbColrList, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) { public void onArtsChooseRequired(List<MtbColr> mtbColrList, RunnableArgs<List<MtbColr>> onComplete, Runnable onAbort) {
this.requireActivity().runOnUiThread(() -> { this.requireActivity().runOnUiThread(() -> {
DialogChooseArtsFromMtbColrList DialogChooseArtsFromMtbColrList
.newInstance(mtbColrList, onComplete, onAbort) .newInstance(mtbColrList, data -> {
if(data == null || data.isEmpty()) {
onAbort.run();
} else onComplete.run(data);
}, onAbort)
.show(requireActivity().getSupportFragmentManager(), "tag"); .show(requireActivity().getSupportFragmentManager(), "tag");
}); });
} }

8
app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java
View File

@ -122,10 +122,10 @@ public class DialogChooseArtsFromMtbColrList extends BaseDialogFragment implemen
.map(DialogChooseArtsFromMtbColrListItemModel::getMtbColr) .map(DialogChooseArtsFromMtbColrListItemModel::getMtbColr)
.toList(); .toList();
if (selectedArts.isEmpty()) { // if (selectedArts.isEmpty()) {
if (this.onAbort != null) this.onAbort.run(); // if (this.onAbort != null) this.onAbort.run();
return; // return;
} // }
if (this.onConfirmed != null) if (this.onConfirmed != null)
this.onConfirmed.run(selectedArts); this.onConfirmed.run(selectedArts);