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

Implementate logiche di picking UL to UL in Versamento Merce

Browse Source
This commit is contained in:
Gius95
2018-12-07 19:34:43 +01:00
parent fc732b4397
commit af815e87f9
41 changed files with 1514 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml Normal file
View File

@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<import type="android.view.View" />
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<variable
name="checkableMtbColr"
type="it.integry.integrywmsnative.core.model.CheckableMtbColr"/>
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<android.support.v7.widget.AppCompatCheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
app:checked="@{checkableMtbColr.checked}"/>
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:onClick="@{() -> checkableMtbColr.toggleCheck()}">
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@id/qta_box"
app:layout_constraintStart_toStartOf="parent">
<android.support.v7.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{checkableMtbColr.mtbColr.mtbAart.getCodMart()}"
android:textColor="@color/colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="COD MART" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="@{checkableMtbColr.mtbColr.mtbAart.descrizioneEstesa}"
android:textColor="@android:color/black"
android:textSize="16sp"
tools:text="Descrizione lunga articolo" />
<!--<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{`Lotto: ` + dtoModel.partitaMag}"
android:textSize="14sp"
android:visibility="@{UtilityString.isNullOrEmpty(dtoModel.partitaMag) ? View.INVISIBLE : View.VISIBLE}"
tools:text="Lotto: ABCDE" />-->
</LinearLayout>
<RelativeLayout
android:id="@+id/qta_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
<android.support.v7.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge1_round_corner"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:text="@{UtilityNumber.decimalToString(checkableMtbColr.mtbColr.getQtaCol()) + `\n` + checkableMtbColr.mtbColr.getUntMis()}"
android:textSize="16sp"
android:textColor="@android:color/white"
android:textStyle="bold"
tools:text="280.45\nCONF" />
</RelativeLayout>
</android.support.constraint.ConstraintLayout>
</LinearLayout>
</layout>

35
app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml Normal file
View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_margin="16dp">
<android.support.v7.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="22sp"
android:text="@string/dialog_choose_arts_from_lista_art"
android:textStyle="normal"
android:textColor="@android:color/black"
android:layout_marginBottom="12dp"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/dialog_choose_arts_from_lista_art__main_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</android.support.v7.widget.CardView>
</layout>

41
app/src/main/res/layout/dialog_scan_or_create_lu.xml
View File

@@ -37,29 +37,34 @@
</LinearLayout>
<android.support.v7.widget.AppCompatTextView
<LinearLayout
android:id="@+id/dialog_scan_or_create_lu__creation_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_marginTop="12dp"
android:textSize="16sp"
android:textStyle="bold"
android:layout_gravity="center_vertical"
android:text="OPPURE"
tools:text="OPPURE"/>
android:orientation="vertical">
<android.support.v7.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_marginTop="12dp"
android:textSize="16sp"
android:textStyle="bold"
android:layout_gravity="center_vertical"
android:text="OPPURE"
tools:text="OPPURE"/>
<android.support.v7.widget.AppCompatButton
android:id="@+id/create_new_lu_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="Crea nuova UL"
android:textStyle="bold"
android:textColor="@android:color/white"
android:backgroundTint="@color/blue_700"/>
<android.support.v7.widget.AppCompatButton
android:id="@+id/create_new_lu_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="Crea nuova UL"
android:textStyle="bold"
android:textColor="@android:color/white"
android:backgroundTint="@color/blue_700"/>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>

139
app/src/main/res/layout/fragment_main_versamento_merce.xml Normal file
View File

@@ -0,0 +1,139 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="view"
type="it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment" />
<variable
name="viewmodel"
type="it.integry.integrywmsnative.gest.versamento_merce.viewmodel.VersamentoMerceViewModel" />
</data>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".gest.versamento_merce.VersamentoMerceFragment"
android:padding="8dp"
android:background="@color/full_white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/gray_detail_background_round8"
android:orientation="vertical"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:padding="16dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Data creazione: "
android:textColor="@android:color/black"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewmodel.mtbColt.get().getDataColloHumanLong()}"
tools:text="22 ottobre 2018"
android:textColor="@android:color/black"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Preparato da "
android:textColor="@android:color/black"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewmodel.mtbColt.get().getPreparatoDa() != null ? viewmodel.mtbColt.get().getPreparatoDa() : `N/D`}"
tools:text="Vito Falagario"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="italic" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="12dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Posizione "
android:textColor="@android:color/black"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewmodel.mtbColt.get().getPosizione() != null ? viewmodel.mtbColt.get().getPosizione() : `N/D`}"
tools:text="A00F00C00L00"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Deposito "
android:textColor="@android:color/black"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewmodel.mtbColt.get().getCodMdep()}"
tools:text="10"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="bold" />
<!--<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4sp"
android:text="@{viewmodel.descrizioneDepo}"
tools:text="(Bari)"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="bold" />-->
</LinearLayout>
</LinearLayout>
</FrameLayout>
</layout>

2
app/src/main/res/menu/activity_main_drawer.xml
View File

@@ -17,7 +17,7 @@
<item
android:id="@+id/nav_manage"
android:icon="@drawable/ic_menu_manage"
android:title="Tools" />
android:title="Versamento Merce" />
</group>
<item android:title="Communicate">

4
app/src/main/res/values-it/strings.xml
View File

@@ -13,6 +13,7 @@
<string name="accettazione_ordine_inevaso_title_multiple_order">Ordini di accettazione</string>
<string name="vendita_title_fragment">Spedizione</string>
<string name="rettifica_giacenze_fragment_title">Rettifica giacenze</string>
<string name="versamento_merce_fragment_title">Versamento merce</string>
<string name="error">Errore</string>
<string name="ops">Ops</string>
<string name="warning">Attenzione</string>
@@ -135,6 +136,7 @@
<string name="dialog_vendita_filtro_avanzato">Filtro avanzato</string>
<string name="dialog_choose_art_from_lista_art">Seleziona un articolo</string>
<string name="dialog_choose_arts_from_lista_art">Seleziona gli articoli</string>
<string name="supplier">Fornitore</string>
<string name="cod_art_or_description">Cod art / Descrizione</string>
@@ -147,6 +149,8 @@
<string name="vehicle">Automezzo</string>
<string name="no_items_found_message">Nessun articolo trovato</string>
<string name="no_lu_found_message">Nessuna UL trovata</string>
<string name="too_much_lu_found_message">E\' stata trovata più di una UL</string>
<string name="ask_print_message"><![CDATA[Si vuole procedere con la stampa dell\'etichetta?]]></string>
</resources>

4
app/src/main/res/values/strings.xml
View File

@@ -22,6 +22,7 @@
<string name="accettazione_ordine_inevaso_title_multiple_order">Multiple acceptance orders</string>
<string name="vendita_title_fragment">Check out</string>
<string name="rettifica_giacenze_fragment_title">Inventory</string>
<string name="versamento_merce_fragment_title">Items placement</string>
<string name="error">Error</string>
<string name="ops">Ops</string>
<string name="warning">Warning</string>
@@ -142,6 +143,7 @@
<string name="dialog_vendita_filtro_avanzato">Advanced filter</string>
<string name="dialog_choose_art_from_lista_art">Choose item</string>
<string name="dialog_choose_arts_from_lista_art">Choose items</string>
<string name="supplier">Supplier</string>
@@ -156,6 +158,8 @@
<string name="vehicle">Vehicle</string>
<string name="no_items_found_message">No items found</string>
<string name="no_lu_found_message">No LU found</string>
<string name="too_much_lu_found_message">Multiple LU found</string>
<string name="ask_print_message">Do you want print the label?</string>
</resources>