From d9abe0ab083ce504d5d77a2a86a69e79e59a83b5 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Fri, 31 Jan 2025 07:42:22 +0100 Subject: [PATCH] feat: refs#7371 updateSaleIU --- .../fragment/CollectionFragmentPreChecker.kt | 41 +++++++++++++++---- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt index 0fddfcbb..4371135f 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt @@ -103,6 +103,7 @@ class CollectionFragmentPreChecker( private var positionIncreaseQuantity = 0 private var positionReject = 0 private var quantityIncrease: Int = 0 + private var quantityIncreaseDiff: Int = 0 private var quantityReject = "" private var typeCollectionMissing = "" private var positionCollectionMissing = 0 @@ -981,10 +982,11 @@ class CollectionFragmentPreChecker( sales = salesList.sortedWith(compareBy({ it.picked })) } } - saleAdapter = SaleAdapter( - sales as MutableList, + if (sales.isEmpty()) sales.toMutableList() else { + sales as MutableList + }, pasillerosItemClickListener!!, object : OnQuantityClickListener { @@ -1088,9 +1090,10 @@ class CollectionFragmentPreChecker( setListPosition(storedBackPosition, true) } - } + // } - printObservations(observations) + printObservations(observations) + } } private fun setScrollListener(lm: LinearLayoutManager) { @@ -2024,7 +2027,21 @@ class CollectionFragmentPreChecker( changeTicketState() + //cambiamos estado de previas para saber que está PREVIOUS_CONTROLLED + val distinctSaleGroups = mutableSetOf() + sales.forEach { sale -> + sale.saleGroupFk?.let { + distinctSaleGroups.add(it.toInt()) + } ?: run { + println("No hay salegroup") + } + } + if (distinctSaleGroups.isNotEmpty()) + distinctSaleGroups.forEach { saleGroup -> + viewModel.saleGroupUpdateState(saleGroup, 37) + } } + } private fun ticketCollection_setUsedShelves() { @@ -2096,9 +2113,9 @@ class CollectionFragmentPreChecker( customDialogThreeButtons.getValue(), getString(R.string.titleFaults) ) - + }.setOkButtonTwo(getString(R.string.BasuraRechazar)) { - + checkAndCall( position, customDialogThreeButtons.getValue(), @@ -2106,14 +2123,14 @@ class CollectionFragmentPreChecker( ) } // } - + customDialogThreeButtons.setOkButtonThree(getString(R.string.Reject)) { checkAndCall( position, customDialogThreeButtons.getValue(), getString(R.string.Reject) ) - + }.setOkButtonFour(getString(R.string.Split)) { checkAndCall( position, @@ -2175,15 +2192,21 @@ class CollectionFragmentPreChecker( } catch (e: Exception) { } - saleAdapter?.notifyDataSetChanged() sales[positionIncreaseQuantity].originalQuantity = quantityIncrease + saleAdapter?.notifyDataSetChanged() + + viewModel.itemShelvingSaleBySale( + sales[positionIncreaseQuantity].saleFk, + quantityIncreaseDiff + ) } private fun increaseQuantity(position: Int, quantity: Int) { positionIncreaseQuantity = position quantityIncrease = quantity + quantityIncreaseDiff = sales[position].quantity!!.minus(quantityIncrease) viewModel.collectionIncreaseQuantitySalix( saleFk = sales[position].saleFk,