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

Merge branch 'feature/RefactoringGestioneColli' into master-beta
All checks were successful
WMS - Android (New)/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-06-20 18:50:05 +02:00
parent 65e7d26655 3b3ab8e7c5
commit 36b6ba7ddd
6 changed files with 30 additions and 10 deletions
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 = 509 def appVersionCode = 510
def appVersionName = '1.46.21' def appVersionName = '1.46.22'
signingConfigs { signingConfigs {
release { release {

6
app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
View File

@@ -189,9 +189,9 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
this.initMtbGrupsCache(); this.initMtbGrupsCache();
this.initJtbComtCache(); this.initJtbComtCache();
mAppliedFilterViewModel.init(data); handler.post(() -> {
mAppliedFilterViewModel.init(data);
// this.refreshList(data, null); });
this.onLoadingEnded(); this.onLoadingEnded();
} catch (Exception e) { } catch (Exception e) {

4
app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
View File

@@ -44,7 +44,7 @@ public class OrdiniUscitaElencoFiltroViewModel {
public void init(List<OrdiniUscitaElencoDTO> initialList) { public void init(List<OrdiniUscitaElencoDTO> initialList) {
this.initialOrderList = initialList; this.initialOrderList = initialList;
this.currentFilteredOrderList.postValue(this.initialOrderList); applyAllTests();
} }
public MutableLiveData<List<OrdiniUscitaElencoDTO>> getMutableFilteredOrderList() { public MutableLiveData<List<OrdiniUscitaElencoDTO>> getMutableFilteredOrderList() {
@@ -173,7 +173,7 @@ public class OrdiniUscitaElencoFiltroViewModel {
) { ) {
returnList = this.initialOrderList; returnList = this.initialOrderList;
} else { } else {
Stream<OrdiniUscitaElencoDTO> tmpStream = Stream.of(this.initialOrderList) java.util.stream.Stream<OrdiniUscitaElencoDTO> tmpStream = this.initialOrderList.stream()
.filter(x -> .filter(x ->
(currentNumOrdsPredicate.get() == null || (currentNumOrdsPredicate.get().test(x))) && (currentNumOrdsPredicate.get() == null || (currentNumOrdsPredicate.get().test(x))) &&
(currentClientePredicate.get() == null || (currentClientePredicate.get().test(x))) && (currentClientePredicate.get() == null || (currentClientePredicate.get().test(x))) &&

2
app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java
View File

@@ -323,7 +323,7 @@ public class ProdRientroMerceOrderListFragment extends Fragment {
String testataOrdString = "N° " + x.getNumOrd(); String testataOrdString = "N° " + x.getNumOrd();
listModel.setDescription(testataOrdString); listModel.setDescription(testataOrdString);
listModel.setSubDescription(x.getDescrizioneProd()); listModel.setSubDescription(x.getCodProd() + " - " + x.getDescrizioneProd());
listModel.setRightDescription(x.getCodJcom() != null ? (x.getDescCommessa() + " (" + x.getCodJcom() + ")") : ""); listModel.setRightDescription(x.getCodJcom() != null ? (x.getDescCommessa() + " (" + x.getCodJcom() + ")") : "");

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

@@ -1761,7 +1761,7 @@ public class SpedizioneViewModel {
var duplicatedMtbColts = this.validateTheUdsToBeDuplicated(generatedMtbColts); var duplicatedMtbColts = this.validateTheUdsToBeDuplicated(generatedMtbColts);
if (duplicatedMtbColts != null) { if (duplicatedMtbColts != null && !duplicatedMtbColts.isEmpty()) {
generatedMtbColts.addAll(duplicatedMtbColts); generatedMtbColts.addAll(duplicatedMtbColts);
} }
@@ -2047,7 +2047,10 @@ public class SpedizioneViewModel {
if (mTestateOrdini != null) { if (mTestateOrdini != null) {
for (MtbColt mtbColt : mtbColtList) { for (MtbColt mtbColt : mtbColtList) {
mTestateOrdini.stream() mTestateOrdini.stream()
.filter(x -> x.getNumOrd().equals(mtbColt.getNumOrd()) && x.getDataOrd().isEqual(mtbColt.getDataOrdLD()) && x.getGestioneEnum() == mtbColt.getGestioneEnum()) .filter(x ->
x.getNumOrd().equals(mtbColt.getNumOrd()) &&
x.getDataOrd().isEqual(mtbColt.getDataOrdLD()) &&
x.getGestioneEnum() == mtbColt.getGestioneEnum())
.forEach(x -> x.setExistCollo(true)); .forEach(x -> x.setExistCollo(true));
} }
} }

17
app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
View File

@@ -189,9 +189,26 @@
</RelativeLayout> </RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@{view.currentOrder.codProd}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
android:textStyle="bold"
android:textAllCaps="true"
tools:text="Codice prodotto"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@{view.currentOrder.descrizioneProd}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
tools:text="Descrizione prodotto"/>
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:weightSum="2"> android:weightSum="2">
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat