From 67b9460fbdd36fb5339921c177d424af8b51a20f Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Tue, 12 Dec 2023 13:17:28 +0100 Subject: [PATCH] refs #6460 fix:calls --- app/build.gradle | 4 +-- .../buscaritem/fragment/BuscarItemFragment.kt | 31 +++++++++---------- .../fragment/CollectionViewModel.kt | 23 ++++++++------ .../ExpeditionPalletDetailFragment.kt | 3 +- .../ExpeditionPalletDetailViewModel.kt | 5 ++- 5 files changed, 34 insertions(+), 32 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index edb0d375..166a3b59 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "es.verdnatura" minSdkVersion 24 //21 targetSdkVersion 33 - versionCode 242 - versionName = "23.48Beta" + versionCode 245 + versionName = "23.46" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt index ea4a0a27..2ceca268 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt @@ -92,24 +92,23 @@ class BuscarItemFragment( true, it.list[0].errorMessage ) - } - } else { + }else{ + adapter = LocationAdapter(it.list, pasillerosItemClickListener!!) + binding.locationRecyclerview.adapter = adapter + binding.locationRecyclerview.layoutManager = + LinearLayoutManager( + requireContext(), + LinearLayoutManager.VERTICAL, + false + ) - adapter = LocationAdapter(it.list, pasillerosItemClickListener!!) - binding.locationRecyclerview.adapter = adapter - binding.locationRecyclerview.layoutManager = - LinearLayoutManager( - requireContext(), - LinearLayoutManager.VERTICAL, - false - ) - - var totalVisible = 0 - it.list.forEach { - totalVisible += it.visible + var totalVisible = 0 + it.list.forEach { + totalVisible += it.visible + } + binding.mainToolbar.toolbarTitle.text = + getString(R.string.item) + itemFk + " " + getString(R.string.visibleTotal) + totalVisible } - binding.mainToolbar.toolbarTitle.text = - getString(R.string.item) + itemFk + " " + getString(R.string.visibleTotal) + totalVisible } } }) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt index c3efdbf6..6784bd86 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt @@ -12,7 +12,6 @@ import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.common.Event -import es.verdnatura.presentation.common.ItemShelvingSaleSalix import es.verdnatura.presentation.common.ResponseItemVO import es.verdnatura.presentation.view.feature.collection.ItemVO import es.verdnatura.presentation.view.feature.collection.SalesModifiedList @@ -88,9 +87,14 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) { val responseItemShelvingSale: LiveData get() = _responseItemShelvingSale + + private val _responseItemShelvingSaleUnPicked by lazy { MutableLiveData() } + val responseItemShelvingSaleUnPicked: LiveData + get() = _responseItemShelvingSaleUnPicked + private val _responseCollectionAddItem by lazy { MutableLiveData() } val responseCollectionAddItem: LiveData - get() = responseCollectionAddItem + get() = _responseCollectionAddItem private val _responseConfirmReservedUpdate by lazy { MutableLiveData() } val responseConfirmReservedUpdate: LiveData @@ -372,13 +376,14 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) { }) } - fun confirmItemShelvingReserved( + fun itemShelvingSaleSetQuantity( itemShelvingSaleFk: Int, quantity: Int, isItemShelvingSaleEmpty: Boolean? ) { - salix.itemShelvingsConfirmRerserved( - params = ItemShelvingSaleSalix(itemShelvingSaleFk, quantity, isItemShelvingSaleEmpty) + salix.itemShelvingSaleSetquantitySalix(params = arrayListOf(itemShelvingSaleFk,quantity,isItemShelvingSaleEmpty) + //salix.itemShelvingSaleSetQuantity( + // params = ItemShelvingSaleSalix(itemShelvingSaleFk, quantity, isItemShelvingSaleEmpty) ).enqueue(object : SilexCallback(context) { override fun onError(t: Throwable) { _responseConfirmReservedItemShelvingSale.value = ResponseItemVO( @@ -562,14 +567,14 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) { ) ).enqueue(object : SalixCallback(context) { override fun onError(t: Throwable) { - _responseItemShelvingSale.value = ResponseItemVO( + _responseItemShelvingSaleUnPicked.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } override fun onSuccess(response: Response) { - _responseItemShelvingSale.value = ResponseItemVO(isError = false) + _responseItemShelvingSaleUnPicked.value = ResponseItemVO(isError = false) } }) } @@ -583,14 +588,14 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) { ) ).enqueue(object : SalixCallback(context) { override fun onError(t: Throwable) { - _responseItemShelvingSale.value = ResponseItemVO( + _responseSaleGroup.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } override fun onSuccess(response: Response) { - _responseItemShelvingSale.value = ResponseItemVO(isError = false) + _responseSaleGroup.value = ResponseItemVO(isError = false) } }) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt index 06006865..2b75a338 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt @@ -133,8 +133,7 @@ class ExpeditionPalletDetailFragment( requireContext() ) viewModel.expeditionPalletPrintSet( - itemPallet!!.Pallet, - getDataInt(SECTORFK) + itemPallet!!.Pallet ) } else { ma.messageWithSound( diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt index e38f6de3..8bbdd041 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt @@ -90,10 +90,9 @@ class ExpeditionPalletDetailViewModel(var context: Context) : BaseViewModel(cont } fun expeditionPalletPrintSet( - vPalletFk: Int, - vSectorFk: Int + vPalletFk: Int ) { - salix.expeditionPalletPrintLabel(arrayListOf(vPalletFk, vSectorFk)) + salix.expeditionPalletPrintLabel(arrayListOf(vPalletFk)) .enqueue(object : SilexCallback(context) { override fun onSuccess(response: Response) { _responsePrintPallet.value =