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

Version 9.6Beta en test : ubicador, quality, posicion, buscar item, reclamaciones...

This commit is contained in:
Sergio De la torre 2022-11-28 11:31:02 +01:00
parent b8d0f76adf
commit 78a07415ea
36 changed files with 254 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
.idea/workspace.xml
View File

@ -44,7 +44,8 @@
</shared>
</component>
<component name="AndroidLogFilters">
<option name="TOOL_WINDOW_LOG_LEVEL" value="error" />
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura::" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="debug" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="verdnatura" />
<option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
</component>
@ -82,50 +83,44 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.6Beta suppliers">
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_ubicator_check.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.6Beta en test : ubicador, quality, posicion, buscar item, reclamaciones...">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/release/vn-picking.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/Extensions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/Extensions.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetBuscarItemUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetBuscarItemUserCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPackagingUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetQrReaderUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexInterceptor.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexInterceptor.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragmentViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragmentViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/model/Reubication.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/model/Reubication.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -444,13 +439,6 @@
<option name="presentableId" value="Default" />
<updated>1618825571576</updated>
</task>
<task id="LOCAL-00049" summary="Version 8, impresora obligatoria, controlador se desplaza al pulsar, Ubicar Reclamación y líneas controlador = orden saca el sacador">
<created>1649235060928</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1649235060928</updated>
</task>
<task id="LOCAL-00050" summary="Version 8.2 obligatorio sector para imprimir, Desmarcar sacador ok. Cambiado texto DiadeVenta.Añadido icono Parking previa. Actualiza datos en Previa. Nuevo diseño INVISIBLE">
<created>1651646872970</created>
<option name="number" value="00050" />
@ -787,7 +775,14 @@
<option name="project" value="LOCAL" />
<updated>1669186502342</updated>
</task>
<option name="localTasksCounter" value="98" />
<task id="LOCAL-00098" summary="Version 9.6Beta en test">
<created>1669275670424</created>
<option name="number" value="00098" />
<option name="presentableId" value="LOCAL-00098" />
<option name="project" value="LOCAL" />
<updated>1669275670424</updated>
</task>
<option name="localTasksCounter" value="99" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@ -889,8 +884,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="Version 9.1Beta- rgb,trasaccion marcar lineas, new collection y ajustes" />
<MESSAGE value="Version 9.1Beta- Rgb,trasaccion marcar lineas, new collection,shelvingLog, y ajustes" />
<MESSAGE value="Version 9.1Beta- Filtro inventario" />
<MESSAGE value="Version 9.1Beta- Modificar original y originalQuantity" />
<MESSAGE value="Version 9.1Beta-CMR quitado, rgb quitado" />
@ -914,7 +907,9 @@
<MESSAGE value="Version 9.6Beta Añadido a BaseFragment(context). Quitado código repetido de las llamadas" />
<MESSAGE value="Version 9.6Beta Borrado referencias a api Nodejs y código relacionado" />
<MESSAGE value="Version 9.6Beta Cambiadas llamadas y campos( collectionFk). Borrado Presacador" />
<option name="LAST_COMMIT_MESSAGE" value="Version 9.6Beta Cambiadas llamadas y campos( collectionFk). Borrado Presacador" />
<MESSAGE value="Version 9.6Beta en test" />
<MESSAGE value="Version 9.6Beta en test : ubicador, quality, posicion, buscar item, reclamaciones..." />
<option name="LAST_COMMIT_MESSAGE" value="Version 9.6Beta en test : ubicador, quality, posicion, buscar item, reclamaciones..." />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>

6
app/src/main/java/es/verdnatura/domain/GetBuscarItemUserCase.kt
View File

@ -14,12 +14,6 @@ class GetBuscarItemUserCase(context: Context) : RestClient(context) {
val params: ArrayList<String> = ArrayList()
params.add(itemFk)
return restClient!!.searchItemsUbicador(
"json",
"1",
usuario,
password,
"application/json",
params = params
)
}

9
app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
View File

@ -224,8 +224,6 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
fun itemDiary(
usuario: String,
password: String,
itemFk: String,
warehouseFk: String
): Call<List<ItemHistoricoVO>> {
@ -233,12 +231,7 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
params.add(itemFk)
params.add(warehouseFk)
return restClient!!.itemDiary(
"json",
"1",
usuario,
password,
"application/json",
params = params
params
)
}
}

44
app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt
View File

@ -101,50 +101,6 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
): Call<String> {
return restClient!!.collection_assign(
)
}
fun collectionNew(
usuario: String,
password: String,
sectorFk: String,
carros: String
): Call<String> {
val params: ArrayList<String> = ArrayList()
params.add(sectorFk)
params.add(carros)
return restClient!!.collectionNew(
"json",
"1",
usuario,
password,
"application/json",
params
)
}
fun collectionNewSmarttag(
usuario: String,
password: String,
sectorFk: String,
carros: String,
tagtype: String
): Call<String> {
val params: ArrayList<String> = ArrayList()
params.add(sectorFk)
params.add(carros)
params.add(tagtype)
return restClient!!.collectionNew(
"json",
"1",
usuario,
password,
"application/json",
params
)
}
fun collectionGet(): Call<List<CollectionVO>> {

4
app/src/main/java/es/verdnatura/domain/SilexInterceptor.kt
View File

@ -2,11 +2,13 @@ package es.verdnatura.domain
import android.content.Context
import android.content.SharedPreferences
import android.util.Log.d
import okhttp3.FormBody
import okhttp3.Interceptor
import okhttp3.RequestBody
import okhttp3.Response
import java.io.IOException
class SilexInterceptor : Interceptor {
private var context: Context

119
app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
View File

@ -167,30 +167,19 @@ interface VerdnaturaService {
@POST("almacennew/sectorCollection_getSale")//NO SALIX
fun sectorCollection_getSale(
@Body vararg params: Any
):
Call<List<PreSacadorItemVO>>
@POST("almacennew/itemPlacementSupplyGetOrder")//NO SALIX
fun itemPlacementSupplyGetOrder(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<List<PreSacadorItemVO>>
@POST("almacennew/itemPlacementSupplyCloseOrder")//NO SALIX
fun itemPlacementSupplyCloseOrder(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<Any>
@ -206,7 +195,7 @@ interface VerdnaturaService {
):
Call<List<CollectionVO>>
@POST("almacennew/collectionNew")//NO SALIX
/* @POST("almacennew/collectionNew")//NO SALIX
fun collectionNew(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@ -215,7 +204,7 @@ interface VerdnaturaService {
@Header("Content-Type") content_type: String,
@Body params: List<String>
):
Call<String>
Call<String>*/
@POST("almacennew/collection_assign")//NO SALIX
fun collection_assign(
@ -393,7 +382,7 @@ interface VerdnaturaService {
@POST("almacennew/collectionStickerPrint")//REVISADA
fun collectionStickerPrint(
@Body params: List<Any>
@Body vararg params: Any
):
Call<Any>
@ -566,12 +555,7 @@ interface VerdnaturaService {
//CONSULTAR ARTICULO ========================================================================>
@POST("almacennew/itemDiary")//REVISADA
fun itemDiary(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<List<ItemHistoricoVO>>
@ -670,12 +654,7 @@ interface VerdnaturaService {
//BUSCAR ITEM ========================================================================>
@POST("almacennew/getItemUbication")//REVISADA
fun searchItemsUbicador(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<List<ItemLocationVO>>
@ -768,12 +747,7 @@ interface VerdnaturaService {
//UBICADOR ========================================================================>
@POST("almacennew/itemShelvingList")//REVISADA
fun itemShelvingList(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<List<ItemUbicadorVO>>
@ -796,12 +770,7 @@ interface VerdnaturaService {
@POST("almacennew/itemShelvingMakeEdit")//REVISADA
fun itemShelvingMakeEdit(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<Any>
@ -818,12 +787,7 @@ interface VerdnaturaService {
@POST("almacennew/itemShelving_addList")//REVISADA
fun itemShelving_addList(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<Any>
@Body vararg params: Any
):
Call<Any>
@ -860,12 +824,7 @@ interface VerdnaturaService {
@POST("almacennew/itemShelvingTransfer")//REVISADA
fun itemShelvingTransfer(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<Any>
@ -884,12 +843,7 @@ interface VerdnaturaService {
@POST("almacennew/itemShelvingDelete")//REVISADA
fun itemShelvingDelete(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<Any>
@ -981,12 +935,7 @@ interface VerdnaturaService {
@POST("almacennew/itemShelvingLog_get")//REVISADA
fun itemShelvingLog_get(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<List<ItemShelvingLog>>
@ -1058,23 +1007,13 @@ interface VerdnaturaService {
@POST("almacennew/expeditionScanPut")//REVISADA
fun expeditionScanPut(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<Any>
@POST("almacennew/checkRouteExpeditionScanPut")//REVISADA
fun checkRouteExpeditionScanPut(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<String>
@ -1146,12 +1085,7 @@ interface VerdnaturaService {
@POST("almacennew/expeditionPallet_get")//REVISADA
fun expeditionPallet_get(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<ItemExpeditionTruckVO>
@ -1174,23 +1108,13 @@ interface VerdnaturaService {
@POST("almacennew/itemShelvingBuyerTask")//REVISADA
fun itemShelvingBuyerTask(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<List<ItemBuyerVO>>
@POST("almacennew/itemShelvingStarsUpdate")//REVISADA
fun itemShelvingStarsUpdate(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<Any>
@ -1208,12 +1132,7 @@ interface VerdnaturaService {
@POST("almacennew/itemShelving_addByClaim")//REVISADA
fun itemShelving_addByClaim(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
@Body vararg params: Any
):
Call<Void>

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

@ -192,7 +192,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
fun getItemPackingTypeSalix() {
salix!!.get_ItemPackingType().enqueue(object :
salix.get_ItemPackingType().enqueue(object :
Callback<List<ItemPackingType>> {
override fun onFailure(call: Call<List<ItemPackingType>>, t: Throwable) {
val listError: ArrayList<ItemPackingType> = ArrayList()
@ -231,7 +231,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
}
fun getSectorsSalix() {
salix!!.getSectorsSalix().enqueue(object : Callback<List<SectorItemVO>> {
salix.getSectorsSalix().enqueue(object : Callback<List<SectorItemVO>> {
override fun onFailure(call: Call<List<SectorItemVO>>, t: Throwable) {
val listError: ArrayList<SectorItemVO> = ArrayList()
listError.add(SectorItemVO(0, "", 0, true, t.message!!))

15
app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt
View File

@ -9,20 +9,21 @@ import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R
import es.verdnatura.databinding.FragmentBuscarItemBinding
import es.verdnatura.domain.notNull
import es.verdnatura.domain.toInt
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.view.feature.buscaritem.adapter.LocationAdapter
class BuscarItemFragment(
var itemFk: String = ""
var itemFk: Any? = null
) : BaseFragment<FragmentBuscarItemBinding, BuscarItemViewModel>(BuscarItemViewModel::class) {
private var adapter: LocationAdapter? = null
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
companion object {
fun newInstance(entryPoint: String) = BuscarItemFragment(entryPoint)
fun newInstance(entryPoint: Int?) = BuscarItemFragment(entryPoint)
}
override fun onAttach(context: Context) {
@ -38,8 +39,8 @@ class BuscarItemFragment(
binding.mainToolbar.toolbarTitle.text = getString(R.string.getubicaition)
setEvents()
if (!itemFk.isNullOrEmpty()) {
getLocations(itemFk)
if (itemFk != null) {
getLocations(itemFk!! as Int)
}
super.init()
}
@ -51,7 +52,7 @@ class BuscarItemFragment(
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
if (!binding.editItemFk.text.toString().isNullOrEmpty())
getLocations(binding.editItemFk.text.toString())
getLocations(binding.editItemFk.toInt())
binding.editItemFk.setText("")
ma.hideKeyboard(binding.editItemFk)
return@setOnEditorActionListener true
@ -66,10 +67,10 @@ class BuscarItemFragment(
}
private fun getLocations(itemFk: String) {
private fun getLocations(itemFk: Int) {
this.itemFk = itemFk
binding.splashProgress.visibility = View.VISIBLE
viewModel.getLocations(getData(USER), getData(PASSWORD), itemFk)
viewModel.getLocations(itemFk)
}
override fun observeViewModel() {

4
app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt
View File

@ -27,8 +27,8 @@ class BuscarItemViewModel(context: Context) : BaseViewModel(context) {
val loadLocationList = Transformations.map(_locationList) { Event(it) }
fun getLocations(user:String,password:String,itemFk:String){
getBuscarItemUserCase.searchItemsUbicador(user,password,itemFk).enqueue(object : Callback<List<ItemLocationVO>> {
fun getLocations(itemFk:Int){
silex.searchItemsUbicador(itemFk).enqueue(object : Callback<List<ItemLocationVO>> {
override fun onFailure(call: Call<List<ItemLocationVO>>, t: Throwable) {
val listError:ArrayList<ItemLocationVO> = ArrayList()
listError.add(ItemLocationVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!)))

8
app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityFragment.kt
View File

@ -45,7 +45,7 @@ class QaualityFragment(
override fun getLayoutId(): Int = R.layout.qauality_fragment
override fun onCreate(savedInstanceState: Bundle?) {
viewModel.itemShelvingBuyerTask(user = getData(USER),password = getData(PASSWORD),userFk = userFk)
viewModel.itemShelvingBuyerTask(userFk = userFk)
super.onCreate(savedInstanceState)
}
@ -79,7 +79,7 @@ class QaualityFragment(
override fun onOptionsItemSelected(item: Drawable) {
if (item == iconReload){
binding.splashProgress.visibility = View.VISIBLE
viewModel.itemShelvingBuyerTask(user = getData(USER),password = getData(PASSWORD),userFk = userFk)
viewModel.itemShelvingBuyerTask(userFk = userFk)
}
}
})
@ -121,7 +121,7 @@ class QaualityFragment(
})
response.observe(viewLifecycleOwner, Observer {
viewModel.itemShelvingBuyerTask(user = getData(USER),password = getData(PASSWORD),userFk = userFk)
viewModel.itemShelvingBuyerTask(userFk = userFk)
})
}
}
@ -148,7 +148,7 @@ class QaualityFragment(
buyersAdapter = ItemBuyersAdapter(listItems,pasillerosItemClickListener!!,object: OnStarSelectedListener{
override fun onStarSelected(vId: String, vStars: String) {
binding.splashProgress.visibility = View.VISIBLE
viewModel.itemShelvingStarsUpdate(getData(USER),getData(PASSWORD),vId,vStars)
viewModel.itemShelvingStarsUpdate(vId,vStars)
}
})

8
app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityViewModel.kt
View File

@ -28,8 +28,8 @@ class QaualityViewModel(context: Context) : BaseViewModel(context) {
get() = _response
fun itemShelvingBuyerTask(user:String,password:String,userFk:String){
getQualityUserCase.itemShelvingBuyerTask(user,password,userFk).enqueue(object :
fun itemShelvingBuyerTask(userFk:String){
silex.itemShelvingBuyerTask(userFk).enqueue(object :
Callback<List<ItemBuyerVO>> {
override fun onFailure(call: Call<List<ItemBuyerVO>>, t: Throwable) {
val listError:ArrayList<ItemBuyerVO> = ArrayList()
@ -53,8 +53,8 @@ class QaualityViewModel(context: Context) : BaseViewModel(context) {
})
}
fun itemShelvingStarsUpdate(usuario:String,password:String, vId: String,vStars: String) {
getQualityUserCase.itemShelvingStarsUpdate(usuario,password,vId,vStars).enqueue(object : Callback<Any>{
fun itemShelvingStarsUpdate(vId: String,vStars: String) {
silex.itemShelvingStarsUpdate(vId,vStars).enqueue(object : Callback<Any>{
override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
}

14
app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimFragment.kt
View File

@ -80,15 +80,12 @@ class ClaimFragment(
binding.splashProgress.visibility = VISIBLE
viewModel.itemShelving_addByClaim(
getData(USER),
getData(PASSWORD),
listClaims.first().toString(),
listClaims.first().code!!.toInt(),
shelving
)
customDialogList.dismiss()
}
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
@ -119,11 +116,10 @@ class ClaimFragment(
} else {
customDialogList.dismiss()
ma.messageWithSound(
getString(R.string.claimLabel) +listClaims.first().code + getString(R.string.keepPlate) +
listClaims.get(
1
).code
, false, true
getString(R.string.claimLabel) + listClaims.first().code + getString(R.string.keepPlate) +
listClaims.get(
1
).code, false, true
)
listClaims.clear()
claimAdapter!!.notifyDataSetChanged()

94
app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimViewModel.kt
View File

@ -1,60 +1,72 @@
package es.verdnatura.presentation.view.feature.claim.fragment
import android.content.Context
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import es.verdnatura.domain.GetClaimUserCase
import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.base.getMessageFromAllResponse
import es.verdnatura.presentation.base.nameofFunction
import es.verdnatura.presentation.common.ResponseItemVO
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
import android.content.Context
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import es.verdnatura.domain.GetClaimUserCase
import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.base.getMessageFromAllResponse
import es.verdnatura.presentation.base.nameofFunction
import es.verdnatura.presentation.common.ResponseItemVO
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
class ClaimViewModel(context: Context) : BaseViewModel(context) {
private val GetClaimUserCase: GetClaimUserCase = GetClaimUserCase(context)
private val GetClaimUserCase: GetClaimUserCase = GetClaimUserCase(context)
private val _responseadd by lazy { MutableLiveData<ResponseItemVO>() }
val responseadd: LiveData<ResponseItemVO>
get() = _responseadd
private val _responseadd by lazy { MutableLiveData<ResponseItemVO>() }
val responseadd: LiveData<ResponseItemVO>
get() = _responseadd
fun itemShelving_addByClaim(claimFK: Int, shelvingFK: String) {
silex.itemShelving_addByClaim(claimFK, shelvingFK).enqueue(object : Callback<Void> {
override fun onFailure(call: Call<Void>, t: Throwable) {
fun itemShelving_addByClaim(usuario:String,password:String,claimFK:String,shelvingFK:String){
GetClaimUserCase.itemShelving_addByClaim(usuario,password,claimFK,shelvingFK).enqueue(object : Callback<Void>{
override fun onFailure(call: Call<Void>, t: Throwable) {
_responseadd.value = ResponseItemVO(
isError = true, errorMessage = getMessageFromAllResponse(
nameofFunction(this), t.message!!
)
)
}
_responseadd.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(
nameofFunction(this),t.message!!)
override fun onResponse(call: Call<Void>, response: Response<Void>) {
if (!response.isSuccessful) {
_responseadd.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(
nameofFunction(this),
response.message()
)
)
} else {
_responseadd.value = ResponseItemVO(
isError = false,
errorMessage = getMessageFromAllResponse(
nameofFunction(this),
response.message()
)
)
}
override fun onResponse(call: Call<Void>, response: Response<Void>) {
if (!response.isSuccessful){
_responseadd.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
}else{
_responseadd.value = ResponseItemVO(isError = false,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
}
}
})
}
/* fun messageError(message: String,call: String ): ResponseItemVO? {
return ResponseItemVO(
isError = true,
errorMessage = "Error al llamar a " + call + " . Descripción del error:" + message
)
}*/
}
})
}
/* fun messageError(message: String,call: String ): ResponseItemVO? {
return ResponseItemVO(
isError = true,
errorMessage = "Error al llamar a " + call + " . Descripción del error:" + message
)
}*/
}

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

@ -1050,14 +1050,14 @@ class CollectionFragment(
}, object : OnMistakeClickListener {
override fun onMistakeClickListener(sale: SaleVO) {
if (type != "PRECHECKER") {
//if (type != "PRECHECKER") {
binding.splashProgress.visibility =
VISIBLE
mistakeSale = sale
goMistakeBack = false
viewModel.mistakeType(
)
}
)
// }
}
}, object : onPackingClickListener {
override fun onPackingClick(sale: SaleVO) {

8
app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt
View File

@ -24,7 +24,7 @@ import java.util.*
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
class HistoricoArticuloFragment(
var itemFk: String = ""
var itemFk: Int?
) : BaseFragment<FragmentHistoricoBinding, HistoricoArticuloViewModel>(
HistoricoArticuloViewModel::class
) {
@ -37,7 +37,7 @@ class HistoricoArticuloFragment(
private var filter: String = ""
companion object {
fun newInstance(entryPoint: String) = HistoricoArticuloFragment(entryPoint)
fun newInstance(entryPoint: Int) = HistoricoArticuloFragment(entryPoint)
}
override fun getLayoutId(): Int = R.layout.fragment_historico
@ -48,7 +48,7 @@ class HistoricoArticuloFragment(
// customDialog = CustomDialog(requireContext())
ma.hideBottomNavigation(View.GONE)
filter = "all"
viewModel.itemDiary(getData(USER), getData(PASSWORD), itemFk, getData(WAREHOUSEFK))
itemFk?.let { viewModel.itemDiary(it, getData(WAREHOUSEFK).toInt()) }
binding.mainToolbar.toolbarTitle.text = getString(R.string.itemdiary) + ":" + itemFk
setToolBar()
setEvents()
@ -111,7 +111,7 @@ class HistoricoArticuloFragment(
private fun viewModelwithFilter(keyfilter: String) {
filter = keyfilter
binding.splashProgress.visibility = View.VISIBLE
viewModel.itemDiary(getData(USER), getData(PASSWORD), itemFk, getData(WAREHOUSEFK))
itemFk?.let { viewModel.itemDiary(it, getData(WAREHOUSEFK).toInt()) }
}
private fun setEvents() {

4
app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt
View File

@ -28,8 +28,8 @@ class HistoricoArticuloViewModel(context: Context) : BaseViewModel(context) {
val loadHistoricoList = Transformations.map(_historicoList) { Event(it) }
fun itemDiary(usuario:String,password:String,itemFk:String,vWarehouseFk:String){
getItemCardUserCase.itemDiary(usuario,password,itemFk,vWarehouseFk).enqueue(object :
fun itemDiary(itemFk:Int,vWarehouseFk:Int){
silex.itemDiary(itemFk,vWarehouseFk).enqueue(object :
Callback<List<ItemHistoricoVO>> {
override fun onFailure(call: Call<List<ItemHistoricoVO>>, t: Throwable) {
val listError:ArrayList<ItemHistoricoVO> = ArrayList()

4
app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt
View File

@ -78,11 +78,9 @@ class itemShelvingLogFragment(
private fun itemShelvingLog_get(vShelvingFK: String) {
binding.splashProgress.visibility = View.VISIBLE
viewModel.itemShelvingLog_get(getData(USER), getData(PASSWORD), vShelvingFK)
viewModel.itemShelvingLog_get(vShelvingFK)
}
override fun observeViewModel() {
with(viewModel) {

4
app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt
View File

@ -33,8 +33,8 @@ class itemShelvingLogViewModel(context: Context) : BaseViewModel(context) {
fun itemShelvingLog_get(usuario:String,password:String,vShelvingFK: String){
itemShelvingLogUSerCase.itemShelvingLog_get(usuario,password,vShelvingFK).enqueue(object :
fun itemShelvingLog_get(vShelvingFK: String){
silex.itemShelvingLog_get(vShelvingFK).enqueue(object :
Callback<List<ItemShelvingLog>> {
override fun onFailure(call: Call<List<ItemShelvingLog>>, t: Throwable) {
val listError:ArrayList<ItemShelvingLog> = ArrayList()

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

@ -78,7 +78,7 @@ class shelvingLogViewModel(context: Context) : BaseViewModel(context) {
}*/
fun Shelvings(vShelvingFK: String) {
salix!!.Shelvings(vShelvingFK).enqueue(object :
salix.Shelvings(vShelvingFK).enqueue(object :
Callback<List<ShelvingLogSalix>> {
override fun onFailure(call: Call<List<ShelvingLogSalix>>, t: Throwable) {
val listError: ArrayList<ShelvingLogSalix> = ArrayList()

10
app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
View File

@ -316,7 +316,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
when (item.title) {
//BUFFERS
getString(R.string.titlePalletizar) -> {
addFragmentOnTop(ExpeditionTruckListFragment.newInstance())
@ -410,11 +409,16 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
}
getString(R.string.titleItemSearch) -> {
addFragmentOnTop(BuscarItemFragment.newInstance(entryPoint))
addFragmentOnTop(BuscarItemFragment.newInstance(if (entryPoint == "") {
null
} else {
entryPoint.toInt()
}))
}
getString(R.string.titleHistorical) -> {
addFragmentOnTop(HistoricoArticuloFragment.newInstance(entryPoint))
addFragmentOnTop(HistoricoArticuloFragment.newInstance(entryPoint.toInt()))
}
getString(R.string.titleInventory) -> {

10
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt
View File

@ -221,7 +221,7 @@ class ExpeditionPalletFragment(
if (listExpeditions.size > 0) {
onComprobarPalletViewClickListener!!.onComprobarPalletViewClickListener(
itemExpeditionTruckVO!!,
ItemPalletVO(Pallet = it.list.get(0).palletFk)
ItemPalletVO(Pallet = it.list.get(0).palletFk.toString())
)
} else {
customDialog.setTitle(getString(R.string.info))
@ -257,17 +257,13 @@ class ExpeditionPalletFragment(
listExpeditions.add(0, BarcodeVO(code = customDialogList.getValue()))
customDialogList.setDescription(getString(R.string.total) + listExpeditions.size)
viewModel.expeditionScanPut(
getData(USER),
getData(PASSWORD),
it.list.get(0).palletFk,
customDialogList.getValue()
customDialogList.getValue().toInt()
)
////Log.i("VERDNATURA:"," palletizando ${it.list.get(0).palletFk} expedi: ${customDialogList.getValue()}")
viewModel.checkRouteExpeditionScanPut(
getData(USER),
getData(PASSWORD),
it.list.get(0).palletFk,
customDialogList.getValue()
customDialogList.getValue().toInt()
)
} else {
if (mperror != null) mperror!!.start()

12
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt
View File

@ -72,7 +72,7 @@ class ExpeditionPalletViewModel (context: Context) : BaseViewModel(context) {
Callback<List<ItemScanVO>> {
override fun onFailure(call: Call<List<ItemScanVO>>, t: Throwable) {
val listError:ArrayList<ItemScanVO> = ArrayList()
listError.add(ItemScanVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!)))
listError.add(ItemScanVO("",0,isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!)))
_scanList.value = ItemScanList(listError)
}
@ -84,7 +84,7 @@ class ExpeditionPalletViewModel (context: Context) : BaseViewModel(context) {
_scanList.value = response.body()?.let { ItemScanList(it) }
}else{
val listError:ArrayList<ItemScanVO> = ArrayList()
listError.add(ItemScanVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())))
listError.add(ItemScanVO("",0,isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())))
_scanList.value = ItemScanList(listError)
}
}
@ -92,8 +92,8 @@ class ExpeditionPalletViewModel (context: Context) : BaseViewModel(context) {
})
}
fun expeditionScanPut(usuario:String,password:String,vPalletFk:String,vExpeditionFk:String){
getPaletizadoresUserCase.expeditionScanPut(usuario,password,vPalletFk,vExpeditionFk).enqueue(object : Callback<Any>{
fun expeditionScanPut(vPalletFk:Int,vExpeditionFk:Int){
silex.expeditionScanPut(vPalletFk,vExpeditionFk).enqueue(object : Callback<Any>{
override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
}
@ -107,8 +107,8 @@ class ExpeditionPalletViewModel (context: Context) : BaseViewModel(context) {
})
}
fun checkRouteExpeditionScanPut(usuario:String,password:String,vPalletFk:String,vExpeditionFk:String){
getPaletizadoresUserCase.checkRouteExpeditionScanPut(usuario,password,vPalletFk,vExpeditionFk).enqueue(object : Callback<String>{
fun checkRouteExpeditionScanPut(vPalletFk:Int,vExpeditionFk:Int){
silex.checkRouteExpeditionScanPut(vPalletFk,vExpeditionFk).enqueue(object : Callback<String>{
override fun onFailure(call: Call<String>, t: Throwable) {
_response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
}

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

@ -210,7 +210,7 @@ class ExpeditionScanFragment (
if (listExpeditions.size > 0){
onComprobarPalletViewClickListener!!.onComprobarPalletViewClickListener(itemExpeditionTruckVO!!,
ItemPalletVO(Pallet = it.list.get(0).palletFk)
ItemPalletVO(Pallet = it.list.get(0).palletFk.toString())
)
}else{
customDialog.setTitle(getString(R.string.info)).setDescription(getString(R.string.expeditionsError)).setOkButton(getString(
@ -237,14 +237,11 @@ class ExpeditionScanFragment (
listExpeditions.add(BarcodeVO(code = customDialogList.getValue()))
viewModel.expeditionScanPut(
getData(USER),
getData(PASSWORD),
it.list.get(0).palletFk,
customDialogList.getValue()
customDialogList.getValue().toInt()
)
checkRouteExpeditionScanPut(getData(USER),
getData(PASSWORD),it.list.get(0).palletFk,customDialogList.getValue())
checkRouteExpeditionScanPut(it.list.get(0).palletFk,customDialogList.getValue().toInt())
expeditionAdapter!!.notifyDataSetChanged()
@ -268,9 +265,9 @@ class ExpeditionScanFragment (
}
private fun checkRouteExpeditionScanPut(user: String, password: String, palletFk: String, expedition: String){
private fun checkRouteExpeditionScanPut(palletFk: Int, expedition: Int){
viewModel.checkRouteExpeditionScanPut(user,password,palletFk,expedition)
viewModel.checkRouteExpeditionScanPut(palletFk,expedition)
}

22
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt
View File

@ -87,7 +87,7 @@ class ExpeditionScanViewModel(context: Context) : BaseViewModel(context) {
override fun onFailure(call: Call<List<ItemScanVO>>, t: Throwable) {
val listError: ArrayList<ItemScanVO> = ArrayList()
listError.add(
ItemScanVO(
ItemScanVO("",0,
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
)
@ -104,7 +104,7 @@ class ExpeditionScanViewModel(context: Context) : BaseViewModel(context) {
} else {
val listError: ArrayList<ItemScanVO> = ArrayList()
listError.add(
ItemScanVO(
ItemScanVO("",0,
isError = true,
errorMessage = getMessageFromAllResponse(
nameofFunction(this),
@ -119,12 +119,10 @@ class ExpeditionScanViewModel(context: Context) : BaseViewModel(context) {
}
fun expeditionScanPut(
usuario: String,
password: String,
vPalletFk: String,
vExpeditionFk: String
vPalletFk: Int,
vExpeditionFk: Int
) {
getPaletizadoresUserCase.expeditionScanPut(usuario, password, vPalletFk, vExpeditionFk)
silex.expeditionScanPut(vPalletFk, vExpeditionFk)
.enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO(
@ -153,14 +151,10 @@ class ExpeditionScanViewModel(context: Context) : BaseViewModel(context) {
}
fun checkRouteExpeditionScanPut(
usuario: String,
password: String,
vPalletFk: String,
vExpeditionFk: String
vPalletFk: Int,
vExpeditionFk: Int
) {
getPaletizadoresUserCase.checkRouteExpeditionScanPut(
usuario,
password,
silex.checkRouteExpeditionScanPut(
vPalletFk,
vExpeditionFk
).enqueue(object : Callback<String> {

25
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanFragment.kt
View File

@ -1,11 +1,12 @@
package es.verdnatura.presentation.view.feature.paletizador.fragment
import android.util.Log
import android.view.View
import android.view.View.GONE
import android.view.inputmethod.EditorInfo
import androidx.core.view.isVisible
import es.verdnatura.R
import es.verdnatura.databinding.FragmentGeneralBlackBinding
import es.verdnatura.domain.toast
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.itemScanned
import es.verdnatura.presentation.view.component.CustomDialogInput
@ -62,21 +63,21 @@ class PalletScanFragment(
binding.splashProgress.visibility = View.VISIBLE
customDialogList.dismiss()
var valueScanned:String
var valueScanned: String
try {
valueScanned = itemScanned(JSONObject(vPalletId)).id.toString()
Log.d("VERDNATURA::", "el valor es " + valueScanned)
} catch (ex: Exception) {
valueScanned = vPalletId
}
catch(ex:Exception){
valueScanned=vPalletId
Log.d("VERDNATURA::", "ex " + ex.message)
itemScaned = valueScanned
try {
viewModel.expeditionPallet_get(
itemScaned.toInt(),
)
} catch (ex: Exception) {
binding.splashProgress.visibility = GONE
ex.message!!.toast(context)
}
itemScaned=valueScanned
viewModel.expeditionPallet_get(
getData(USER),
getData(PASSWORD),
valueScanned,
)
}

4
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanViewModel.kt
View File

@ -69,8 +69,8 @@ class PalletScanViewModel(context: Context) : BaseViewModel(context) {
})
}
fun expeditionPallet_get(usuario: String, password: String, vPalletId: String) {
GetPaletizadoresUserCase.expeditionPallet_get(usuario, password, vPalletId)
fun expeditionPallet_get(vPalletId: Int) {
silex.expeditionPallet_get(vPalletId)
.enqueue(object : Callback<ItemExpeditionTruckVO> {
override fun onFailure(call: Call<ItemExpeditionTruckVO>, t: Throwable) {

2
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt
View File

@ -2,7 +2,7 @@ package es.verdnatura.presentation.view.feature.paletizador.model
class ItemScanVO (
var expeditionFk:String = "",
var palletFk:String = "",
var palletFk:Int,
var isError:Boolean = false,
var errorMessage:String = ""
)

14
app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt
View File

@ -103,9 +103,7 @@ class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionVie
binding.btnObtener.setOnClickListener {
binding.splashProgress.visibility = View.VISIBLE
viewModel.itemPlacementSupplyGetOrder(
usuario = getData(USER),
password = getData(PASSWORD),
sectorFk = getData(SECTORFK)
sectorFk = getData(SECTORFK).toInt()
)
}
@ -120,10 +118,8 @@ class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionVie
binding.splashProgress.visibility = View.VISIBLE
if (sales.count() > 0) {
viewModel.itemPlacementSupplyCloseOrder(
usuario = getData(USER),
password = getData(PASSWORD),
id = sales[0].id,
quantity = sales[0].quantity.toString()
id = sales[0].id.toInt(),
quantity = sales[0].quantity.toString().toInt()
)
}
customDialog.dismiss()
@ -162,9 +158,7 @@ class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionVie
binding.collectionSwipe.setOnRefreshListener {
binding.splashProgress.visibility = View.VISIBLE
viewModel.itemPlacementSupplyGetOrder(
usuario = getData(USER),
password = getData(PASSWORD),
sectorFk = getData(SECTORFK)
sectorFk = getData(SECTORFK).toInt()
)
binding.collectionSwipe.isRefreshing = false

14
app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionViewModel.kt
View File

@ -45,12 +45,10 @@ class ReposicionViewModel(context: Context) : BaseViewModel(context) {
get() = _responseCode
fun itemPlacementSupplyGetOrder(
usuario: String,
password: String,
sectorFk: String
sectorFk: Int
) {
getPreSacadorUseCase.itemPlacementSupplyGetOrder(usuario, password, sectorFk)
silex.itemPlacementSupplyGetOrder(sectorFk)
.enqueue(object :
Callback<List<PreSacadorItemVO>> {
override fun onFailure(call: Call<List<PreSacadorItemVO>>, t: Throwable) {
@ -219,12 +217,10 @@ class ReposicionViewModel(context: Context) : BaseViewModel(context) {
}
fun itemPlacementSupplyCloseOrder(
usuario: String,
password: String,
id: String,
quantity: String
id: Int,
quantity: Int
) {
getPreSacadorUseCase.itemPlacementSupplyCloseOrder(usuario, password, id, quantity)
silex.itemPlacementSupplyCloseOrder(id, quantity)
.enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) {
_responseClose.value = ResponseItemVO(

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

@ -81,7 +81,7 @@ class SacadorViewModel(context: Context) : BaseViewModel(context) {
})
}
fun collectionNew(usuario: String, password: String, sectorFk: String, wagons: String){
/* fun collectionNew(usuario: String, password: String, sectorFk: String, wagons: String){
getSacadorControladorUserCase.collectionNew(usuario, password, sectorFk, wagons).enqueue(
object :
Callback<String> {
@ -109,7 +109,7 @@ class SacadorViewModel(context: Context) : BaseViewModel(context) {
}
}
})
}
}*/
fun collection_assign(){
@ -142,68 +142,6 @@ class SacadorViewModel(context: Context) : BaseViewModel(context) {
})
}
fun collection_new_smart(usuario: String, password: String, sectorFk: String, wagons: String,tagtype:String){
getSacadorControladorUserCase.collectionNewSmarttag(usuario, password, sectorFk, wagons,tagtype).enqueue(
object :
Callback<String> {
override fun onFailure(call: Call<String>, t: Throwable) {
_responseCollectionSmart.value =
ResponseItemVO(isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
}
override fun onResponse(
call: Call<String>,
response: Response<String>
) {
if (response.body() != null) {
_responseCollectionSmart.value =
ResponseItemVO(isError = false, response = response.body()!!)
} else {
_responseCollectionSmart.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
)
}
}
})
}
/* fun collection_new_smarttag(usuario: String, password: String, sectorFk: String, wagons: String,tagtype:String){
getSacadorControladorUserCase.collectionNewSmarttag(usuario, password, sectorFk, wagons,tagtype).enqueue(
object :
Callback<String> {
override fun onFailure(call: Call<String>, t: Throwable) {
_responseCollectionSmarttag.value =
ResponseItemVO(isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
Log.d("VERDNATURA::","onFAilure")
}
override fun onResponse(
call: Call<String>,
response: Response<String>
) {
if (response.body() != null) {
Log.d("VERDNATURA::","La coleccion de collectionNew_SMARTGS es "+response.body())
_responseCollectionSmarttag.value =
ResponseItemVO(isError = false, response = response.body()!!)
} else {
Log.d("VERDNATURA::","Else del response.body() ")
_responseCollectionSmarttag.value =
ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
)
}
}
})
}*/
fun collectionGet(){
getSacadorControladorUserCase.collectionGet().enqueue(object :
Callback<List<CollectionVO>> {

8
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
View File

@ -88,7 +88,7 @@ class UbicadorAdapter(
)
}
if (item.checked) {
/* if (item.checked) {
itemRowLayout.setBackgroundColor(
ContextCompat.getColor(
visibleText.context,
@ -109,9 +109,9 @@ class UbicadorAdapter(
visibleText.context,
R.color.verdnatura_red_salix
))
}
}*/
/* when (item.isChecked) {
when (item.isChecked) {
1 -> {
itemRowLayout.setBackgroundColor(
ContextCompat.getColor(
@ -138,7 +138,7 @@ class UbicadorAdapter(
)
}
}*/
}

16
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt
View File

@ -10,6 +10,7 @@ import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnAutomaticItemClickListener
import es.verdnatura.presentation.view.feature.ubicador.adapter.AutomaticAdapter
import es.verdnatura.presentation.view.feature.ubicador.model.ItemEscanerVO
import java.lang.Boolean.FALSE
import java.lang.Boolean.TRUE
@ -34,12 +35,8 @@ class AutomaticAddItemFragment(
override fun getLayoutId(): Int = R.layout.fragment_automatic_add_item
override fun init() {
ma.hideBottomNavigation(View.GONE)
binding.mainToolbar.toolbarTitle.text = titleAction
setEvents()
setViews()
setToolBar()
@ -102,21 +99,24 @@ class AutomaticAddItemFragment(
if (binding.mainToolbar.toolbarTitle.text.equals(getString(R.string.titleChecker))) {
viewModel.itemShelving_addList(
getData(USER),
getData(PASSWORD),
shelvingFk,
"" + listInt + "",
TRUE,
getData(WAREHOUSEFK).toInt()
)
} else {
viewModel.itemShelvingMake_multi(
viewModel.itemShelving_addList(
shelvingFk,
"" + listInt + "",
FALSE,
getData(WAREHOUSEFK).toInt())
/* viewModel.itemShelvingMake_multi(
getData(USER),
getData(PASSWORD),
shelvingFk,
listString,
getData(WAREHOUSEFK)
)
)*/
}
}

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

@ -58,16 +58,12 @@ class AutomaticAddItemViewModel(context: Context) : BaseViewModel(context) {
}
fun itemShelving_addList(
usuario: String,
password: String,
shelving: String,
items: Any,
isChecking: Boolean,
warehouse: Int
) {
getUbicadorUserCase.itemShelving_addList(
usuario,
password,
silex.itemShelving_addList(
shelving,
items,
isChecking,

55
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
View File

@ -87,8 +87,7 @@ class UbicadorFragment(
isShelvinLogfromMainScreen = false
binding.splashProgress.visibility = VISIBLE
binding.mainToolbar.toolbarTitle.text = shelvingFk
viewModel.itemShelvingList(getData(USER), getData(PASSWORD), shelvingFk)
viewModel.itemShelvingList(shelvingFk)
} else {
isShelvinLogfromMainScreen = true
@ -143,7 +142,7 @@ class UbicadorFragment(
}
listIcons.add(iconAdd)
listIcons.add(iconReload)
//listIcons.add(iconChecker)
listIcons.add(iconChecker)
binding.mainToolbar.toolbarIcons.adapter =
@ -158,8 +157,6 @@ class UbicadorFragment(
binding.editPrioridad.setText("")
binding.splashProgress.visibility = VISIBLE
viewModel.itemShelvingList(
getData(USER),
getData(PASSWORD),
shelvingFk
)
} else {
@ -211,8 +208,6 @@ class UbicadorFragment(
binding.editPrioridad.setText("")
binding.splashProgress.visibility = VISIBLE
viewModel.itemShelvingList(
getData(USER),
getData(PASSWORD),
binding.editMatricula.text.toString()
)
} else {
@ -259,8 +254,8 @@ class UbicadorFragment(
//Tarea #4778 Para llamar a Revisar items poner R.string.titleChecker
ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleAuto)),
// PasillerosItemVO(title = getString(R.string.titleChecker)),
PasillerosItemVO(title = getString(R.string.titleAuto)),
//PasillerosItemVO(title = getString(R.string.titleChecker)),
entryPoint = shelvingFk
)
else
@ -572,8 +567,7 @@ class UbicadorFragment(
binding.mainToolbar.toolbarTitle.text = shelvingFk
binding.splashProgress.visibility = VISIBLE
viewModel.itemShelvingList(
getData(USER),
getData(PASSWORD), shelvingFk
shelvingFk
)
}
@ -664,7 +658,7 @@ class UbicadorFragment(
packing: String,
visible: String,
updatePacking: Boolean? = null,
itemShelvingFk: String,
itemShelvingFk: Int,
groupingPack: String
) {
if (!packing.isNullOrEmpty()) {
@ -732,17 +726,11 @@ class UbicadorFragment(
if (!itemFk.isNullOrEmpty() && !visible.isNullOrEmpty() && !updatePacking) {
binding.splashProgress.visibility = VISIBLE
viewModel.itemShelvingMakeEdit(
getData(USER),
getData(PASSWORD),
shelvingFk,
itemFk,
deep.toString(),
visible,
packing,
getData(WAREHOUSEFK),
"1",
visible.toInt(),
packing.toInt(),
itemShelvingFk,
groupingPack
groupingPack.toInt()
)
/* changeOfflineValue(
ItemUbicadorVO(
@ -758,24 +746,18 @@ class UbicadorFragment(
customDialogUbicador.dismiss()
} else if (!itemFk.isNullOrEmpty() && !etiquetas.isNullOrEmpty() && updatePacking) {
var visible_calc = "0"
var visible_calc = 0
try {
visible_calc = (etiquetas.toInt() * packing.toInt()).toString()
visible_calc = (etiquetas.toInt() * packing.toInt())
} catch (e: Exception) {
}
binding.splashProgress.visibility = VISIBLE
viewModel.itemShelvingMakeEdit(
getData(USER),
getData(PASSWORD),
shelvingFk,
itemFk,
deep.toString(),
visible_calc,
packing,
getData(WAREHOUSEFK),
"1",
packing.toInt(),
itemShelvingFk,
groupingPack
groupingPack.toInt()
)
/* changeOfflineValue(
ItemUbicadorVO(
@ -815,8 +797,6 @@ class UbicadorFragment(
.setOkButton(getString(R.string.transfer)) {
if (customDialogInput.getValue().isNotEmpty()) {
viewModel.itemShelvingTransfer(
getData(USER),
getData(PASSWORD),
item.id,
customDialogInput.getValue()
)
@ -836,8 +816,6 @@ class UbicadorFragment(
customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
viewModel.itemShelvingTransfer(
getData(USER),
getData(PASSWORD),
item.id,
customDialogInput.getValue()
)
@ -856,8 +834,7 @@ class UbicadorFragment(
listItems.remove(item)
adapter!!.notifyDataSetChanged()
viewModel.itemShelvingDelete(
getData(USER),
getData(PASSWORD), item.id
item.id
)
customDialogTwoButtons.dismiss()
customDialog.dismiss()

39
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
View File

@ -46,11 +46,9 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) {
get() = _responseCode
fun itemShelvingList(
usuario: String,
password: String,
vShelvingFk: String
) {
getUbicadorUserCase.itemShelvingList(usuario, password, vShelvingFk.uppercase())
silex.itemShelvingList(vShelvingFk.uppercase())
.enqueue(object :
Callback<List<ItemUbicadorVO>> {
override fun onFailure(call: Call<List<ItemUbicadorVO>>, t: Throwable) {
@ -173,28 +171,15 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) {
}
fun itemShelvingMakeEdit(
usuario: String,
password: String,
shelving: String,
item: String,
deep: String,
quantity: String,
packing: String,
warehouse: String,
level: String,
itemShelvingFk: String,
grouping: String
quantity: Int,
packing: Int,
itemShelvingFk: Int,
grouping: Int
) {
getUbicadorUserCase.itemShelvingMakeEdit(
usuario,
password,
shelving,
item,
deep,
silex.itemShelvingMakeEdit(
quantity,
packing,
warehouse,
level,
itemShelvingFk,
grouping
).enqueue(object : Callback<Any> {
@ -422,13 +407,11 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) {
}
fun itemShelvingTransfer(
usuario: String,
password: String,
itemFk: String,
itemFk: Int,
shelvingFk: String
) {
getUbicadorUserCase.itemShelvingTransfer(usuario, password, itemFk, shelvingFk)
silex.itemShelvingTransfer(itemFk, shelvingFk)
.enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO(
@ -454,8 +437,8 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) {
})
}
fun itemShelvingDelete(usuario: String, password: String, itemFk: String) {
getUbicadorUserCase.itemShelvingDelete(usuario, password, itemFk)
fun itemShelvingDelete(itemFk: Int) {
silex.itemShelvingDelete(itemFk)
.enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO(

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

@ -10,7 +10,7 @@ class ItemUbicadorVO(
var col: String = "",
var row: String = "",
var code: String = "",
var id: String = "",
var id: Int = 0,
var priority: String = "",
var isError: Boolean = false,
var errorMessage: String = "",