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

Version 9.1Beta- Filtro inventario

This commit is contained in:
Sergio De la torre 2022-09-22 10:27:26 +02:00
parent b77ef2d470
commit 6a876e010f
7 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@ -13,9 +13,10 @@ android {
applicationId "es.verdnatura" applicationId "es.verdnatura"
minSdkVersion 21 //21 minSdkVersion 21 //21
targetSdkVersion 30 targetSdkVersion 30
versionCode 131 versionCode 132
versionName = "9.1Beta"
//versionName = "9Beta"// versionCode 131
//versionName = "8.9" versionCode 130 //versionName = "8.9" versionCode 130
versionName = "9Beta"
//versionName = "8.9Beta" versionCode 129 //versionName = "8.9Beta" versionCode 129
//versionName = "8.8Beta" versioncode 128 //versionName = "8.8Beta" versioncode 128
//versionName = "8.7Beta" versionCode 127 //versionName = "8.7Beta" versionCode 127

2
app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt
View File

@ -15,7 +15,7 @@ fun CollectionVO.map(context: Context): CollectionVO {
ticket.sales.forEach { ticket.sales.forEach {
it.ticketFk = ticket.ticketFk it.ticketFk = ticket.ticketFk
it.level = ticket.level it.level = ticket.level
it.rgb = it.rgb it.rgb = ticket.rgb
it.salePersonFk = ticket.salesPersonFk it.salePersonFk = ticket.salesPersonFk
it.agencyName = ticket.agencyName it.agencyName = ticket.agencyName
it.isNew = it.isAdded == "1" it.isNew = it.isAdded == "1"

6
app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt
View File

@ -162,6 +162,7 @@ class InventaryFragment :
} else { } else {
listInvetory.removeAll(listInvetoryAux) listInvetory.removeAll(listInvetoryAux)
listInvetory.addAll(listInvetoryAux.filter { listInvetory.addAll(listInvetoryAux.filter {
it.itemFk.contains( it.itemFk.contains(
binding.filterItemFk.text.toString(), binding.filterItemFk.text.toString(),
@ -169,7 +170,10 @@ class InventaryFragment :
) || it.producer.contains( ) || it.producer.contains(
binding.filterItemFk.text.toString(), binding.filterItemFk.text.toString(),
true true
) || it.longName.contains(binding.filterItemFk.text.toString(),ignoreCase = true) ) || it.longName?.contains(
binding.filterItemFk.text.toString(),
ignoreCase = true
) == true
}) })
} }

22
app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt
View File

@ -1,18 +1,18 @@
package es.verdnatura.presentation.view.feature.inventario.model package es.verdnatura.presentation.view.feature.inventario.model
class ItemInventaryVO ( class ItemInventaryVO(
var itemFk:String = "", var itemFk: String = "",
var longName:String= "", var longName: String? = "",
var size:String= "", var size: String = "",
var producer:String= "", var producer: String = "",
var downstairs:String= "", var downstairs: String = "",
var upstairs:String= "", var upstairs: String = "",
var nicho:String= "", var nicho: String = "",
var isError:Boolean = false, var isError: Boolean = false,
var errorMessage:String = "" var errorMessage: String = ""
) )
class InventaryListVO ( class InventaryListVO(
var list: List<ItemInventaryVO> = listOf() var list: List<ItemInventaryVO> = listOf()
) )

4
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/mapper/SaleMapper.kt
View File

@ -21,7 +21,7 @@ fun PreSacadorItemVO.toSale() : SaleVO {
agencyName = if (trabajador.isNullOrEmpty()) { "" } else trabajador, agencyName = if (trabajador.isNullOrEmpty()) { "" } else trabajador,
packingType=packingType, packingType=packingType,
salePersonFk=if (salesPersonFk.isNullOrEmpty()){""}else salesPersonFk, salePersonFk=if (salesPersonFk.isNullOrEmpty()){""}else salesPersonFk,
rgb= "" rgb= null
) )
@ -44,7 +44,7 @@ fun PreSacadorItemVO.toSaleReposicion() : SaleVO {
originalQuantity = quantity.toString(), originalQuantity = quantity.toString(),
placements = carros, placements = carros,
agencyName = if (trabajador.isNullOrEmpty()) { "" } else trabajador, agencyName = if (trabajador.isNullOrEmpty()) { "" } else trabajador,
rgb="" rgb=null
) )
} }

9
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt
View File

@ -141,16 +141,17 @@ class SacadorFragment :
//Tarea 4351 cambiar getData(WAGON) por getData(NUMBEROFWAGONS) //Tarea 4351 cambiar getData(WAGON) por getData(NUMBEROFWAGONS)
//Tarea 4130 //Tarea 4130
viewModel.collectionNew( /* viewModel.collectionNew(
getData(USER), getData(USER),
getData(PASSWORD), getData(PASSWORD),
getData(SECTORFK), getData(SECTORFK),
getData(NUMBEROFWAGONS) getData(NUMBEROFWAGONS)
) )*/
/* viewModel.collection_assign( //Tarea 4520
viewModel.collection_assign(
getData(USER), getData(USER),
getData(PASSWORD), getData(PASSWORD),
)*/ )
} }
iconVehicleIn.drawable -> ma.onVehicleSelected(SacadorFragment.TAG) iconVehicleIn.drawable -> ma.onVehicleSelected(SacadorFragment.TAG)

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

@ -17,7 +17,7 @@ class CollectionVO(
class TicketVO( class TicketVO(
var ticketFk: String = "", var ticketFk: String = "",
var level: String = "", var level: String = "",
var rgb: String = "", var rgb: String?,
var agencyName: String = "", var agencyName: String = "",
var salesPersonFk: String = "", var salesPersonFk: String = "",
var sales: List<SaleVO> = listOf(), var sales: List<SaleVO> = listOf(),
@ -28,7 +28,7 @@ class TicketVO(
class SaleVO( class SaleVO(
var ticketFk: String = "", var ticketFk: String = "",
var level: String = "", var level: String = "",
var rgb: String = "", var rgb: String?,
var agencyName: String = "", var agencyName: String = "",
var saleOrder: Int = 9999, var saleOrder: Int = 9999,
var saleFk: String = "", var saleFk: String = "",