verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: refs#6861 reservas

This commit is contained in:
Sergio De la torre 2025-02-28 09:02:05 +01:00
parent a7f476417e
commit ad42096eca
13 changed files with 67 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNewInterface.kt
View File

@ -342,6 +342,7 @@ class CollectionFragmentPickerPreviousNewInterface(
lm!!.scrollToPositionWithOffset(positionConfirm, 0)
//lm!!.scrollToPositionWithOffset(storedBackPosition + 1, 0)
setTotalLines()
saleAdapter!!.notifyItemChanged(positionConfirm)
} else {
updateScreen()
}
@ -1101,10 +1102,15 @@ class CollectionFragmentPickerPreviousNewInterface(
println("No hay salegroup")
}
}
if (distinctSaleGroups.isNotEmpty())
distinctSaleGroups.forEach { saleGroup ->
setStateSaleGroup(saleGroup, stateCodeId!!)
}
try {
if (distinctSaleGroups.isNotEmpty())
distinctSaleGroups.forEach { saleGroup ->
setStateSaleGroup(saleGroup, stateCodeId!!)
}
} catch (ex: Exception) {
}
}
}

1
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNewInterfaceSacador.kt
View File

@ -344,6 +344,7 @@ class CollectionFragmentPickerPreviousNewInterfaceSacador(
lm!!.scrollToPositionWithOffset(positionConfirm, 0)
//lm!!.scrollToPositionWithOffset(storedBackPosition + 1, 0)
setTotalLines()
saleAdapter!!.notifyItemChanged(positionConfirm)
} else {
updateScreen()
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt
View File

@ -36,7 +36,7 @@ data class Sale(
val saleFk: Int,
val itemFk: Int,
val longName: String,
val size: Int,
val size: Int? = null,
var semaphore: String?,
var color: String = "",
val productor: String? = "",

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

@ -86,7 +86,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@string/Fecha"
android:text="@string/date"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2" />
</LinearLayout>

19
app/src/main/res/layout/fragment_expedition_log_delivery.xml
View File

@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:layout_weight="1.25"
android:gravity="end"
android:text="@string/Fecha"
android:text="@string/date"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2" />
@ -89,7 +89,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:text="@string/Fecha"
android:text="@string/date"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2" />
@ -121,13 +121,14 @@
android:orientation="vertical"
android:padding="10dp"
tools:ignore="ExtraText">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/itemexpeditionlog_recyclerview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:visibility="visible"
tools:listitem="@layout/item_expeditionlog_row" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/itemexpeditionlog_recyclerview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:visibility="visible"
tools:listitem="@layout/item_expeditionlog_row" />
</LinearLayout>
</LinearLayout>

12
app/src/main/res/layout/fragment_historico.xml
View File

@ -47,35 +47,33 @@
android:layout_marginBottom="@dimen/layout_margin_1"
android:orientation="horizontal"
android:paddingStart="@dimen/layout_margin_min"
android:paddingEnd="@dimen/layout_margin_min"
>
android:paddingEnd="@dimen/layout_margin_min">
<TextView
android:layout_width="100dp"
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/Fecha"
android:text="@string/date"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2"
/>
android:textSize="@dimen/body2" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_margin_min"
android:gravity="center"
android:text="@string/Cliente"
android:layout_marginStart="@dimen/layout_margin_min"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_margin_1"
android:layout_weight="1"
android:gravity="center"
android:text="@string/entry"
android:textColor="@color/verdnatura_white"
android:layout_marginStart="@dimen/layout_margin_1"
android:textSize="@dimen/body2" />
<TextView

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

@ -38,7 +38,7 @@
android:backgroundTint="@android:color/white"
android:drawableEnd="@drawable/ic_calendar"
android:gravity="center"
android:hint="@string/Fecha"
android:hint="@string/date"
android:lines="1"
android:maxLines="1"
android:textAlignment="center"

29
app/src/main/res/layout/fragment_shelvinglog.xml
View File

@ -55,28 +55,27 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@string/Fecha"
android:text="@string/date"
android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body2" />
</LinearLayout>
<RelativeLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/itemshelvinglog_recyclerview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/itemshelvinglog_recyclerview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:visibility="visible"
tools:listitem="@layout/shelvinglog_row" />
</RelativeLayout>
</LinearLayout>
android:clipToPadding="false"
android:visibility="visible"
tools:listitem="@layout/shelvinglog_row" />
</RelativeLayout>
</LinearLayout>
</ScrollView>

9
app/src/main/res/layout/sale_row_fragment_reserve_sacador.xml
View File

@ -53,7 +53,7 @@
android:layout_marginEnd="@dimen/layout_margin_minest"
android:text="@{sale.level}"
android:textColor="@color/verdnatura_black"
android:textSize="@dimen/h9"
android:textSize="@dimen/h7"
android:textStyle="bold"
tool:text="2" />
@ -62,7 +62,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_margin_minest"
android:text="@string/ticketAbb"
android:text="-"
android:textColor="@color/verdnatura_black"
android:textSize="@dimen/h9" />
@ -82,7 +82,6 @@
android:id="@+id/ticketOrder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text='@{"(" + sale.ticketOrder + ")"}'
android:textColor="@color/verdnatura_black"
android:textSize="@dimen/h8"
@ -224,9 +223,9 @@
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:text="@{sale.longName}"
android:text="@{sale.size != 0 ? (sale.longName + ' ' + String.valueOf(sale.size)) : sale.longName}"
android:textColor="#FFFFFF"
tool:text="Set de 3 unidades Cesta pie" />
tool:text="Set de 3 unidades Cesta pie 70" />
</LinearLayout>

6
app/src/main/res/values-es/strings.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Gestor Almacén</string>
<string name="Fecha">Fecha</string>
<string name="date">Fecha</string>
<string name="Cliente">Cliente</string>
<string name="entry">Entrada</string>
<string name="Salida">Salida</string>
@ -923,6 +923,10 @@
<string name="reserve">Reserva</string>
<string name="shelvingItems">No hay artículos en el carro para cambiar su matrícula</string>
<string name="errorDMS">No se puede obterner el tipo DMS. Póngase en contacto con dpto Informática</string>
<string name="titleCleanShelving">Ordenar carro</string>
<string name="organize">Ordenar</string>
<string name="descripOrganize">Escanea carro que vas a ordenar.\nAcuérdate de volver a pulsar el icono cuando termines de ordenar</string>
<string name="activityOrganize">Al pulsar tu actividad será : Ordenar carro</string>
</resources>

6
app/src/main/res/values-fr/strings.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Gestionnaire entrepôt</string>
<string name="Fecha">Date</string>
<string name="date">Date</string>
<string name="Cliente">Cliente</string>
<string name="entry">Entrada</string>
<string name="Salida">Salida</string>
@ -923,5 +923,9 @@
<string name="reserve">Reserva</string>
<string name="shelvingItems">No hay artículos en el carro para cambiar su matrícula</string>
<string name="errorDMS">No se puede obterner el tipo DMS. Póngase en contacto con dpto Informática</string>
<string name="titleCleanShelving">Ordenar carro</string>
<string name="organize">Ordenar</string>
<string name="descripOrganize">Escanea carro que vas a ordenar.\nAcuérdate de volver a pulsar el icono cuando termines de ordenar</string>
<string name="activityOrganize">Al pulsar tu actividad será : Ordenar carro</string>
</resources>

6
app/src/main/res/values-pt/strings.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">gestor armazém</string>
<string name="Fecha">Data</string>
<string name="date">Data</string>
<string name="Cliente">Cliente</string>
<string name="entry">Entrada</string>
<string name="Salida">Salida</string>
@ -923,5 +923,9 @@
<string name="reserve">Reserva</string>
<string name="shelvingItems">No hay artículos en el carro para cambiar su matrícula</string>
<string name="errorDMS">No se puede obterner el tipo DMS. Póngase en contacto con dpto Informática</string>
<string name="titleCleanShelving">Ordenar carro</string>
<string name="organize">Ordenar</string>
<string name="descripOrganize">Escanea carro que vas a ordenar.\nAcuérdate de volver a pulsar el icono cuando termines de ordenar</string>
<string name="activityOrganize">Al pulsar tu actividad será : Ordenar carro</string>
</resources>

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

@ -1,7 +1,7 @@
<resources>
<string name="ef_msg_no_camera_permission" translatable="false">Camera needs permission</string>
<string name="app_name">Warehouse Manager</string>
<string name="Fecha">Date</string>
<string name="date">Date</string>
<string name="Cliente">Client</string>
<string name="entry">Entry</string>
<string name="Salida">Departure</string>
@ -402,7 +402,6 @@
<string name="titlePrePicker">Pre puncher</string>
<string name="titleDayOfSale">Day of sale</string>
<string name="titleShowTicket">Show ticket</string>
<string name="titleHistoricalVehicle">Vehicle history</string>
<string name="titleReplacement">Replacement</string>
<string name="titleItemConsult">Consult item</string>
<string name="titleUbicator">Ubicator</string>
@ -927,5 +926,9 @@
<string name="reserve">Reserva</string>
<string name="shelvingItems">No hay artículos en el carro para cambiar su matrícula</string>
<string name="errorDMS">No se puede obterner el tipo DMS. Póngase en contacto con dpto Informática</string>
<string name="titleCleanShelving">Ordenar carro</string>
<string name="organize">Ordenar</string>
<string name="descripOrganize">Escanea carro que vas a ordenar.\nAcuérdate de volver a pulsar el icono cuando termines de ordenar</string>
<string name="activityOrganize">Al pulsar tu actividad será : Ordenar carro</string>
</resources>