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

feat issues refs #7636

This commit is contained in:
Sergio De la torre 2024-07-31 12:07:20 +02:00
parent f5bc472f53
commit d2cd21f2eb
7 changed files with 77 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
View File

@ -219,11 +219,19 @@ class AjustesFragment :
} }
super.observeViewModel() super.observeViewModel()
} }
private fun getUserData() { private fun getUserData() {
loginViewModel = LoginViewModel(requireActivity().applicationContext) loginViewModel = LoginViewModel(requireActivity().applicationContext)
loginViewModel.operatorGetData(mobileApplication.userId!!) try {
loginViewModel.operatorGetData(mobileApplication.userId!!)
} catch (_: Exception) {
ma.messageWithSound(
message = getString(R.string.errorGetData),
isError = true,
isPlayed = true
)
}
loginViewModel.workerOperator.observe(this@AjustesFragment) { iti -> loginViewModel.workerOperator.observe(this@AjustesFragment) { iti ->
if (!iti.isError) { if (!iti.isError) {
runBlocking { mobileApplication.dataStoreApp.saveDataOperator(iti) } runBlocking { mobileApplication.dataStoreApp.saveDataOperator(iti) }
@ -234,6 +242,7 @@ class AjustesFragment :
setSettings() setSettings()
} }
private fun showMenuByDefault() { private fun showMenuByDefault() {
pasilleroViewModel = PasilleroViewModel(mobileApplication) pasilleroViewModel = PasilleroViewModel(mobileApplication)
pasilleroViewModel.inititializeDefaultDataInit() pasilleroViewModel.inititializeDefaultDataInit()

57
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
View File

@ -9,7 +9,6 @@ import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Parcelable import android.os.Parcelable
import android.text.InputType
import android.text.InputType.TYPE_CLASS_NUMBER import android.text.InputType.TYPE_CLASS_NUMBER
import android.text.InputType.TYPE_CLASS_TEXT import android.text.InputType.TYPE_CLASS_TEXT
import android.util.Log.d import android.util.Log.d
@ -334,15 +333,25 @@ class CollectionFragment(
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) { if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) {
if (customDialogList.getValue().isNotEmpty()) { if (customDialogList.getValue().isNotEmpty()) {
ma.hideKeyboard(customDialogList.getEditText()) ma.hideKeyboard(customDialogList.getEditText())
val saleGroupScanned = itemScanValue( try {
customDialogList.getValue(), val saleGroupScanned = itemScanValue(
arrayOf("saleGroup"), customDialogList.getValue(),
"id" arrayOf("saleGroup"),
).toString() "id"
isScanned = ).toString()
event != null && event.action == ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER isScanned =
markPrevia(saleGroupScanned) event != null && event.action == ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER
customDialogList.dismiss() markPrevia(saleGroupScanned)
customDialogList.dismiss()
} catch (ex: Exception) {
ma.messageWithSound(
message = ex.message.toString(),
isError = true,
isPlayed = true,
isToasted = true
)
}
} }
customDialogList.setValue("") customDialogList.setValue("")
ma.hideKeyboard(customDialogList.getEditText()) ma.hideKeyboard(customDialogList.getEditText())
@ -425,7 +434,7 @@ class CollectionFragment(
} }
"buy" -> binding.scanInput.setText(myQr.more) "buy" -> binding.scanInput.setText(myQr.more)
"ticket" -> findSale(myQr.id.toString()) "ticket" -> findSale(myQr.id.toString())
} }
@ -641,7 +650,7 @@ class CollectionFragment(
onQuantityOfShelvingSelected(itemShelvingFkStored) onQuantityOfShelvingSelected(itemShelvingFkStored)
} else { } else {
showErrorMessage(getString(R.string.lineNotExist)) showErrorMessage(getString(R.string.lineNotExist))
if (mperror != null) mperror?.start() if (mperror != null) mperror?.start()
} }
@ -1620,7 +1629,7 @@ class CollectionFragment(
isScanned = false/*Tarea #5109*/ isScanned = false/*Tarea #5109*/
customDialogList.setValueTwo( customDialogList.setValueTwo(
itemScanValue( itemScanValue(
customDialogList.getValueTwo(), arrayOf("buy"), "more" customDialogList.getValueTwo(), arrayOf("buy"), "more"
).toString() ).toString()
) )
@ -1699,7 +1708,7 @@ class CollectionFragment(
customDialogList.setValueTwo( customDialogList.setValueTwo(
itemScanValue( itemScanValue(
customDialogList.getValueTwo(), arrayOf("buy"), "more" customDialogList.getValueTwo(), arrayOf("buy"), "more"
).toString() ).toString()
) )
@ -1943,7 +1952,7 @@ class CollectionFragment(
try { try {
customDialogList.setValue( customDialogList.setValue(
itemScanValue( itemScanValue(
customDialogList.getValue(), arrayOf("buy"), "more" customDialogList.getValue(), arrayOf("buy"), "more"
).toString() ).toString()
) )
@ -2055,11 +2064,11 @@ class CollectionFragment(
saleAdapter!!.notifyDataSetChanged() saleAdapter!!.notifyDataSetChanged()
if (canChangeState) changeTicketState() if (canChangeState) changeTicketState()
}else{ } else {
if (allTicketsChecked){ if (allTicketsChecked) {
sales.forEach{ sales.forEach {
if (it.isControlled == "0"){ if (it.isControlled == "0") {
viewModel.ticketStateTodaySetState( viewModel.ticketStateTodaySetState(
ticketFk = it.ticketFk.toInt(), state = "ON_CHECKING" ticketFk = it.ticketFk.toInt(), state = "ON_CHECKING"
) )
@ -2145,11 +2154,15 @@ class CollectionFragment(
increaseQuantity(position, customDialogThreeButtons.getValue().toInt()) increaseQuantity(position, customDialogThreeButtons.getValue().toInt())
scanRequest() scanRequest()
customDialogThreeButtons.dismiss() customDialogThreeButtons.dismiss()
}catch (ex:Exception){ } catch (ex: Exception) {
ma.messageWithSound(message = getString(R.string.errorInputQuantity), isPlayed = true, isError = true, isToasted = true) ma.messageWithSound(
message = getString(R.string.errorInputQuantity),
isPlayed = true,
isError = true,
isToasted = true
)
} }
}.setKoButton(getString(R.string.cancel)) { }.setKoButton(getString(R.string.cancel)) {
scanRequest() scanRequest()
customDialogThreeButtons.dismiss() customDialogThreeButtons.dismiss()

2
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt
View File

@ -179,7 +179,7 @@ class SectorCollectionReserveFragment(
).toString() ).toString()
) )
if (listSalesGroup.firstOrNull { it.code == customDialogList.getValue() } == null) { if (listSalesGroup.firstOrNull { it.code == customDialogList.getValue() } == null) {
listSalesGroup.add(0, BarcodeVO(code = customDialogList.getValue())) listSalesGroup.add(BarcodeVO(code = customDialogList.getValue()))
viewModel.sectorCollectionSaleGroupAdd( viewModel.sectorCollectionSaleGroupAdd(
customDialogList.getValue().toInt(), collectionFk customDialogList.getValue().toInt(), collectionFk
) )

9
app/src/main/res/values-es/strings.xml
View File

@ -303,7 +303,7 @@
<string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string> <string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string>
<string name="parkingOk">Parking ok</string> <string name="parkingOk">Parking ok</string>
<string name="showParking">Escanea el parking</string> <string name="showParking">Escanea el parking</string>
<string name="lineNotExist">La línea de compra de la etiqueta escaneada no existe o el valor escaneado se utiliza para un id de compra y de item y no están relacionados.</string> <string name="lineNotExist">El código de barras no existe. Revisar para reetiquetar etiqueta amarilla</string>
<string name="pendingReview">Pendiente de revisar : </string> <string name="pendingReview">Pendiente de revisar : </string>
<string name="review">Revisar</string> <string name="review">Revisar</string>
<string name="splitSent">Se ha enviado a Split el articulo </string> <string name="splitSent">Se ha enviado a Split el articulo </string>
@ -439,7 +439,7 @@
<string name="titlePalletizDescrip">Accede al menú de paletizadores: paletizar, buffer…</string> <string name="titlePalletizDescrip">Accede al menú de paletizadores: paletizar, buffer…</string>
<string name="titleClaimsDescrip">Accede al menú de reclamaciones</string> <string name="titleClaimsDescrip">Accede al menú de reclamaciones</string>
<string name="titleClaimDescrip">Ubicación de reclamaciones</string> <string name="titleClaimDescrip">Ubicación de reclamaciones</string>
<string name="collectionErrorBuilding">Error al construir la colección. Descripción del error:</string> <string name="collectionErrorBuilding">Error al construir la colección.Descripción del error:</string>
<string name="main">Principal</string> <string name="main">Principal</string>
<string name="sentToTrashPrevious">Se ha enviado desde previa a Basura </string> <string name="sentToTrashPrevious">Se ha enviado desde previa a Basura </string>
<string name="sentToTrashFaults">Se ha enviado desde previa a Faltas la cantidad de </string> <string name="sentToTrashFaults">Se ha enviado desde previa a Faltas la cantidad de </string>
@ -843,5 +843,10 @@
<string name="messageTwoFactorTitle">Verificación doble factor</string> <string name="messageTwoFactorTitle">Verificación doble factor</string>
<string name="validate">Validar</string> <string name="validate">Validar</string>
<string name="showClaimObservation">Muestra las observaciones de reclamaciones</string> <string name="showClaimObservation">Muestra las observaciones de reclamaciones</string>
<string name="rename">Renombrar</string>
<string name="itemNew">Nuevo artículo</string>
<string name="locate">Ubicar</string>
<string name="scanShelvingsLocate">Escanea carros para ubicar el artículo</string>
<string name="shelvingsLocate">Carros a ubicar</string>
</resources> </resources>

9
app/src/main/res/values-fr/strings.xml
View File

@ -303,7 +303,7 @@
<string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string> <string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string>
<string name="parkingOk">Parking ok</string> <string name="parkingOk">Parking ok</string>
<string name="showParking">Escanea el parking</string> <string name="showParking">Escanea el parking</string>
<string name="lineNotExist">La línea de compra de la etiqueta escaneada no existe.</string> <string name="lineNotExist">El código de barras no existe. Revisar para reetiquetar etiqueta amarilla</string>
<string name="pendingReview">Pendiente de revisar : </string> <string name="pendingReview">Pendiente de revisar : </string>
<string name="review">Revisar</string> <string name="review">Revisar</string>
<string name="splitSent">Se ha enviado a Split el articulo </string> <string name="splitSent">Se ha enviado a Split el articulo </string>
@ -843,5 +843,12 @@
<string name="messageTwoFactorTitle">Verificación doble factor</string> <string name="messageTwoFactorTitle">Verificación doble factor</string>
<string name="validate">Validar</string> <string name="validate">Validar</string>
<string name="showClaimObservation">Muestra las observaciones de reclamaciones</string> <string name="showClaimObservation">Muestra las observaciones de reclamaciones</string>
<string name="rename">Renombrar</string>
<string name="itemNew">Nuevo artículo</string>
<string name="errorRepeatedShelving">Carro ya introducido</string>
<string name="locate">Ubicar</string>
<string name="scanShelvingsLocate">Escanea carros para ubicar el artículo</string>
<string name="shelvingsLocate">Carros a ubicar</string>
<string name="errorGetData">Fallo al intentar obtener datos. Avise a Informática</string>
</resources> </resources>

9
app/src/main/res/values-pt/strings.xml
View File

@ -303,7 +303,7 @@
<string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string> <string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string>
<string name="parkingOk">Parking ok</string> <string name="parkingOk">Parking ok</string>
<string name="showParking">Escanea el parking</string> <string name="showParking">Escanea el parking</string>
<string name="lineNotExist">La línea de compra de la etiqueta escaneada no existe.</string> <string name="lineNotExist">El código de barras no existe. Revisar para reetiquetar etiqueta amarilla</string>
<string name="pendingReview">Pendiente de revisar : </string> <string name="pendingReview">Pendiente de revisar : </string>
<string name="review">Revisar</string> <string name="review">Revisar</string>
<string name="splitSent">Se ha enviado a Split el articulo </string> <string name="splitSent">Se ha enviado a Split el articulo </string>
@ -843,5 +843,12 @@
<string name="messageTwoFactorTitle">Verificación doble factor</string> <string name="messageTwoFactorTitle">Verificación doble factor</string>
<string name="validate">Validar</string> <string name="validate">Validar</string>
<string name="showClaimObservation">Muestra las observaciones de reclamaciones</string> <string name="showClaimObservation">Muestra las observaciones de reclamaciones</string>
<string name="rename">Renombrar</string>
<string name="itemNew">Nuevo artículo</string>
<string name="errorRepeatedShelving">Carro ya introducido</string>
<string name="locate">Ubicar</string>
<string name="scanShelvingsLocate">Escanea carros para ubicar el artículo</string>
<string name="shelvingsLocate">Carros a ubicar</string>
<string name="errorGetData">Fallo al intentar obtener datos. Avise a Informática</string>
</resources> </resources>

7
app/src/main/res/values/strings.xml
View File

@ -845,5 +845,12 @@
<string name="messageTwoFactorTitle">Verificación doble factor</string> <string name="messageTwoFactorTitle">Verificación doble factor</string>
<string name="validate">Validar</string> <string name="validate">Validar</string>
<string name="showClaimObservation">Muestra las observaciones de reclamaciones</string> <string name="showClaimObservation">Muestra las observaciones de reclamaciones</string>
<string name="rename">Renombrar</string>
<string name="itemNew">Nuevo artículo</string>
<string name="errorRepeatedShelving">Carro ya introducido</string>
<string name="locate">Ubicar</string>
<string name="scanShelvingsLocate">Escanea carros para ubicar el artículo</string>
<string name="shelvingsLocate">Carros a ubicar</string>
<string name="errorGetData">Fallo al intentar obtener datos. Avise a Informática</string>
</resources> </resources>