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

feat: refs #6934 inventary

This commit is contained in:
Sergio De la torre 2024-12-03 07:15:27 +01:00
parent 8b101d5625
commit 7e738a50d8
3 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/es/verdnatura/domain/ConstAndValues.kt
View File

@ -44,6 +44,7 @@ object ConstAndValues {
const val ENTRYOBSERVATIONORIGINAL = "ENTRYOBSERVATIONORIGINAL" const val ENTRYOBSERVATIONORIGINAL = "ENTRYOBSERVATIONORIGINAL"
const val ITEMPACKING = "itemPackingType" const val ITEMPACKING = "itemPackingType"
const val ITEMPACKINGFK = "itemPackingTypeFk" const val ITEMPACKINGFK = "itemPackingTypeFk"
const val ITEMPACKINGTYPEFILTER = "itemPackingTypeFilter"
const val BUYER = "buyernickname" const val BUYER = "buyernickname"
const val BUYERID = "buyerid" const val BUYERID = "buyerid"
const val WAGON = "wagon" const val WAGON = "wagon"

13
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt
View File

@ -1,5 +1,7 @@
package es.verdnatura.presentation.view.feature.ubicador.model package es.verdnatura.presentation.view.feature.ubicador.model
import es.verdnatura.presentation.common.Action
class ItemUbicadorVO( class ItemUbicadorVO(
var item: Int, var item: Int,
var description: String = "", var description: String = "",
@ -63,12 +65,16 @@ class ItemUbicadorListNew(
class ItemShelvingNewerList( class ItemShelvingNewerList(
var list: List<ItemShelvingNewer> = listOf(), var list: List<ItemShelvingNewer> = listOf(),
var originalParking: String, var originalParking: String,
var originalShelvingFk: String var originalShelvingFk: String,
var originalItem: Int? = null,
var originalAction: Action?
) )
data class ItemShelvingNewer( data class ItemShelvingNewer(
var itemFk: Int, val itemFk: Int,
var shelvingFk: String, val shelvingFk: String,
val created: String,
val parkingCode: String
) )
data class ItemBuy( data class ItemBuy(
@ -83,6 +89,7 @@ data class ShelvingItem(
val id: Int, val id: Int,
val code: String, val code: String,
val priority: Int, val priority: Int,
val parkingFk: Int? = null,//para findOne directo a Shelving
val parking: Parking?, val parking: Parking?,
val itemShelving: MutableList<ItemShelving>? val itemShelving: MutableList<ItemShelving>?
) )

31
app/src/main/res/layout/fragment_inventary.xml
View File

@ -43,11 +43,29 @@
android:textColorHint="#78909C" android:textColorHint="#78909C"
tools:ignore="TextContrastCheck" /> tools:ignore="TextContrastCheck" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/filter_itemType"
style="@style/InputLineTextSearch"
android:layout_width="wrap_content"
android:layout_weight="2.5"
android:backgroundTint="@android:color/white"
android:focusable="false"
android:focusableInTouchMode="false"
android:hint="@string/packingType"
android:inputType="text"
android:lines="1"
android:maxLines="1"
android:textAlignment="center"
android:textColor="@color/verdnatura_white"
android:textColorHint="#78909C"
app:drawableEndCompat="@drawable/ic_arrow_drop_down_black_24dp"
tools:ignore="TextContrastCheck" />
<TextView <TextView
android:id="@+id/filter_buyer" android:id="@+id/filter_buyer"
style="@style/InputLineTextSearch" style="@style/InputLineTextSearch"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_weight="1" android:layout_weight="2"
android:backgroundTint="@android:color/white" android:backgroundTint="@android:color/white"
android:focusable="false" android:focusable="false"
android:hint="@string/buscarcomprador" android:hint="@string/buscarcomprador"
@ -124,6 +142,17 @@
app:layout_constraintTop_toBottomOf="@id/main_toolbar" app:layout_constraintTop_toBottomOf="@id/main_toolbar"
app:layout_constraintVertical_bias="0" /> app:layout_constraintVertical_bias="0" />
<es.verdnatura.presentation.view.commom.SearchableRecyclerView
android:id="@+id/searchableRecyclerViewItemType"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/main_toolbar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/main_toolbar"
app:layout_constraintVertical_bias="0" />
<include <include
android:id="@+id/main_toolbar" android:id="@+id/main_toolbar"
layout="@layout/toolbar_fragment" layout="@layout/toolbar_fragment"