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-11-21 13:33:11 +01:00
parent 7ccda80bfc be8ce4de24
commit 96d29c784d
7 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/runConfigurations/app.xml generated
View File

@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
<module name="WMS_Native.app" />
<module name="WMS.app" />
<option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
<option name="DEPLOY" value="true" />
<option name="DEPLOY_APK_FROM_BUNDLE" value="false" />

4
app/build.gradle
View File

@@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 542
def appVersionName = '1.48.02'
def appVersionCode = 543
def appVersionName = '1.48.03'
signingConfigs {
release {

3
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
View File

@@ -764,12 +764,11 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
executorService.execute(() -> {
try {
this.mViewmodel.processBarcodeDTO(data);
this.onLoadingEnded();
} catch (Exception e) {
onError(e);
}
});
this.onLoadingEnded();
};
public void addExtraItem() {

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

@@ -860,7 +860,7 @@ public class SpedizioneViewModel {
if (mEnableGiacenza) {
pickingList
.forEach(pickingObjectDTO -> {
.parallelStream().forEach(pickingObjectDTO -> {
if (pickingObjectDTO.getMtbColts().stream()
.anyMatch(x ->
Objects.equals(x.getNumCollo(), scannedUL.getNumCollo()) &&
@@ -874,19 +874,22 @@ public class SpedizioneViewModel {
}
//Controllo se nel collo ho degli articoli che corrispondono per codice / taglia / colore / lotto
scannedUL.getMtbColr().stream().filter(x -> !UtilityString.isNullOrEmpty(x.getCodMart())).forEach(x -> {
scannedUL.getMtbColr()
.parallelStream()
.filter(x -> !UtilityString.isNullOrEmpty(x.getCodMart()))
.forEach(x -> {
for (PickingObjectDTO pickingObject : pickingList) {
//Da verificare se il controllo per partita deve essere sempre effettuato
if (UtilityString.equalsIgnoreCase(x.getCodMart(), pickingObject.getSitArtOrdDTO().getCodMart()) && UtilityString.equalsIgnoreCase(x.getCodTagl(), pickingObject.getSitArtOrdDTO().getCodTagl()) && UtilityString.equalsIgnoreCase(x.getCodCol(), pickingObject.getSitArtOrdDTO().getCodCol()) && (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(x.getPartitaMag(), pickingObject.getSitArtOrdDTO().getPartitaMag()) || UtilityString.isNullOrEmpty(pickingObject.getSitArtOrdDTO().getPartitaMag()))) {
for (PickingObjectDTO pickingObject : pickingList) {
//Da verificare se il controllo per partita deve essere sempre effettuato
if (UtilityString.equalsIgnoreCase(x.getCodMart(), pickingObject.getSitArtOrdDTO().getCodMart()) && UtilityString.equalsIgnoreCase(x.getCodTagl(), pickingObject.getSitArtOrdDTO().getCodTagl()) && UtilityString.equalsIgnoreCase(x.getCodCol(), pickingObject.getSitArtOrdDTO().getCodCol()) && (!mEnableCheckPartitaMag || UtilityString.equalsIgnoreCase(x.getPartitaMag(), pickingObject.getSitArtOrdDTO().getPartitaMag()) || UtilityString.isNullOrEmpty(pickingObject.getSitArtOrdDTO().getPartitaMag()))) {
if (!matchPickingObject.contains(pickingObject)) {
matchPickingObject.add(pickingObject);
if (!matchPickingObject.contains(pickingObject)) {
matchPickingObject.add(pickingObject);
}
}
}
}
}
});
});
for (PickingObjectDTO matchedObject : matchPickingObject) {
MtbColt cloneMtbColt = (MtbColt) scannedUL.clone();
@@ -1004,7 +1007,8 @@ public class SpedizioneViewModel {
(x.getPartitaMag() == null || x.getMtbPartitaMag().getDataScad() == null ||
UtilityDate.getNow().isBefore(x.getMtbPartitaMag().getDataScad())))
.map(x -> new PartitaCommessaDTO() {{
.map(x -> new PartitaCommessaDTO() {
{
setCodJcom(x.getCodJcom());
setPartitaMag(x.getPartitaMag());
setDataScad(x.getMtbPartitaMag() != null ? x.getMtbPartitaMag().getDataScad() : null);
@@ -1057,11 +1061,11 @@ public class SpedizioneViewModel {
.filter(x ->
x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) &&
((x.getPartitaMag() != null && selected.getPartitaMag() != null && x.getPartitaMag().equalsIgnoreCase(selected.getPartitaMag()))
|| (x.getPartitaMag() == null && selected.getPartitaMag() == null)) &&
((x.getPartitaMag() != null && selected.getPartitaMag() != null && x.getPartitaMag().equalsIgnoreCase(selected.getPartitaMag()))
|| (x.getPartitaMag() == null && selected.getPartitaMag() == null)) &&
((x.getCodJcom() != null && selected.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(selected.getCodJcom()))
|| (x.getCodJcom() == null && selected.getCodJcom() == null)))
((x.getCodJcom() != null && selected.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(selected.getCodJcom()))
|| (x.getCodJcom() == null && selected.getCodJcom() == null)))
.findFirst()
.orElse(null);

32
app/src/main/res/layout/dialog_info_situazione_articolo.xml
View File

@@ -35,18 +35,18 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
<com.google.android.material.chip.Chip
android:id="@+id/incoming_label"
style="@style/TextAppearance.Material3.TitleMedium"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/gray_200"
android:textAllCaps="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_gravity="center_horizontal"
android:paddingHorizontal="12dp"
android:text="In arrivo" />
style="@style/TextAppearance.Material3.TitleMedium"
android:text="In arrivo"
android:textAllCaps="true"
android:clickable="false"
android:focusable="false"
app:chipStrokeWidth="0dp"
android:paddingHorizontal="12dp" />
<androidx.recyclerview.widget.RecyclerView
@@ -59,19 +59,19 @@
tools:itemCount="1"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
<TextView
<com.google.android.material.chip.Chip
android:id="@+id/available_label"
style="@style/TextAppearance.Material3.TitleMedium"
android:textAllCaps="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/gray_200"
android:layout_gravity="center_horizontal"
style="@style/TextAppearance.Material3.TitleMedium"
android:text="In giacenza"
android:textAllCaps="true"
android:clickable="false"
android:focusable="false"
app:chipStrokeWidth="0dp"
android:layout_marginTop="8dp"
android:paddingHorizontal="12dp"
android:text="In giacenza" />
android:paddingHorizontal="12dp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/available_list"

8
app/src/main/res/layout/fragment_picking_libero.xml
View File

@@ -73,8 +73,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/free_picking_suggestion_1"
android:textColor="@android:color/black" />
android:text="@string/free_picking_suggestion_1" />
</LinearLayout>
<LinearLayout
@@ -87,14 +86,13 @@
app:layout_constraintTop_toBottomOf="@id/free_picking__suggestion_1__guideline_top"
app:visibility="@{view.thereIsAnOpenULWithoutRows}">
<androidx.appcompat.widget.AppCompatTextView
<TextView
style="@style/TextAppearance.Material3.HeadlineSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/free_picking_suggestion_2"
android:textColor="@android:color/black"/>
android:text="@string/free_picking_suggestion_2"/>
</LinearLayout>

1
app/src/main/res/layout/lista_picking_libero_list_model.xml
View File

@@ -47,7 +47,6 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@{mtbColr.getDescrizione()}"
android:textColor="@android:color/black"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@id/qta_guideline"
app:layout_constraintStart_toStartOf="parent"