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

Refactoring di Versamento e Recupero materiale produzione

Browse Source
This commit is contained in:
Giuseppe Scorrano
2021-08-11 15:19:35 +02:00
parent 9033548455
commit fcddda8e3f
56 changed files with 2023 additions and 1572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml
View File

@@ -55,7 +55,7 @@
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/dialog_choose_arts_from_lista_art__main_list"
android:id="@+id/lista_arts"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

219
app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
View File

@@ -1,154 +1,157 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
<layout xmlns:android="http://schemas.android.com/apk/res/android"
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">
xmlns:tools="http://schemas.android.com/tools">
<data>
<import type="it.integry.integrywmsnative.R" />
<import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
<import type="android.view.View" />
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityResources" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="android.text.Html" />
<variable
name="checkableOrdineLav"
type="it.integry.integrywmsnative.core.model.CheckableOrdineLavoro"/>
<variable
name="mtbColr"
type="it.integry.integrywmsnative.core.model.MtbColr"/>
name="listModel"
type="it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.VersamentoMerceOrdineLavListModel" />
</data>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/bg_checked_layout"
app:backgroundTintResID="@{checkableOrdineLav.checked.get() ? R.color.bg_checked_layout : android.R.color.transparent}"
android:layout_marginTop="2dp"
android:layout_marginStart="4dp"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:background="@drawable/bg_checked_layout"
android:orientation="horizontal"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingTop="8dp"
android:paddingEnd="8dp"
android:paddingBottom="8dp"
android:onClick="@{() -> checkableOrdineLav.toggleCheck()}">
app:backgroundTintResID="@{listModel.selected.get() ? R.color.bg_checked_layout : android.R.color.transparent}">
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:layout_marginEnd="8dp"
android:layout_centerVertical="true"
app:checked="@{checkableOrdineLav.checked}"/>
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_toEndOf="@id/checkbox"
android:layout_toStartOf="@id/qta_box">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{checkableOrdineLav.getTestata()}"
android:textColor="@color/colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="N° X del dd/mm/yyyy" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(checkableOrdineLav.qtaCol.get()) +' '+ mtbColr.mtbAart.untMis}"
android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
android:textSize="14sp"
android:textStyle="bold"
android:layout_alignParentEnd="true"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:background="@drawable/badge2_round_corner"
android:textColor="@android:color/white"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="PESO KG" />
</RelativeLayout>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="@{checkableOrdineLav.item.ordineLav.codProd +' '+ checkableOrdineLav.item.ordineLav.descrizioneProd}"
android:textColor="@android:color/secondary_text_light"
style="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="150303-010 CAVOLO VERZA 6 PZ PL NERA 604018" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
style="@style/AppTheme.NewMaterial.Text.Small"
android:text="@{UtilityString.formatHtmlStringFromResId(R.string.batch_lot_text, checkableOrdineLav.item.ordineLav.partitaMag)}"
tools:text="Lotto: 35119F0038" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:visibility="@{!UtilityString.isNullOrEmpty(checkableOrdineLav.item.ordineLav.noteLav) ? View.VISIBLE : View.GONE}"
android:maxLines="2"
style="@style/AppTheme.NewMaterial.Text.Small"
android:text="@{UtilityString.formatHtmlStringFromResId(R.string.notes_text, checkableOrdineLav.item.ordineLav.noteLav)}"
tools:text="note: prova" />
</LinearLayout>
app:checked="@{listModel.selected}" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toStartOf="@id/qta_box"
android:layout_toEndOf="@id/checkbox"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/qta_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/qta_textview"
style="@style/AppTheme.NewMaterial.Text.Medium"
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:textSize="16sp"
android:textColor="@android:color/white"
android:text="@{Html.fromHtml(listModel.preDescriptionText)}"
android:textColor="@color/colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
android:textAllCaps="true"
tools:text="N° X del dd/mm/yyyy" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/peso_kg"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="280.45\nCONF" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:background="@drawable/badge2_round_corner"
android:backgroundTint="@{context.getColor(listModel.selected.get() ? R.color.orange_600 : R.color.gray_500)}"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:textColor="@android:color/white"
android:textSize="14sp"
android:textStyle="bold"
android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (listModel.originalMtbAart != null &amp;&amp; !listModel.originalMtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
tools:text="PESO KG" />
</RelativeLayout>
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Medium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="@{Html.fromHtml(listModel.descriptionText)}"
android:textColor="@android:color/secondary_text_light"
tools:text="150303-010 CAVOLO VERZA 6 PZ PL NERA 604018" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="@{Html.fromHtml(listModel.subDescriptionText)}"
tools:text="Lotto: 35119F0038" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:visibility="@{!UtilityString.isNullOrEmpty(listModel.subDescription2Text) ? View.VISIBLE : View.GONE}"
android:text="@{Html.fromHtml(listModel.subDescription2Text)}"
tools:text="note: prova" />
</androidx.appcompat.widget.LinearLayoutCompat>
<RelativeLayout
android:id="@+id/qta_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:paddingStart="12dp">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/qta_textview"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge1_round_corner"
android:backgroundTint="@{context.getColor(listModel.selected.get() ? R.color.colorPrimary : R.color.gray_500)}"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:textAllCaps="true"
android:textColor="@android:color/white"
android:textSize="16sp"
android:textStyle="bold"
tools:backgroundTint="@color/colorPrimary"
tools:text="280.45\nCONF" />
</RelativeLayout>
</RelativeLayout>

4
app/src/main/res/layout/fragment_prod_recupero_materiale.xml
View File

@@ -6,6 +6,10 @@
<data>
<variable
name="view"
type="it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment" />
</data>
<RelativeLayout

61
app/src/main/res/layout/fragment_prod_versamento_materiale.xml
View File

@@ -4,6 +4,10 @@
<data>
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<variable
name="view"
type="it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment" />
</data>
<FrameLayout
@@ -18,12 +22,12 @@
app:cardElevation="0dp">
<LinearLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -31,7 +35,7 @@
android:text="@string/distribute_ul"
android:gravity="center_horizontal"/>
<LinearLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/gray_detail_background_round8"
@@ -41,15 +45,16 @@
android:layout_marginRight="8dp"
android:padding="16dp">
<LinearLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/descr_art"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:text="@{view.descrizionePrimaryArt}"
tools:text="CAVOLO VERZA"
style="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@color/colorPrimary"
@@ -57,14 +62,14 @@
android:layout_marginEnd="8dp"
/>
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<LinearLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/article"
@@ -72,22 +77,23 @@
android:layout_marginEnd="8dp"
android:textSize="16sp" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/cod_art"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="150303-010"
app:text="@{view.codPrimaryArt}"
android:textColor="@android:color/black"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<LinearLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/batch_lot"
@@ -95,21 +101,23 @@
android:layout_marginEnd="8dp"
android:textSize="14sp" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/batch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="35119F0038"
app:text="@{view.lottoPrimaryArt}"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="italic" />
</LinearLayout>
<LinearLayout
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/quantity"
@@ -117,27 +125,28 @@
android:layout_marginEnd="8dp"
android:textSize="14sp" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/qta_col"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:text="@{view.quantityPrimaryArt}"
tools:text="385 CONF"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="italic" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp">
<LinearLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/empty_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -156,19 +165,19 @@
android:gravity="center"
android:textColor="@color/empty_view_gray"/>
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/dialog_choose_arts_from_lista_art__main_list"
android:id="@+id/lista_arts"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="80dp"
android:clipToPadding="false"
android:scrollbarStyle="outsideOverlay"/>
android:paddingBottom="80dp"
android:scrollbarStyle="outsideOverlay" />
</RelativeLayout>
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/positive_fab"
@@ -177,6 +186,8 @@
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:tint="@android:color/white"
app:visibility="@{view.fabVisible}"
app:singleClick="@{view::onConfirmClicked}"
style="@style/Widget.MaterialComponents.FloatingActionButton"
app:srcCompat="@drawable/ic_check_black_24dp" />
</FrameLayout>

6
app/src/main/res/layout/prod_recupero_materiale_list_header.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:tools="http://schemas.android.com/tools">
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
@@ -13,10 +13,10 @@
android:layout_marginTop="16dp">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/cod_jfas"
android:id="@+id/recuper_materiale_main_list_group_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="L1"
tools:text="LINEA1"
android:textSize="16sp"
android:textStyle="bold"
android:textAllCaps="true"