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

Merge branch 'develop' into feature/Frudis_versamentoDiretto

Browse Source
This commit is contained in:
Valerio Castellana 2020-01-03 15:20:31 +01:00
commit 791811baba
5 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
View File

@ -614,7 +614,9 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
.setQtaDisponibile(new BigDecimal(-1)) .setQtaDisponibile(new BigDecimal(-1))
.setMtbAart(mtbColrToEditClone.getMtbAart()) .setMtbAart(mtbColrToEditClone.getMtbAart())
.setCanPartitaMagBeChanged(false) .setCanPartitaMagBeChanged(false)
.setQtaTot(mtbColrToEditClone.getQtaCol()); .setQtaTot(mtbColrToEditClone.getQtaCol())
.setQtaCnf(mtbColrToEditClone.getQtaCnf())
.setNumCnf(mtbColrToEditClone.getNumCnf().intValue());
DialogInputQuantity.makeBase(mContext, dto, true, value -> { DialogInputQuantity.makeBase(mContext, dto, true, value -> {
@ -651,6 +653,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
mtbColrToEditClone mtbColrToEditClone
.setQtaCol(value.qtaTot.getBigDecimal()) .setQtaCol(value.qtaTot.getBigDecimal())
.setNumCnf(value.numCnf.getBigDecimal())
.setMtbAart(mtbColrToEdit.getMtbAart()) .setMtbAart(mtbColrToEdit.getMtbAart())
.setOperation(CommonModelConsts.OPERATION.NO_OP); .setOperation(CommonModelConsts.OPERATION.NO_OP);

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

@ -500,7 +500,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/AppTheme.NewMaterial.Text.Small" style="@style/AppTheme.NewMaterial.Text.Small"
android:text="Modifica"/> android:text="@string/edit"/>
</LinearLayout> </LinearLayout>
@ -528,7 +528,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/AppTheme.NewMaterial.Text.Small" style="@style/AppTheme.NewMaterial.Text.Small"
android:text="Cancella"/> android:text="@string/delete"/>
</LinearLayout> </LinearLayout>

52
app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
View File

@ -24,6 +24,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -46,29 +47,29 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="12dp" android:paddingStart="12dp"
android:paddingEnd="12dp" android:paddingEnd="12dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:textSize="16sp"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textStyle="bold" android:textStyle="bold"
android:background="@drawable/badge1_round_corner" android:background="@drawable/badge1_round_corner"
android:text="@{viewmodel.mtbColt.get().numCollo.toString()}" android:text="@{viewmodel.mtbColt.get().numCollo.toString()}"
style="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="2156"/> tools:text="2156"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:textSize="16sp"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textStyle="bold" android:textStyle="bold"
android:visibility="@{!UtilityString.isNullOrEmpty(viewmodel.mtbColt.get().posizione) ? View.VISIBLE : View.GONE}" android:visibility="@{!UtilityString.isNullOrEmpty(viewmodel.mtbColt.get().posizione) ? View.VISIBLE : View.GONE}"
android:text="@{viewmodel.mtbColt.get().posizione}" android:text="@{viewmodel.mtbColt.get().posizione}"
style="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="ME1FS032"/> tools:text="ME1FS032"/>
@ -114,6 +115,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:hintTextAppearance="@style/hint_text" app:hintTextAppearance="@style/hint_text"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/guide_line_fornitore"> app:layout_constraintEnd_toStartOf="@id/guide_line_fornitore">
@ -132,6 +134,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:hintTextAppearance="@style/hint_text" app:hintTextAppearance="@style/hint_text"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@id/guide_line_fornitore" app:layout_constraintStart_toEndOf="@id/guide_line_fornitore"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent">
@ -180,6 +183,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:hintTextAppearance="@style/hint_text" app:hintTextAppearance="@style/hint_text"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent">
@ -256,8 +260,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textSize="18sp" android:text="@string/no_item_text"
android:text="@string/no_item_text"/> style="@style/AppTheme.NewMaterial.Text.Medium"/>
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -266,7 +270,10 @@
android:id="@+id/rettifica_giacenze_main_list" android:id="@+id/rettifica_giacenze_main_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="32dp"/> android:paddingTop="16dp"
android:paddingBottom="80dp"
android:clipToPadding="false"
android:scrollbarStyle="outsideOverlay"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/rettifica_giacenze_main_fab" android:id="@+id/rettifica_giacenze_main_fab"
@ -294,6 +301,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
<LinearLayout <LinearLayout
android:id="@+id/bottom_sheet_actions" android:id="@+id/bottom_sheet_actions"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -317,6 +326,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/bottom_sheet_actions_quantity" app:layout_constraintEnd_toStartOf="@id/bottom_sheet_actions_quantity"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -326,30 +336,31 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:text="Descrizione articolo" tools:text="Descrizione articolo"
android:textColor="#444" android:textColor="#444"
android:textSize="18dp" android:maxLines="2"
android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
android:paddingRight="8dp" android:paddingStart="0dp"
android:textStyle="bold" /> android:paddingEnd="8dp"
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Medium"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/bottom_sheet_actions_subtitle" android:id="@+id/bottom_sheet_actions_subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:text="ABF52IL" tools:text="ABF52IL"
android:textSize="14dp" style="@style/AppTheme.NewMaterial.Text.Small" />
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/bottom_sheet_actions_quantity" android:id="@+id/bottom_sheet_actions_quantity"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:gravity="right" android:gravity="end"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textStyle="bold" android:textStyle="bold"
android:textSize="15dp"
tools:text="250 PZ" tools:text="250 PZ"
style="@style/AppTheme.NewMaterial.Text.Small"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -370,6 +381,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/guideline_action" app:layout_constraintEnd_toStartOf="@id/guideline_action"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
android:gravity="center"> android:gravity="center">
@ -388,7 +400,8 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Modifica"/> style="@style/AppTheme.NewMaterial.Text.Small"
android:text="@string/edit"/>
</LinearLayout> </LinearLayout>
@ -396,6 +409,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/guideline_action" app:layout_constraintStart_toStartOf="@id/guideline_action"
android:gravity="center"> android:gravity="center">
@ -414,7 +428,8 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Cancella"/> style="@style/AppTheme.NewMaterial.Text.Small"
android:text="@string/delete"/>
</LinearLayout> </LinearLayout>
@ -423,6 +438,9 @@
</LinearLayout> </LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout> </FrameLayout>

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

@ -230,7 +230,7 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Cancella"/> android:text="@string/delete"/>
</LinearLayout> </LinearLayout>

7
app/src/main/res/layout/lista_rettifica_giacenze_model.xml
View File

@ -42,6 +42,7 @@
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text"
tools:text="COD MART" /> tools:text="COD MART" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
@ -55,6 +56,7 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_toEndOf="@id/cod_mart" android:layout_toEndOf="@id/cod_mart"
android:visibility="@{(mtbColr.mtbAart != null &amp;&amp; !UtilityString.isNullOrEmpty(mtbColr.mtbAart.diacod)) ? View.VISIBLE : View.GONE}" android:visibility="@{(mtbColr.mtbAart != null &amp;&amp; !UtilityString.isNullOrEmpty(mtbColr.mtbAart.diacod)) ? View.VISIBLE : View.GONE}"
style="@style/AppTheme.NewMaterial.Text"
tools:text="(12345)" /> tools:text="(12345)" />
@ -80,13 +82,12 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@id/posizione_collo"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:text="@{mtbColr.getDescrizione()}" android:text="@{mtbColr.getDescrizione()}"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textSize="16sp" android:textSize="16sp"
style="@style/AppTheme.NewMaterial.Text"
tools:text="Descrizione lunga articolo" /> tools:text="Descrizione lunga articolo" />
@ -96,6 +97,7 @@
android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}" android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
android:textSize="14sp" android:textSize="14sp"
android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.GONE : View.VISIBLE}" android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.GONE : View.VISIBLE}"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="Lotto: ABCDE" /> tools:text="Lotto: ABCDE" />
</LinearLayout> </LinearLayout>
@ -125,6 +127,7 @@
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textStyle="bold" android:textStyle="bold"
android:textAllCaps="true" android:textAllCaps="true"
style="@style/AppTheme.NewMaterial.Text"
tools:text="280.45\nCONF" /> tools:text="280.45\nCONF" />
</RelativeLayout> </RelativeLayout>