From 7e738a50d8a1f266a01cb03b8670488f15347e10 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Tue, 3 Dec 2024 07:15:27 +0100 Subject: [PATCH] feat: refs #6934 inventary --- .../es/verdnatura/domain/ConstAndValues.kt | 1 + .../feature/ubicador/model/ItemUbicadorVO.kt | 13 ++++++-- .../main/res/layout/fragment_inventary.xml | 31 ++++++++++++++++++- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt b/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt index 7f38a4be..d26603d1 100644 --- a/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt +++ b/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt @@ -44,6 +44,7 @@ object ConstAndValues { const val ENTRYOBSERVATIONORIGINAL = "ENTRYOBSERVATIONORIGINAL" const val ITEMPACKING = "itemPackingType" const val ITEMPACKINGFK = "itemPackingTypeFk" + const val ITEMPACKINGTYPEFILTER = "itemPackingTypeFilter" const val BUYER = "buyernickname" const val BUYERID = "buyerid" const val WAGON = "wagon" diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt index ca28027a..92b2aeab 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt @@ -1,5 +1,7 @@ package es.verdnatura.presentation.view.feature.ubicador.model +import es.verdnatura.presentation.common.Action + class ItemUbicadorVO( var item: Int, var description: String = "", @@ -63,12 +65,16 @@ class ItemUbicadorListNew( class ItemShelvingNewerList( var list: List = listOf(), var originalParking: String, - var originalShelvingFk: String + var originalShelvingFk: String, + var originalItem: Int? = null, + var originalAction: Action? ) data class ItemShelvingNewer( - var itemFk: Int, - var shelvingFk: String, + val itemFk: Int, + val shelvingFk: String, + val created: String, + val parkingCode: String ) data class ItemBuy( @@ -83,6 +89,7 @@ data class ShelvingItem( val id: Int, val code: String, val priority: Int, + val parkingFk: Int? = null,//para findOne directo a Shelving val parking: Parking?, val itemShelving: MutableList? ) diff --git a/app/src/main/res/layout/fragment_inventary.xml b/app/src/main/res/layout/fragment_inventary.xml index eb70839b..a1eb6f00 100644 --- a/app/src/main/res/layout/fragment_inventary.xml +++ b/app/src/main/res/layout/fragment_inventary.xml @@ -43,11 +43,29 @@ android:textColorHint="#78909C" tools:ignore="TextContrastCheck" /> + + + +