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

Aggiunto IDViaggio in GetPickingList

Browse Source
This commit is contained in:
Giuseppe Scorrano 2020-03-10 17:34:05 +01:00
parent 45295deea3
commit 730d2ec7b3
7 changed files with 98 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
View File

@ -16,12 +16,12 @@ public class UtilityExceptions {
public static void defaultException(Context context, Exception ex, Dialog progressDialog){
progressDialog.dismiss();
if(progressDialog != null) progressDialog.dismiss();
defaultException(context, ex);
}
public static void defaultException(Context context, Exception ex, Dialog progressDialog, boolean sendMail){
progressDialog.dismiss();
if(progressDialog != null) progressDialog.dismiss();
defaultException(context, ex, sendMail);
}
public static void defaultException(Context context, Exception ex){

11
app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java
View File

@ -139,6 +139,17 @@ public class MainListVenditaAdapter extends SectionedRecyclerViewAdapter<MainLis
holder.binding.venditaMainListGroupItemContainerDetailOrd.setText(ordine.getRifOrd());
if(!UtilityString.isNullOrEmpty(mDataset.get(itemPosition).getDescrizioneVettore())) {
holder.binding.venditaMainListGroupItemContainerVettoreLayout.setVisibility(View.VISIBLE);
holder.binding.venditaMainListGroupItemContainerVettore.setText(mDataset.get(itemPosition).getDescrizioneVettore());
} else {
holder.binding.venditaMainListGroupItemContainerVettoreLayout.setVisibility(View.GONE);
holder.binding.venditaMainListGroupItemContainerVettore.setText(null);
}
holder.binding.setCheckboxValue(ordine.selected);
holder.binding.getRoot().setOnClickListener(v -> {

3
app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java
View File

@ -138,7 +138,8 @@ public class VenditaHelper {
.setData(x.getDataOrdS())
.setGestione(x.getGestione())
.setNumero(x.getNumOrd())
.setDataConsegna(x.getDataConsS()))
.setDataConsegna(x.getDataConsS())
.setIdViaggio(x.getIdViaggio()))
.toList();
OrdiniVenditaRESTConsumerService service = RESTBuilder.getService(OrdiniVenditaRESTConsumerService.class, 90);

9
app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/GetPickingListDTO.java
View File

@ -9,6 +9,7 @@ public class GetPickingListDTO {
private Integer numero;
private String gestione;
private String dataConsegna;
private Integer idViaggio;
public String getData() {
return data;
@ -46,4 +47,12 @@ public class GetPickingListDTO {
return this;
}
public Integer getIdViaggio() {
return idViaggio;
}
public GetPickingListDTO setIdViaggio(Integer idViaggio) {
this.idViaggio = idViaggio;
return this;
}
}

BIN
app/src/main/res/drawable/ic_black_truck.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

109
app/src/main/res/layout/vendita_main_list_group_model.xml
View File

@ -1,12 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<layout>
<data>
<import type="it.integry.integrywmsnative.R" />
<variable
name="checkboxValue"
type="it.integry.integrywmsnative.core.di.BindableBoolean" />
</data>
@ -22,12 +24,12 @@
android:id="@+id/vendita_main_list_group_item_container_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="2dp"
android:paddingEnd="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_toEndOf="@id/empty_view"
android:background="@color/full_white">
android:background="@color/full_white"
android:paddingStart="2dp"
android:paddingTop="8dp"
android:paddingEnd="8dp"
android:paddingBottom="8dp">
<androidx.appcompat.widget.AppCompatCheckBox
@ -36,53 +38,90 @@
android:layout_height="wrap_content"
android:background="@android:color/transparent" />
<RelativeLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_toEndOf="@id/vendita_main_list_group_item_container_checkBox">
android:layout_toEndOf="@id/vendita_main_list_group_item_container_checkBox"
android:orientation="vertical">
<TextView
android:id="@+id/vendita_main_list_group_item_container_testata_data_cons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Cons 07 nov 2018"
android:layout_alignParentEnd="true"
android:textColor="#000" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/vendita_main_list_group_item_container_testata_ord"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Ord. Ven. 39 del 27 ott 2017"
android:ellipsize="end"
android:maxLines="1"
android:textColor="#000"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/vendita_main_list_group_item_container_testata_data_cons"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_main_list_group_item_container_testata_ord"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/vendita_main_list_group_item_container_testata_data_cons"
android:ellipsize="end"
android:maxLines="1"
android:textColor="#000"
tools:text="Ord. Ven. 39 del 27 ott 2017" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_main_list_group_item_container_testata_data_cons"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:textColor="#000"
tools:text="Cons 07 nov 2018" />
</RelativeLayout>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_main_list_group_item_container_detail_ord"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:maxLines="1"
android:paddingEnd="6dp"
android:text="TextView"
android:layout_below="@+id/vendita_main_list_group_item_container_testata_ord" />
tools:text="Destinatario - Indirizzo" />
</RelativeLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/vendita_main_list_group_item_container_vettore_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_black_truck"
android:adjustViewBounds="true"
android:tint="@color/gray_600"
android:layout_marginEnd="4dp"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_main_list_group_item_container_vettore"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:paddingEnd="6dp"
tools:text="Vettore: Ragione sociale" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</RelativeLayout>
<View
android:id="@+id/empty_view"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:layout_width="8dp"
android:layout_height="wrap_content"
android:layout_alignTop="@id/vendita_main_list_group_item_container_root"
android:layout_alignBottom="@id/vendita_main_list_group_item_container_root"/>
android:layout_alignBottom="@id/vendita_main_list_group_item_container_root"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp" />
</RelativeLayout>

BIN
ext_sources/ICONS/icons8-camion-96.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB