Version 9.6Beta Cambiadas llamadas y campos( collectionFk). Borrado Presacador

.idea/workspace.xml

@@ -44,8 +44,8 @@
     </shared>
   </component>
   <component name="AndroidLogFilters">
-    <option name="TOOL_WINDOW_LOG_LEVEL" value="debug" />
+    <option name="TOOL_WINDOW_LOG_LEVEL" value="error" />
-    <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="VERDNATURA::" />
+    <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="verdnatura" />
     <option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
   </component>
   <component name="AutoImportSettings">
@@ -82,85 +82,70 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.6Beta Interteptors, quitando userCase y arreglado click sobre carita. Cambiado .gitignore">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.6Beta Cambiadas llamadas y campos( collectionFk). Borrado Presacador">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/release/vn-picking.apk" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetDayOfSaleUSerCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetDayOfSaleUSerCase.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/ApiNodeJsUtils.kt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.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/GetPackagingUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPackagingUserCase.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetQualityUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetQualityUserCase.kt" afterDir="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/GetSmarttagsUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetSmarttagsUserCase.kt" afterDir="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/GetUbicadorUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetSmarttagsUserCase.kt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetWokerMistakeUSerCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetWokerMistakeUSerCase.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/SalixInterceptor.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixInterceptor.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/NodeJsService.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/RestClient.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/RestClient.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/SilexCallback.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.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/domain/itemShelvingLogUSerCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/itemShelvingLogUSerCase.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/base/BaseViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.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/articulo/fragment/ItemCardFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.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/buffer/fragment/BufferFragmentViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.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/BuyersFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.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/collection/adapter/SaleAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.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/collection/fragment/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.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/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/diadeventa/fragment/DayOfSaleFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasViewModel.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/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/shelvingLogFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.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/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/inventario/adapter/InventoryAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/SearchBuyerModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/SearchBuyerModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.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/PackagingSummaryFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.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/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/paletizador/fragment/CmrExpeditionPalletViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.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/paletizador/fragment/ExpeditionPalletDetailViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.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/ExpeditionScanSorterViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterViewModel.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/ExpeditionStateViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionStateViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.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/parking/fragment/ParkingFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parkingSale/fragment/ParkingSaleFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parkingSale/fragment/ParkingSaleFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parkingSale/fragment/ParkingViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parkingSale/fragment/ParkingViewModel.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/precontrol/PreControladorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.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/PreSacadorFragment.kt" beforeDir="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/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/presacador/model/PreSacadorItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/model/PreSacadorItemVO.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/adapter/ReposicionAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/adapter/ReposicionAdapter.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/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/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/shelvingparking/fragment/ShelvingParkingViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/fragment/ShelvingParkingViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/fragment/AssociateSmartTagsFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/fragment/AssociateSmartTagsFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/register/RegisterSmartTagsFragment.kt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/fragment/SmartTagsViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/fragment/SmartTagsViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/fragment/AssociateSmartTagsFragment.kt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/transferencia/fragment/TransferenciaViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/transferencia/fragment/TransferenciaViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/fragment/SmartTagsViewModel.kt" beforeDir="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/smarttag/sacador/model/SmartTagAdapter.kt" beforeDir="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/smarttag/sacador/model/SmartTagScan.kt" beforeDir="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/workermistake/fragment/WorkermistakeFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeViewModel.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_fragment.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_presacador.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_presacador.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_inventary_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_inventary_row.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_collection_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_collection_row.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_workermistake_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_workermistake_row.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -479,13 +464,6 @@
       <option name="presentableId" value="Default" />
       <updated>1618825571576</updated>
     </task>
-    <task id="LOCAL-00047" summary="Version 8, impresora obligatoria, controlador se desplaza al pulsar, Ubicar Reclamación y líneas controlador = orden saca el sacador">
-      <created>1649233788632</created>
-      <option name="number" value="00047" />
-      <option name="presentableId" value="LOCAL-00047" />
-      <option name="project" value="LOCAL" />
-      <updated>1649233788632</updated>
-    </task>
     <task id="LOCAL-00048" summary="Version 8, impresora obligatoria, controlador se desplaza al pulsar, Ubicar Reclamación y líneas controlador = orden saca el sacador">
       <created>1649234340659</created>
       <option name="number" value="00048" />
@@ -822,7 +800,14 @@
       <option name="project" value="LOCAL" />
       <updated>1668763686582</updated>
     </task>
-    <option name="localTasksCounter" value="96" />
+    <task id="LOCAL-00096" summary="Version 9.6Beta Añadido a BaseFragment(context). Quitado código repetido de las llamadas">
+      <created>1669105520909</created>
+      <option name="number" value="00096" />
+      <option name="presentableId" value="LOCAL-00096" />
+      <option name="project" value="LOCAL" />
+      <updated>1669105520910</updated>
+    </task>
+    <option name="localTasksCounter" value="97" />
     <servers />
   </component>
   <component name="Vcs.Log.History.Properties">
@@ -924,9 +909,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="Version 9Beta, dos opciones a Paletizadores y carros de operator" />
-    <MESSAGE value="Version 9Beta-Tarea3420" />
-    <MESSAGE value="Version 9Beta-Borrados comentarios" />
     <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" />
@@ -949,14 +931,17 @@
     <MESSAGE value="Version 9.5Beta añadido inteceptor y modificado código worker_getId. Subida como 9.4.2Beta" />
     <MESSAGE value="Version 9.6Beta Interteceptors, quitando userCase y arreglado click sobre carita. Cambiado .gitignore" />
     <MESSAGE value="Version 9.6Beta Interteptors, quitando userCase y arreglado click sobre carita. Cambiado .gitignore" />
-    <option name="LAST_COMMIT_MESSAGE" value="Version 9.6Beta Interteptors, quitando userCase y arreglado click sobre carita. Cambiado .gitignore" />
+    <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" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
           <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt</url>
-          <line>60</line>
+          <line>61</line>
           <option name="timeStamp" value="3" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 143,
+      "versionCode": 144,
-      "versionName": "9.4",
+      "versionName": "9.6Beta",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/java/es/verdnatura/di/viewModelModule.kt

@@ -27,7 +27,6 @@ import es.verdnatura.presentation.view.feature.qr.QrFragmentViewModel
 import es.verdnatura.presentation.view.feature.reposicion.fragment.ReposicionViewModel
 import es.verdnatura.presentation.view.feature.sacador.fragment.SacadorViewModel
 import es.verdnatura.presentation.view.feature.shelvingparking.fragment.ShelvingParkingViewModel
-import es.verdnatura.presentation.view.feature.smarttag.sacador.fragment.SmartTagsViewModel
 import es.verdnatura.presentation.view.feature.ubicador.fragment.AutomaticAddItemViewModel
 import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorViewModel
 import org.koin.android.ext.koin.androidContext
@@ -183,9 +182,7 @@ val viewModelModule = module {
     viewModel {
         HistoricoVehiculoViewModel(androidContext())
     }
-    viewModel {
+
-        SmartTagsViewModel(androidContext())
-    }
     viewModel {
         itemShelvingLogViewModel(androidContext())
     }

app/src/main/java/es/verdnatura/domain/ApiNodeJsUtils.kt

@@ -1,16 +0,0 @@
-package es.verdnatura.domain
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-class ApiNodeJsUtils {
-
-    companion object {
-        const val BASE_URL:String = "http://10.1.4.72:7777/"
-        // const val BASE_URL:String = "https://smart-tag.verdnatura.es"
-        fun getApiService():NodeJsService{
-            val nodeJsRetrofit = Retrofit.Builder().baseUrl(BASE_URL).addConverterFactory(
-                GsonConverterFactory.create()).build()
-            return nodeJsRetrofit.create(NodeJsService::class.java)
-        }
-    }
-}

app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt

@@ -138,17 +138,12 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
     }
 
     fun updatePackingTypeSalix(
-        token: String,
         itemFk: String,
         ItemPackingType: String
     ): Call<Any> {
-        val params = itemPackingTypeSalix(ItemPackingType)
-
         return salixClient!!.update_ItemPackingType(
-            content_type = "application/json",
-            authorization = token,
             itemFk = itemFk,
-            params = params
+            params = itemPackingTypeSalix(ItemPackingType)
         )
     }
 

app/src/main/java/es/verdnatura/domain/GetPackagingUserCase.kt

@@ -1,7 +1,6 @@
 package es.verdnatura.domain
 
 import android.content.Context
-import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
 import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix
 import es.verdnatura.presentation.view.feature.packaging.model.ItemSupplier
 import es.verdnatura.presentation.view.feature.packaging.model.Supplier
@@ -10,11 +9,11 @@ import retrofit2.Call
 class GetPackagingUserCase(context: Context) : RestClient(context) {
 
     fun getSuppliers(token: String): Call<List<Supplier>> {
-        return salixClient!!.getSuppliers(authorization = token)
+        return salixClient!!.getSuppliers()
     }
 
-    fun Entries(token: String, entry:EntrySalix): Call<EntrySalix> {
+    fun Entries(token: String, entry: EntrySalix): Call<EntrySalix> {
-        return salixClient!!.Entries(authorization = token,entry=entry)
+        return salixClient!!.Entries(entry = entry)
     }
 
     fun faultsReview_isChecked(
@@ -36,9 +35,9 @@ class GetPackagingUserCase(context: Context) : RestClient(context) {
         )
     }
 
-   /* fun itemShelvingBuyerGet(): Call<List<BuyerVO>> {
+    /* fun itemShelvingBuyerGet(): Call<List<BuyerVO>> {
-        return restClient!!.itemShelvingBuyerGet()
+         return restClient!!.itemShelvingBuyerGet()
-    }*/
+     }*/
 
     fun supplier_getItems(
         usuario: String,
@@ -48,12 +47,8 @@ class GetPackagingUserCase(context: Context) : RestClient(context) {
         val params: ArrayList<String> = ArrayList()
         params.add(supplierFk)
         return restClient!!.supplier_getItems(
-            "json",
+            supplierFk
-            "1",
+
-            usuario,
-            password,
-            "application/json",
-            params = params
         )
     }
 }

app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt

@@ -83,41 +83,17 @@ class GetPreSacadorUseCase(context: Context) : RestClient(context) {
     }
 
     fun sectorCollectionSaleGroup_add(
-        usuario: String,
-        password: String,
         vSaleGroupFk: String,
-        vSectorCollectionFk: String
+        vSectorCollectionFk: Int
 
     ): Call<Unit> {
-        val params: ArrayList<String> = ArrayList()
+        return restClient!!.sectorCollectionSaleGroup_add(vSaleGroupFk,vSectorCollectionFk
-        params.add(vSaleGroupFk)
-        params.add(vSectorCollectionFk)
-        return restClient!!.sectorCollectionSaleGroup_add(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
-            params
         )
-
     }
-
     fun saleTracking_addPrevOK(
-        usuario: String,
+        vSectorCollectionFk: Int
-        password: String,
-        vSectorCollectionFk: String
-
     ): Call<Unit> {
-        val params: ArrayList<String> = ArrayList()
+        return restClient!!.saleTracking_addPrevOK(vSectorCollectionFk
-        params.add(vSectorCollectionFk)
-        return restClient!!.saleTracking_addPrevOK(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
-            params
         )
 
     }
@@ -149,23 +125,12 @@ class GetPreSacadorUseCase(context: Context) : RestClient(context) {
     }
 
     fun sectorCollection_getSale(
-        usuario: String,
+        sectorCollectionFK: Int,
-        password: String,
-        sectorCollectionFK: String,
         vSectorFk: String
 
     ): Call<List<PreSacadorItemVO>> {
-        val params: ArrayList<String> = ArrayList()
-        params.add(sectorCollectionFK)
-        params.add(vSectorFk)
 
-        return restClient!!.sectorCollection_getSale(
+        return restClient!!.sectorCollection_getSale(sectorCollectionFK,vSectorFk
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
-            params
         )
     }
 

app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt

@@ -23,49 +23,25 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
     //sergio: se cambia llamada a collection_getTickets
 
     fun collectionTicketGet(
-        usuario: String,
+        collectionFk: Int,
-        password: String,
-        collectionFk: String,
         sectorFk: String,
         print: String,
         type: String
     ): Call<CollectionVO> {
-        val params: ArrayList<String> = ArrayList()
+
-        params.add(collectionFk)
+        return restClient!!.collection_getTickets(collectionFk,sectorFk,print,type
-        params.add(sectorFk)
-        params.add(print)
-        params.add(type)
-        return restClient!!.collection_getTickets(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
-            params
         )
     }
 
 
     fun collection_get(
-        usuario: String,
+        collectionFk: Int,
-        password: String,
-        collectionFk: String,
         sectorFk: String,
         print: String,
         type: String
     ): Call<CollectionVO> {
-        val params: ArrayList<String> = ArrayList()
+
-        params.add(collectionFk)
+        return restClient!!.collection_get(collectionFk,sectorFk,print,type
-        params.add(sectorFk)
-        params.add(print)
-        params.add(type)
-        return restClient!!.collection_get(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
-            params
         )
     }
 
@@ -304,27 +280,21 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
     }
 
     fun collectionStickerPrint(
-        usuario: String,
+        collectionFk: Int,
-        password: String,
+        labelCount: Int?
-        collectionFk: String,
-        labelCount: String
     ): Call<Any> {
-        val params: ArrayList<String> = ArrayList()
+        val params: ArrayList<Any> = ArrayList()
         params.add(collectionFk)
-        if (labelCount.isNotEmpty()) params.add(labelCount)
+        labelCount?.let {
+           params.add(labelCount)
+        }
+
         return restClient!!.collectionStickerPrint(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
             params
         )
     }
 
     fun ticketCollection_setUsedShelves(
-        usuario: String,
-        password: String,
         ticketFk: String,
         usedShelves: String
     ): Call<Void> {
@@ -332,18 +302,12 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
         params.add(ticketFk)
         params.add(usedShelves)
         return restClient!!.ticketCollection_setUsedShelves(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
             params
         )
     }
 
     fun item_updatePackingShelve(
-        usuario: String,
+
-        password: String,
         vSelf: String,
         vPacking: String
     ): Call<Void> {
@@ -351,11 +315,6 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
         params.add(vSelf)
         params.add(vPacking)
         return restClient!!.item_updatePackingShelve(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
             params
         )
     }
@@ -486,21 +445,12 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
     }
 
     fun ticket_setState(
-        usuario: String,
+        ticketFk: Int,
-        password: String,
-        ticketFk: String,
         state: String
     ): Call<Unit> {
-        val params: ArrayList<String> = ArrayList()
+
-        params.add(ticketFk)
+        return restClient!!.ticket_setState( ticketFk, state
-        params.add(state)
+
-        return restClient!!.ticket_setState(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
-            params
         )
     }
 

app/src/main/java/es/verdnatura/domain/GetSmarttagsUserCase.kt

@@ -1,54 +0,0 @@
-package es.verdnatura.domain
-
-import android.content.Context
-import es.verdnatura.presentation.view.feature.smarttag.sacador.model.SmartTagRegister
-import retrofit2.Call
-
-class GetSmarttagsUserCase(context: Context) : RestClient(context) {
-
-    fun workerShelving_add(usuario: String, password: String, shelvingFk: String): Call<Void> {
-        val params: ArrayList<String> = ArrayList()
-        params.add(shelvingFk)
-        return restClient!!.workerShelving_add(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
-            params
-        )
-    }
-
-    /*fun workerShelving_delete(usuario: String, password: String, vBarcode: String): Call<Void> {
-        val params: ArrayList<String> = ArrayList()
-        params.add(vBarcode)
-        return restClient!!.workerShelving_delete(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
-            params
-        )
-    }*/
-    fun smartTagRegister(
-        smarttag: String,
-        shelving: String,
-        level: String
-    ): Call<SmartTagRegister>
-    {
-        //https://smart-tag.verdnatura.es/bindShelving/A0A3B8224DBF&ABC&1
-        return nodejsClient!!.bindShelving("application/json", smarttag, shelving, level)
-        // return nodejsClient!!.bindShelving("application/json", NodeJsService.SmartTagNode(smarttag, wagon, shelving),"A0A3B8224DBF","ABC","2")
-
-    }
-    fun smartTagInsertTicket(
-        smarttag: String,
-
-    ): Call<SmartTagRegister>
-    {
-
-        return nodejsClient!!.insertTicket("application/json", smarttag)
-
-    }
-}

app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt

@@ -43,17 +43,8 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
 
 
     fun workerMachinery_isRegistered(
-        usuario: String,
-        password: String
     ): Call<String> {
-        val params: ArrayList<String> = ArrayList()
         return restClient!!.workerMachinery_isRegistered(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
-            params
         )
     }
 

app/src/main/java/es/verdnatura/domain/NodeJsService.kt

@@ -1,45 +0,0 @@
-package es.verdnatura.domain
-
-import es.verdnatura.presentation.view.feature.smarttag.sacador.model.SmartTagRegister
-import retrofit2.Call
-import retrofit2.http.*
-
-interface NodeJsService {
-
-    /*   @POST("/bindShelving")
-       fun bindShelving(@Header("Content-Type") content_type: String,
-                 @Body params: SmartTagNode):
-               Call<SmartTagNode>*/
-
-//NODEJS TEST
-
-    @GET("/bindShelving/{smarttag}&{shelvingFK}&{height}")
-    fun bindShelving(
-        @Header("Content-Type") content_type: String,
-        @Path("smarttag") id: String,
-        @Path("shelvingFK") id2: String,
-        @Path("height") id3: String
-
-    ):
-            Call<SmartTagRegister>
-
-    @GET("/insertTicket/{collectionFk}")
-    fun insertTicket(
-        @Header("Content-Type") content_type: String,
-        @Path("collectionFk") id: String
-
-    ):
-            Call<SmartTagRegister>
-
-
-    class SmartTagNode(
-        var message: String = "",
-        var smarttag: String = "",
-        var wagon: String = "",
-        var shelving: String = "",
-        var isError: Boolean = false,
-        var errorMessage: String = ""
-    )
-
-}
-

app/src/main/java/es/verdnatura/domain/RestClient.kt

@@ -5,13 +5,11 @@ import android.content.Context
 open class RestClient(context: Context) {
     var restClient: VerdnaturaService
     var salixClient: SalixService
-    var nodejsClient: NodeJsService
     var salixClientSend:SalixServiceSend
 
     init {
         restClient = ApiUtils.getApiService(context)
         salixClient = ApiSalixUtils.getApiService(context)
-        nodejsClient = ApiNodeJsUtils.getApiService()
         salixClientSend = ApiSalixUtilsSend.getApiService(context)
     }
 }

app/src/main/java/es/verdnatura/domain/SalixService.kt

@@ -111,8 +111,6 @@ interface SalixService {
 
     @PATCH("Items/{itemFk}")
     fun update_ItemPackingType(
-        @Header("Content-Type") content_type: String,
-        @Header("Authorization") authorization: String,
         @Path("itemFk") itemFk: String,
         @Body params: itemPackingTypeSalix
     ):
@@ -145,8 +143,6 @@ interface SalixService {
 
     @GET("Suppliers")//REVISADA
     fun getSuppliers(
-        @Header("Content-Type") content_type: String="application/json",
-        @Header("Authorization") authorization: String,
         //@Body params:JSONObject=JSONObject("""filter"={"fields":{"id":true,"name":true},"include":[{"relation":"contacts","scope":{"fields":["email"],"order":"id DESC","limit":1,"where":{"email":{"neq":null}}}}]}""")
        /* @Query("filter") filter:String="{\"fields\":{\"id\":true,\"name\":true},\"include\":[{\"relation\":\"contacts\"," +
                 "\"scope\":{" +
@@ -158,8 +154,6 @@ interface SalixService {
 
     @PUT("Entries")//REVISADA
     fun Entries(
-        @Header("Content-Type") content_type: String="application/json",
-        @Header("Authorization") authorization: String,
         @Body entry:EntrySalix
     ):
             Call<EntrySalix>

app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt

@@ -172,12 +172,8 @@ interface VerdnaturaService {
 
     @POST("almacennew/sectorCollection_getSale")//NO SALIX
     fun sectorCollection_getSale(
-        @Header("aplicacion") aplicacion: String,
+
-        @Header("version") version: String,
+        @Body vararg params: Any
-        @Header("user") user: String,
-        @Header("pass") pass: String,
-        @Header("Content-Type") content_type: String,
-        @Body params: List<String>
     ):
             Call<List<PreSacadorItemVO>>
 
@@ -264,23 +260,14 @@ interface VerdnaturaService {
 
     @POST("almacennew/sectorCollectionSaleGroup_add")//NO SALIX
     fun sectorCollectionSaleGroup_add(
-        @Header("aplicacion") aplicacion: String,
+        @Body vararg params: Any
-        @Header("version") version: String,
-        @Header("user") user: String,
-        @Header("pass") pass: String,
-        @Header("Content-Type") content_type: String,
-        @Body params: List<String>
     ):
             Call<Unit>
 
     @POST("almacennew/saleTracking_addPrevOK")//NO SALIX
     fun saleTracking_addPrevOK(
-        @Header("aplicacion") aplicacion: String,
+
-        @Header("version") version: String,
+        @Body vararg params: Any
-        @Header("user") user: String,
-        @Header("pass") pass: String,
-        @Header("Content-Type") content_type: String,
-        @Body params: List<String>
     ):
             Call<Unit>
 
@@ -353,23 +340,13 @@ interface VerdnaturaService {
     //sergio: de momento se separa para ir viendo como funciona. El precontrol llamara a collectionTicketGet con otro parametro.
     @POST("almacennew/collection_getTickets")//REVISADA
     fun collection_getTickets(
-        @Header("aplicacion") aplicacion: String,
+        @Body  vararg params: Any
-        @Header("version") version: String,
-        @Header("user") user: String,
-        @Header("pass") pass: String,
-        @Header("Content-Type") content_type: String,
-        @Body params: List<String>
     ):
             Call<CollectionVO>
 
     @POST("almacennew/collection_get")//REVISADA
     fun collection_get(
-        @Header("aplicacion") aplicacion: String,
+        @Body  vararg params: Any
-        @Header("version") version: String,
-        @Header("user") user: String,
-        @Header("pass") pass: String,
-        @Header("Content-Type") content_type: String,
-        @Body params: List<String>
     ):
             Call<CollectionVO>
 
@@ -442,34 +419,19 @@ interface VerdnaturaService {
 
     @POST("almacennew/collectionStickerPrint")//REVISADA
     fun collectionStickerPrint(
-        @Header("aplicacion") aplicacion: String,
+        @Body params: List<Any>
-        @Header("version") version: String,
-        @Header("user") user: String,
-        @Header("pass") pass: String,
-        @Header("Content-Type") content_type: String,
-        @Body params: List<String>
     ):
             Call<Any>
 
     @POST("almacennew/ticketCollection_setUsedShelves")//REVISADA
     fun ticketCollection_setUsedShelves(
-        @Header("aplicacion") aplicacion: String,
+        @Body vararg params: Any
-        @Header("version") version: String,
-        @Header("user") user: String,
-        @Header("pass") pass: String,
-        @Header("Content-Type") content_type: String,
-        @Body params: List<String>
     ):
             Call<Void>
 
     @POST("almacennew/item_updatePackingShelve")//REVISADA
     fun item_updatePackingShelve(
-        @Header("aplicacion") aplicacion: String,
+        @Body vararg params: Any
-        @Header("version") version: String,
-        @Header("user") user: String,
-        @Header("pass") pass: String,
-        @Header("Content-Type") content_type: String,
-        @Body params: List<String>
     ):
             Call<Void>
 
@@ -542,16 +504,10 @@ interface VerdnaturaService {
 
     @POST("almacennew/ticket_setState")//REVISADA
     fun ticket_setState(
-        @Header("aplicacion") aplicacion: String,
+        @Body vararg params: Any
-        @Header("version") version: String,
-        @Header("user") user: String,
-        @Header("pass") pass: String,
-        @Header("Content-Type") content_type: String,
-        @Body params: List<String>
     ):
             Call<Unit>
 
-
     @POST("almacennew/debug_add")//REVISADA
     fun debug_add(
         @Body params: List<String>
@@ -838,12 +794,6 @@ interface VerdnaturaService {
 
     @POST("almacennew/workerMachinery_isRegistered")//REVISADA
     fun workerMachinery_isRegistered(
-        @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>
     ):
             Call<String>
 
@@ -1373,12 +1323,7 @@ interface VerdnaturaService {
     //SUPPLIERS
     @POST("almacennew/supplier_getItems")//REVISADA
     fun supplier_getItems(
-        @Header("aplicacion") aplicacion: String,
+        @Body vararg params: Any
-        @Header("version") version: String,
-        @Header("user") user: String,
-        @Header("pass") pass: String,
-        @Header("Content-Type") content_type: String,
-        @Body params: List<String>
     ):
             Call<List<ItemSupplier>>
 

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

@@ -262,7 +262,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
     }
 
     fun printer_get() {
-        silex!!.printer_get().enqueue(object : Callback<List<Printers>> {
+       silex.printer_get().enqueue(object : Callback<List<Printers>> {
             override fun onFailure(call: Call<List<Printers>>, t: Throwable) {
                 val listError: ArrayList<Printers> = ArrayList()
                 listError.add(Printers(0, "", true, t.message!!))
@@ -294,7 +294,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
     }
 
     fun train_get() {
-        silex!!.train_get().enqueue(object : Callback<List<Train>> {
+       silex.train_get().enqueue(object : Callback<List<Train>> {
             override fun onFailure(call: Call<List<Train>>, t: Throwable) {
                 val listError: ArrayList<Train> = ArrayList()
                 listError.add(Train(0, "", true, t.message!!))
@@ -327,7 +327,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
 
     fun worker_updateSector(sectorFk: Int) {
 
-        silex!!.worker_updateSector(sectorFk)
+       silex.worker_updateSector(sectorFk)
             .enqueue(object : Callback<Unit> {
                 override fun onFailure(call: Call<Unit>, t: Throwable) {
 
@@ -367,7 +367,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
 
     fun operator_updateItemPackingType(itemPackingTypeFk: String) {
 
-        silex!!.operator_updateItemPackingType(itemPackingTypeFk)
+       silex.operator_updateItemPackingType(itemPackingTypeFk)
             .enqueue(object : Callback<Unit> {
                 override fun onFailure(call: Call<Unit>, t: Throwable) {
 
@@ -407,7 +407,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
 
     fun operator_getNumberOfWagons() {
 
-        silex!!.operator_getNumberOfWagons()
+       silex.operator_getNumberOfWagons()
             .enqueue(object : Callback<Int?> {
                 override fun onFailure(call: Call<Int?>, t: Throwable) {
 
@@ -447,7 +447,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
 
     fun operator_getTrain() {
 
-        silex!!.operator_getTrain()
+       silex.operator_getTrain()
             .enqueue(object : Callback<String?> {
                 override fun onFailure(call: Call<String?>, t: Throwable) {
 
@@ -488,7 +488,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
 
     fun operator_getItemPackingType() {
 
-        silex!!.operator_getItemPackingType()
+       silex.operator_getItemPackingType()
             .enqueue(object : Callback<String?> {
                 override fun onFailure(call: Call<String?>, t: Throwable) {
 
@@ -529,7 +529,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
 
     fun worker_isF11Allowed() {
 
-        silex!!.worker_isF11Allowed()
+       silex.worker_isF11Allowed()
             .enqueue(object : Callback<Boolean> {
                 override fun onFailure(call: Call<Boolean>, t: Throwable) {
 
@@ -565,7 +565,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
     }
 
     fun worker_updatePrinter(printerFk: Int) {
-        silex!!.worker_updatePrinter(printerFk)
+       silex.worker_updatePrinter(printerFk)
             .enqueue(object : Callback<Unit> {
                 override fun onFailure(call: Call<Unit>, t: Throwable) {
 
@@ -604,7 +604,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
 
     fun operator_updateTrain(trainFk: Int) {
 
-        silex!!.operator_updateTrain(trainFk)
+       silex.operator_updateTrain(trainFk)
             .enqueue(object : Callback<Unit> {
                 override fun onFailure(call: Call<Unit>, t: Throwable) {
 

app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt

@@ -756,22 +756,10 @@ class ItemCardFragment(
 
     private fun updateItemPackingType(itemPackingType: String) {
         binding.splashProgress.visibility = View.VISIBLE
-
-        /* var working_in_test=true //sergio: en proves app
-         if (working_in_test){*/
         viewModel.updatePackingTypeSalix(
-            getData(TOKEN),
             this.itemFk,
-            itemPackingType
+            itemPackingTypeSalix(itemPackingType)
-        )/*}else{
+        )
-            viewModel.updatePackingType(
-                this.itemFk,
-                user,
-                password,
-                itemPackingType,
-                "item_updatePackingType"
-            )
-        }*/
     }
 
 }

app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt

@@ -9,6 +9,7 @@ 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 es.verdnatura.presentation.common.itemPackingTypeSalix
 import es.verdnatura.presentation.view.feature.articulo.model.*
 import retrofit2.Call
 import retrofit2.Callback
@@ -216,7 +217,7 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
         newValue: Int,
         isTrash: Boolean
     ) {
-        silex!!.itemTrash( itemFk, warehouseFk, newValue, isTrash)
+       silex.itemTrash( itemFk, warehouseFk, newValue, isTrash)
             .enqueue(object : Callback<Any> {
                 override fun onFailure(call: Call<Any>, t: Throwable) {
                     _response.value = ResponseItemVO(
@@ -317,9 +318,8 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
             })
     }
 
-    //sergio ver como solucionar el tema del "Finish"
+    fun updatePackingTypeSalix(itemFk: String, itemPackingType: itemPackingTypeSalix) {
-    fun updatePackingTypeSalix(token: String, itemFk: String, itemPackingType: String) {
+        salix!!.update_ItemPackingType( itemFk,itemPackingType )
-        getItemCardUserCase.updatePackingTypeSalix(token, itemFk, itemPackingType)
             .enqueue(object : Callback<Any> {
                 override fun onFailure(call: Call<Any>, t: Throwable) {
                     _response.value = ResponseItemVO(

app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.kt

@@ -22,7 +22,7 @@ class BuyersViewModel(context: Context) : BaseViewModel(context) {
         get() = _buyersList
 
     fun itemShelvingBuyerGet(){
-        silex!!.itemShelvingBuyerGet().enqueue(object :
+       silex.itemShelvingBuyerGet().enqueue(object :
             Callback<List<BuyerVO>> {
             override fun onFailure(call: Call<List<BuyerVO>>, t: Throwable) {
                 val listError:ArrayList<BuyerVO> = ArrayList()

app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt

@@ -72,7 +72,7 @@ class SaleAdapter(
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
                             title = binding.root.context.getString(R.string.titleItemConsult)
-                        ), sale.itemFk
+                        ), sale.itemFk.toString()
                     )
                 }
 

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

@@ -45,7 +45,7 @@ import java.sql.Types.NULL
 
 @Suppress("UNUSED_ANONYMOUS_PARAMETER")
 class CollectionFragment(
-    var collection: CollectionVO = CollectionVO(),
+    var collection: CollectionVO = CollectionVO(0),
     var type: String = SACADOR
 ) : BaseFragment<FragmentCollectionBinding, CollectionViewModel>(CollectionViewModel::class) {
 
@@ -87,7 +87,7 @@ class CollectionFragment(
 
     private var itemShelvingSaleSupplyAddCall = -1
     private var saleTrackingCall = -1
-    private var lastScanned: String = ""
+    private var lastScanned: Int =0
     private var buttonPushedGetCollection = false
     private var positionUnmarked = -1
     private var state = 0
@@ -128,8 +128,6 @@ class CollectionFragment(
 
         if (collection.tickets.isEmpty()) {
             viewModel.collectionTicketGet(
-                getData(USER),
-                getData(PASSWORD),
                 collection.collectionFk,
                 getData(SECTORFK),
                 type
@@ -170,10 +168,11 @@ class CollectionFragment(
         binding.mainToolbar.toolbarSubtitle.visibility = VISIBLE
         binding.mainToolbar.toolbarIcons.visibility = VISIBLE
         binding.mainToolbar.backButton.visibility = VISIBLE
-
+        collection.collectionFk.let {
-        if (!collection.collectionFk.isNullOrEmpty()) {
+            binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString()
-            binding.mainToolbar.toolbarTitle.text = collection.collectionFk
         }
+
+
         val listIcons: ArrayList<ImageView> = ArrayList()
         val iconPrint = ImageView(context)
         iconPrint.setImageResource(R.drawable.ic_print_black_24dp)
@@ -248,8 +247,6 @@ class CollectionFragment(
    private fun updateScreen(){
        binding.splashProgress.visibility=VISIBLE
        viewModel.collectionTicketGet(
-           getData(USER),
-           getData(PASSWORD),
            collection.collectionFk,
            getData(SECTORFK),
            type)
@@ -295,8 +292,6 @@ class CollectionFragment(
         binding.splashProgress.visibility = VISIBLE
         if (!buttonPushedGetCollection) {
             viewModel.collection_get(
-                getData(USER),
-                getData(PASSWORD),
                 collection.collectionFk,
                 getData(SECTORFK),
                 type
@@ -304,9 +299,7 @@ class CollectionFragment(
             buttonPushedGetCollection = true
         } else {
             viewModel.collectionTicketGet(
-                getData(USER),
+                lastScanned.toInt(),
-                getData(PASSWORD),
-                lastScanned,
                 getData(SECTORFK),
                 type
 
@@ -367,8 +360,6 @@ class CollectionFragment(
             // if (type != PRECHECKER) {
             binding.splashProgress.visibility = VISIBLE
             viewModel.collectionTicketGet(
-                getData(USER),
-                getData(PASSWORD),
                 collection.collectionFk,
                 getData(SECTORFK),
                 type
@@ -495,8 +486,6 @@ class CollectionFragment(
                 )
                 if (!it.isError) {
                     viewModel.collectionTicketGet(
-                        getData(USER),
-                        getData(PASSWORD),
                         collection.collectionFk,
                         getData(SECTORFK),
                         type
@@ -514,8 +503,6 @@ class CollectionFragment(
                     ma.messageWithSound(getString(R.string.previousCollected), false, true)
                     binding.splashProgress.visibility = VISIBLE
                     viewModel.collectionTicketGet(
-                        getData(USER),
-                        getData(PASSWORD),
                         collection.collectionFk,
                         getData(SECTORFK),
                         type
@@ -558,8 +545,6 @@ class CollectionFragment(
                             salePerson = dataMessageSalix.personSale
                         )
                         viewModel.collectionTicketGet(
-                            getData(USER),
-                            getData(PASSWORD),
                             collection.collectionFk,
                             getData(SECTORFK),
                             type
@@ -739,9 +724,7 @@ class CollectionFragment(
                             .setKoButton(getString(R.string.review)) {
                                 binding.splashProgress.visibility = View.VISIBLE
                                 viewModel.collectionTicketGet(
-                                    getData(USER),
+                                    it.response.toInt(),
-                                    getData(PASSWORD),
-                                    it.response,
                                     getData(SECTORFK),
                                     type
                                 )
@@ -771,9 +754,7 @@ class CollectionFragment(
                             .setKoButton(getString(R.string.review)) {
                                 binding.splashProgress.visibility = View.VISIBLE
                                 viewModel.collectionTicketGet(
-                                    getData(USER),
+                                    it.response.toInt(),
-                                    getData(PASSWORD),
-                                    it.response,
                                     getData(SECTORFK),
                                     type
                                 )
@@ -802,8 +783,6 @@ class CollectionFragment(
                 } else {
 
                     viewModel.collectionTicketGet(
-                        getData(USER),
-                        getData(PASSWORD),
                         collection.collectionFk,
                         getData(SECTORFK),
                         type
@@ -848,8 +827,6 @@ class CollectionFragment(
                         ma.messageWithSound(it.errorMessage, it.isError, true)
                         binding.splashProgress.visibility = VISIBLE
                         viewModel.collectionTicketGet(
-                            getData(USER),
-                            getData(PASSWORD),
                             collection.collectionFk,
                             getData(SECTORFK),
                             type
@@ -874,8 +851,6 @@ class CollectionFragment(
                         binding.splashProgress.visibility = VISIBLE
 
                         viewModel.collectionTicketGet(
-                            getData(USER),
-                            getData(PASSWORD),
                             collection.collectionFk,
                             getData(SECTORFK),
                             type
@@ -996,7 +971,7 @@ class CollectionFragment(
     private fun createCollectionList() {
 
         state = 0
-        binding.mainToolbar.toolbarTitle.text = collection.collectionFk
+        binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString()
 
         binding.splashProgress.visibility = View.GONE
         var salesList: ArrayList<SaleVO> = ArrayList()
@@ -1235,7 +1210,7 @@ class CollectionFragment(
 
                 if (saleVO.isControlled == "0") {
                     //1- Por itemFk
-                    if (txtscan == saleVO.itemFk) {
+                    if (txtscan.toInt() == saleVO.itemFk) {
                         if (mpok != null) mpok!!.start()
                         isOk = true
                         markLine(index, type)
@@ -1280,9 +1255,7 @@ class CollectionFragment(
                     //  if (type != PRECHECKER) {
                     isMarking = false
                     viewModel.collectionTicketGet(
-                        getData(USER),
+                        txtscan.toInt(),
-                        getData(PASSWORD),
-                        txtscan,
                         getData(SECTORFK),
                         type
                     )
@@ -1516,7 +1489,7 @@ class CollectionFragment(
         viewModel.itemPlacementSupplyAiming(
             getData(USER),
             getData(PASSWORD),
-            itemFk = sales[position].itemFk,
+            itemFk = sales[position].itemFk.toString(),
             quantity = quantityGet,
             shelvingFk = sales[position].placements[shelvingPosition].shelving
 
@@ -1727,8 +1700,6 @@ class CollectionFragment(
         if (quantityPicked < quantityTotal) {
 
             viewModel.collectionTicketGet(
-                getData(USER),
-                getData(PASSWORD),
                 collection.collectionFk,
                 getData(SECTORFK),
                 type
@@ -1744,7 +1715,7 @@ class CollectionFragment(
         if (storedPosition >= 0 && sales.size > storedPosition) {
             val saleToCheck = sales[storedPosition]
 
-            if (saleToCheck.itemFk == valueToCheck)
+            if (saleToCheck.itemFk == valueToCheck.toInt())
                 return true
             else {
                 saleToCheck.Barcodes.forEach { barcode ->
@@ -2048,7 +2019,7 @@ class CollectionFragment(
         }
 
         if (binding.mainToolbar.toolbarTitle != null) binding.mainToolbar.toolbarTitle.text =
-            if (collection.collectionFk != null) collection.collectionFk else ""
+            if (collection.collectionFk != 0) collection.collectionFk.toString() else ""
         if (binding.mainToolbar.toolbarSubtitle != null && totalMark != null) binding.mainToolbar.toolbarSubtitle.text =
             "" + totalMark + "/" + sales.size
 
@@ -2084,10 +2055,8 @@ class CollectionFragment(
 
                         binding.splashProgress.visibility = VISIBLE
                         viewModel.ticketCollection_setUsedShelves(
-                            getData(USER),
-                            getData(PASSWORD),
                             ticketFk = collection.collectionFk,
-                            usedShelves = customDialogInput.getValue()
+                            usedShelves = customDialogInput.getValue().toInt()
                         )
                         hideKeyboards()
                         //  showKeyboards()
@@ -2115,10 +2084,8 @@ class CollectionFragment(
 
                         binding.splashProgress.visibility = VISIBLE
                         viewModel.ticketCollection_setUsedShelves(
-                            getData(USER),
-                            getData(PASSWORD),
                             ticketFk = collection.collectionFk,
-                            usedShelves = customDialogInput.getValue()
+                            usedShelves = customDialogInput.getValue().toInt()
                         )
                         hideKeyboards()
                     }
@@ -2137,7 +2104,7 @@ class CollectionFragment(
 
     }
 
-    private fun item_updatePackingShelve(itemFk: String) {
+    private fun item_updatePackingShelve(itemFk: Int) {
 
 
         isMarking = false
@@ -2148,10 +2115,8 @@ class CollectionFragment(
 
                     binding.splashProgress.visibility = VISIBLE
                     viewModel.item_updatePackingShelve(
-                        getData(USER),
-                        getData(PASSWORD),
                         vSelf = itemFk,
-                        vPacking = customDialogInput.getValue()
+                        vPacking = customDialogInput.getValue().toInt()
                     )
                     hideKeyboards()
                     //showKeyboards()
@@ -2179,10 +2144,8 @@ class CollectionFragment(
 
                     binding.splashProgress.visibility = VISIBLE
                     viewModel.ticketCollection_setUsedShelves(
-                        getData(USER),
-                        getData(PASSWORD),
                         ticketFk = collection.collectionFk,
-                        usedShelves = customDialogInput.getValue()
+                        usedShelves = customDialogInput.getValue().toInt()
                     )
 
                 }
@@ -2385,8 +2348,6 @@ class CollectionFragment(
 
         binding.splashProgress.visibility = VISIBLE
         viewModel.collectionTicketGet(
-            getData(USER),
-            getData(PASSWORD),
             collection.collectionFk,
             getData(SECTORFK),
             type
@@ -2447,18 +2408,14 @@ class CollectionFragment(
         if (type == CONTROLADOR) {
             tickets.forEach {
                 viewModel.ticket_setState(
-                    usuario = getData(USER),
+                    ticketFk = it.toInt(),
-                    password = getData(PASSWORD),
-                    ticketFk = it,
                     state = "CHECKED"
                 )
             }
         } else if (type == SACADOR) {
             tickets.forEach {
                 viewModel.ticket_setState(
-                    usuario = getData(USER),
+                    ticketFk = it.toInt(),
-                    password = getData(PASSWORD),
-                    ticketFk = it,
                     state = "PREPARED"
                 )
             }
@@ -2467,9 +2424,7 @@ class CollectionFragment(
         } else if (type == PRECHECKER) {
             tickets.forEach {
                 viewModel.ticket_setState(
-                    usuario = getData(USER),
+                    ticketFk = it.toInt(),
-                    password = getData(PASSWORD),
-                    ticketFk = it,
                     state = "PREVIOUS_CONTROLLED"
                 )
             }
@@ -2532,10 +2487,8 @@ class CollectionFragment(
             builder.setItems(labelCount) { dialog, which ->
                 d("VERDNATURA::", "EL ELEGIDO ES" + which)
                 viewModel.collectionStickerPrint(
-                    getData(USER),
-                    getData(PASSWORD),
                     collectionFk = collection.collectionFk,
-                    labelCount = (which+1).toString()
+                    labelCount = (which+1)
                 )
                 (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
             }
@@ -2543,10 +2496,9 @@ class CollectionFragment(
             dialog.show()
         }else{
             viewModel.collectionStickerPrint(
-                getData(USER),
-                getData(PASSWORD),
                 collectionFk = collection.collectionFk,
-                labelCount = ""
+                null
+
             )
             (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
         }

app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt

@@ -3,7 +3,6 @@ package es.verdnatura.presentation.view.feature.collection.fragment
 import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import es.verdnatura.R
 import es.verdnatura.domain.GetLoginUserCase
 import es.verdnatura.domain.GetSacadorControladorUserCase
 import es.verdnatura.domain.GetUbicadorUserCase
@@ -15,16 +14,15 @@ import es.verdnatura.presentation.view.feature.collection.ItemVO
 import es.verdnatura.presentation.view.feature.collection.SalesModifiedList
 import es.verdnatura.presentation.view.feature.collection.mapper.map
 import es.verdnatura.presentation.view.feature.sacador.model.*
-import org.json.JSONObject
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
 class CollectionViewModel(context: Context) : BaseViewModel(context) {
 
-   // val emptyMessage = context.getString(R.string.collectionNoTickets)
+    // val emptyMessage = context.getString(R.string.collectionNoTickets)
 
-    private val contextApp=context
+    private val contextApp = context
 
     private val getSacadorControladorUserCase: GetSacadorControladorUserCase =
         GetSacadorControladorUserCase(context)
@@ -148,15 +146,11 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
 
 
     fun collectionTicketGet(
-        usuario: String,
+        collectionFk: Int,
-        password: String,
-        collectionFk: String,
         sectorFk: String,
         type: String
     ) {
-        getSacadorControladorUserCase.collectionTicketGet(
+        silex.collection_getTickets(
-            usuario,
-            password,
             collectionFk,
             sectorFk,
             "0",
@@ -164,7 +158,7 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
         ).enqueue(object :
             Callback<CollectionVO> {
             override fun onFailure(call: Call<CollectionVO>, t: Throwable) {
-                _collectionTicketList.value = CollectionVO(
+                _collectionTicketList.value = CollectionVO(0,
                     isError = true,
                     errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
                 )
@@ -177,7 +171,7 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
                 if (response.body() != null) {
                     _collectionTicketList.value = response.body()?.let { it.map(contextApp) }
                 } else {
-                    _collectionTicketList.value = CollectionVO(
+                    _collectionTicketList.value = CollectionVO(0,
                         isError = true,
                         errorMessage = getMessageFromAllResponse(
                             nameofFunction(this),
@@ -188,16 +182,13 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
             }
         })
     }
+
     fun collection_get(
-        usuario: String,
+        collectionFk: Int,
-        password: String,
-        collectionFk: String,
         sectorFk: String,
         type: String
     ) {
         getSacadorControladorUserCase.collection_get(
-            usuario,
-            password,
             collectionFk,
             sectorFk,
             "0",
@@ -205,7 +196,7 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
         ).enqueue(object :
             Callback<CollectionVO> {
             override fun onFailure(call: Call<CollectionVO>, t: Throwable) {
-                _collectionTicketList.value = CollectionVO(
+                _collectionTicketList.value = CollectionVO(0,
                     isError = true,
                     errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
                 )
@@ -218,7 +209,7 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
                 if (response.body() != null) {
                     _collectionTicketList.value = response.body()?.let { it.map(contextApp) }
                 } else {
-                    _collectionTicketList.value = CollectionVO(
+                    _collectionTicketList.value = CollectionVO(0,
                         isError = true,
                         errorMessage = getMessageFromAllResponse(
                             nameofFunction(this),
@@ -270,6 +261,7 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
             }
         })
     }
+
     fun saleTracking_mark(
         usuario: String,
         password: String,
@@ -278,8 +270,8 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
         vStateFk: String,
         vIsChecked: String,
         vBuyFk: String,
-        vItemShelvingFk:String,
+        vItemShelvingFk: String,
-        vQuantity:String
+        vQuantity: String
     ) {
         getSacadorControladorUserCase.saleTracking_mark(
             usuario,
@@ -309,7 +301,8 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
                         )
                     )
                 } else {
-                    _responseSaleTracking_mark.value = ResponseItemVO(isError = false, response = "")
+                    _responseSaleTracking_mark.value =
+                        ResponseItemVO(isError = false, response = "")
                 }
             }
         })
@@ -396,7 +389,8 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
                         )
                     )
                 } else {
-                    _responseItemShelvingSaleSupplyAdd.value = ResponseItemVO(isError = false, response = response.message())
+                    _responseItemShelvingSaleSupplyAdd.value =
+                        ResponseItemVO(isError = false, response = response.message())
                 }
             }
         })
@@ -404,14 +398,10 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
 
 
     fun collectionStickerPrint(
-        usuario: String,
+        collectionFk: Int,
-        password: String,
+        labelCount: Int?
-        collectionFk: String,
-        labelCount: String
     ) {
         getSacadorControladorUserCase.collectionStickerPrint(
-            usuario,
-            password,
             collectionFk,
             labelCount
         ).enqueue(object : Callback<Any> {
@@ -441,14 +431,10 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
 
 
     fun ticketCollection_setUsedShelves(
-        usuario: String,
+        ticketFk: Int,
-        password: String,
+        usedShelves: Int
-        ticketFk: String,
-        usedShelves: String
     ) {
-        getSacadorControladorUserCase.ticketCollection_setUsedShelves(
+        silex.ticketCollection_setUsedShelves(
-            usuario,
-            password,
             ticketFk,
             usedShelves
         ).enqueue(object : Callback<Void> {
@@ -476,14 +462,10 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
     }
 
     fun item_updatePackingShelve(
-        usuario: String,
+        vSelf: Int,
-        password: String,
+        vPacking: Int
-        vSelf: String,
-        vPacking: String
     ) {
-        getSacadorControladorUserCase.item_updatePackingShelve(
+        silex.item_updatePackingShelve(
-            usuario,
-            password,
             vSelf,
             vPacking
         ).enqueue(object : Callback<Void> {
@@ -588,9 +570,6 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
     }
 
 
-
-
-
     fun saleMove(
         usuario: String,
         password: String,
@@ -631,12 +610,12 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
     }
 
     fun transferSalesSalix(
-        token:String,
+        token: String,
-        ticketFk:String,
+        ticketFk: String,
         saleFk: String,
         quantity: String,
 
-    ) {
+        ) {
         getSacadorControladorUserCase.transferSalesSalix(
             token,
             ticketFk,
@@ -779,7 +758,7 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
         ticketFk: String,
         parking: String
     ) {
-        silex!!.shelvingPark(ticketFk, parking)
+        silex.shelvingPark(ticketFk, parking)
             .enqueue(object : Callback<Any> {
                 override fun onFailure(call: Call<Any>, t: Throwable) {
                     _responseParking.value = ResponseItemVO(
@@ -807,12 +786,10 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
     }
 
     fun ticket_setState(
-        usuario: String,
+        ticketFk: Int,
-        password: String,
-        ticketFk: String,
         state: String
     ) {
-        getSacadorControladorUserCase.ticket_setState(usuario, password, ticketFk, state)
+        silex.ticket_setState(ticketFk, state)
             .enqueue(object : Callback<Unit> {
                 override fun onFailure(call: Call<Unit>, t: Throwable) {
                     _response.value = ResponseItemVO(
@@ -919,7 +896,12 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
                         )
                     } else {
                         _responseCode.value =
-                            ResponseItemVO(isError = false, response = if (response.body()==null) "" else {response.body()!!})
+                            ResponseItemVO(
+                                isError = false,
+                                response = if (response.body() == null) "" else {
+                                    response.body()!!
+                                }
+                            )
                     }
                 }
             })
@@ -1234,6 +1216,7 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
             }
         })
     }
+
     fun ticket_checkFullyControlled(
         usuario: String,
         password: String,
@@ -1268,6 +1251,7 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
             }
         })
     }
+
     fun collection_getUncheckedTicket(
         usuario: String,
         password: String,
@@ -1291,18 +1275,22 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
                 response: Response<String>
             ) {
 
-                if (response.body()!=null) {
+                if (response.body() != null) {
 
                     _responseCollectionUnchecked.value = ResponseItemVO(
                         isError = false,
                         response = response.body()!!,
                         errorMessage = ""
                     )
-                }else{
+                } else {
                     _responseCollectionUnchecked.value = ResponseItemVO(
                         isError = true,
                         response = response.body()!!,
-                        errorMessage = getMessageFromAllResponse(nameofFunction(this), response.message()))
+                        errorMessage = getMessageFromAllResponse(
+                            nameofFunction(this),
+                            response.message()
+                        )
+                    )
                 }
             }
         })

app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt

@@ -27,7 +27,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
 import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
 
 class CollectionShowTicketFragment(
-    var collection: CollectionVO = CollectionVO(),
+    var collection: CollectionVO = CollectionVO(0),
     var type: String = ""
 ) : BaseFragment<FragmentCollectionBinding, CollectionViewModel>(CollectionViewModel::class) {
 
@@ -38,7 +38,7 @@ class CollectionShowTicketFragment(
     private lateinit var customDialog: CustomDialog
     private var tickets: ArrayList<String> = ArrayList()
 
-    private var lastScanned: String = ""
+    private var lastScanned: Int = 0
     private var buttonPushedGetCollection = false
 
     companion object {
@@ -57,8 +57,6 @@ class CollectionShowTicketFragment(
 
         if (collection.tickets.isEmpty()) {
             viewModel.collectionTicketGet(
-                getData(USER),
-                getData(PASSWORD),
                 collection.collectionFk,
                 getData(SECTORFK),
                 type
@@ -118,8 +116,6 @@ class CollectionShowTicketFragment(
 
         if (!buttonPushedGetCollection) {
             viewModel.collection_get(
-                getData(USER),
-                getData(PASSWORD),
                 collection.collectionFk,
                 getData(SECTORFK),
                 type
@@ -127,9 +123,7 @@ class CollectionShowTicketFragment(
             buttonPushedGetCollection = true
         } else {
             viewModel.collectionTicketGet(
-                getData(USER),
+                lastScanned.toInt(),
-                getData(PASSWORD),
-                lastScanned,
                 getData(SECTORFK),
                 type
 
@@ -155,33 +149,28 @@ class CollectionShowTicketFragment(
                 val labelCount = arrayOf("1", "2", "3", "4", "5","6","7","8","9","10")
                 builder.setItems(labelCount) { dialog, which ->
                     viewModel.collectionStickerPrint(
-                        getData(USER),
-                        getData(PASSWORD),
                         collectionFk = collection.collectionFk,
-                        labelCount = (which+1).toString()
+                        labelCount = (which+1)
                     )
                     (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
                 }
                 val dialog = builder.create()
                 dialog.show()
             }else{
-                viewModel.collectionStickerPrint(
+              /*  viewModel.collectionStickerPrint(
-                    getData(USER),
+
-                    getData(PASSWORD),
                     collectionFk = collection.collectionFk,
-                    labelCount = ""
+                    labelCount = null
                 )
-                (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
+                (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())*/
 
 
         }
 
         if (ma.havePrinter() && ma.haveSector()) {
             viewModel.collectionStickerPrint(
-                usuario = getData(USER),
-                password = getData(PASSWORD),
                 collectionFk = collection.collectionFk,
-                labelCount = getData(SECTORFK)
+                labelCount = getData(SECTORFK).toInt()
 
             )
 
@@ -203,9 +192,7 @@ class CollectionShowTicketFragment(
                 if (!binding.scanInput.text.toString().isNullOrEmpty()) {
                     binding.splashProgress.visibility = VISIBLE
                     viewModel.collectionTicketGet(
-                        getData(USER),
+                        binding.scanInput.text.toString().toInt(),
-                        getData(PASSWORD),
-                        binding.scanInput.text.toString(),
                         getData(SECTORFK),
                         type
                     )
@@ -228,8 +215,6 @@ class CollectionShowTicketFragment(
             binding.collectionSwipe.isRefreshing = false
             binding.splashProgress.visibility = VISIBLE
             viewModel.collectionTicketGet(
-                getData(USER),
-                getData(PASSWORD),
                 collection.collectionFk,
                 getData(SECTORFK),
                 type
@@ -274,7 +259,7 @@ class CollectionShowTicketFragment(
 
     private fun createCollectionList() {
 
-        binding.mainToolbar.toolbarTitle.text = collection.collectionFk
+        binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString()
         binding.splashProgress.visibility = View.GONE
         var salesList: ArrayList<SaleVO> = ArrayList()
         tickets = ArrayList()
@@ -342,7 +327,7 @@ class CollectionShowTicketFragment(
                     totalMark += 1
         }
         binding.mainToolbar.toolbarTitle.text =
-            collection.collectionFk
+            collection.collectionFk.toString()
         binding.mainToolbar.toolbarSubtitle.text =
             "" + totalMark + "/" + sales.size
         if (totalMark == sales.size) {

app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt

@@ -65,10 +65,8 @@ class ControladorFragment :
                     binding.scanInput.setText(textScanned_filterDouble(binding.scanInput.text!!.toString()))
 
                     viewModel.collectionTicketGet(
-                        usuario = getData(USER),
-                        password = getData(PASSWORD),
                         sectorFk = getData(SECTORFK),
-                        collectionFk = binding.scanInput.text.toString(),
+                        collectionFk = binding.scanInput.text.toString().toInt(),
                         type = ConstAndValues.CONTROLADOR
                     )
 

app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt

@@ -28,11 +28,11 @@ class ControladorViewModel(context: Context) : BaseViewModel(context) {
         get() = _collectionTicketList
 
 
-    fun collectionTicketGet(usuario:String,password:String,collectionFk:String,sectorFk:String,type:String){
+    fun collectionTicketGet(collectionFk:Int,sectorFk:String,type:String){
-        getSacadorControladorUserCase.collectionTicketGet(usuario,password,collectionFk,sectorFk,"0",type).enqueue(object :
+        getSacadorControladorUserCase.collectionTicketGet(collectionFk,sectorFk,"0",type).enqueue(object :
             Callback<CollectionVO> {
             override fun onFailure(call: Call<CollectionVO>, t: Throwable) {
-                _collectionTicketList.value = CollectionVO(isError = true,errorMessage =  getMessageFromAllResponse(nameofFunction(this),t.message!!))
+                _collectionTicketList.value = CollectionVO(0,isError = true,errorMessage =  getMessageFromAllResponse(nameofFunction(this),t.message!!))
             }
             override fun onResponse(
                 call: Call<CollectionVO>,
@@ -49,7 +49,7 @@ class ControladorViewModel(context: Context) : BaseViewModel(context) {
 
 
                 }else{
-                    _collectionTicketList.value = CollectionVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
+                    _collectionTicketList.value = CollectionVO(0,isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
                 }
             }
         })

app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt

@@ -180,7 +180,7 @@ class ControlVehiculoFragment(
         if (!goBack) {
 
             binding.splashProgress.visibility = VISIBLE
-            viewModel.workerMachinery_isRegistered(getData(USER), getData(PASSWORD))
+            viewModel.workerMachinery_isRegistered()
 
         }
     }

app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt

@@ -116,10 +116,8 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) {
             })
     }
 
-    fun workerMachinery_isRegistered(usuario: String, password: String) {
+    fun workerMachinery_isRegistered() {
-        getVehicleControlTimeUserCase.workerMachinery_isRegistered(
+        silex.workerMachinery_isRegistered(
-            usuario,
-            password
         ).enqueue(object : Callback<String> {
             override fun onFailure(call: Call<String>, t: Throwable) {
                 _responsecontrol.value = ResponseItemVO(

app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt

@@ -34,7 +34,7 @@ class DayOfSaleViewModel(context: Context) : BaseViewModel(context) {
     val loadItemShelvingSaleDateList = Transformations.map(_itemShelvingSaleDateList) { Event(it) }
 
     fun itemShelving_getSaleDate(vShelvingFK: String) {
-        silex!!.itemShelving_getSaleDate(vShelvingFK).enqueue(object :
+       silex.itemShelving_getSaleDate(vShelvingFK).enqueue(object :
             Callback<List<ItemShelvingSaleDate>> {
             override fun onFailure(call: Call<List<ItemShelvingSaleDate>>, t: Throwable) {
                 val listError: ArrayList<ItemShelvingSaleDate> = ArrayList()

app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt

@@ -58,7 +58,7 @@ class InventaryViewModel(context: Context) : BaseViewModel(context) {
 
     //sergio para obtener comprador
     fun itemShelvingBuyerGet() {
-        silex!!.itemShelvingBuyerGet().enqueue(object :
+       silex.itemShelvingBuyerGet().enqueue(object :
             Callback<List<BuyerVO>> {
             override fun onFailure(call: Call<List<BuyerVO>>, t: Throwable) {
                 val listError: ArrayList<BuyerVO> = ArrayList()
@@ -99,7 +99,7 @@ class InventaryViewModel(context: Context) : BaseViewModel(context) {
     val loadInventaryList = Transformations.map(_inventaryList) { Event(it) }
 
     fun getInventory(buyerFk: Int, warehouseFk: Int) {
-        silex!!.itemShelvingRadarFilterBuyer(buyerFk, warehouseFk)
+       silex.itemShelvingRadarFilterBuyer(buyerFk, warehouseFk)
             .enqueue(object :
                 Callback<List<ItemInventaryVO>> {
                 override fun onFailure(call: Call<List<ItemInventaryVO>>, t: Throwable) {
@@ -151,7 +151,7 @@ class InventaryViewModel(context: Context) : BaseViewModel(context) {
     ) {
 
 
-        silex!!.itemTrash(itemFk, warehouseFk, newValue, isTrash)
+       silex.itemTrash(itemFk, warehouseFk, newValue, isTrash)
             .enqueue(object : Callback<Any> {
 
 
@@ -220,7 +220,7 @@ class InventaryViewModel(context: Context) : BaseViewModel(context) {
 
     fun department_getHasMistake() {
 
-        silex!!.department_getHasMistake()
+       silex.department_getHasMistake()
             .enqueue(object : Callback<List<DepartmentMistake>> {
                 override fun onFailure(call: Call<List<DepartmentMistake>>, t: Throwable) {
                     val listError: ArrayList<DepartmentMistake> = ArrayList()
@@ -254,7 +254,7 @@ class InventaryViewModel(context: Context) : BaseViewModel(context) {
     }
 
     fun worker_getFromHasMistake( departmentFk: Int) {
-        silex!!.worker_getFromHasMistake(departmentFk)
+       silex.worker_getFromHasMistake(departmentFk)
             .enqueue(object :
                 Callback<List<WorkerFromMistake>> {
                 override fun onFailure(call: Call<List<WorkerFromMistake>>, t: Throwable) {
@@ -298,7 +298,7 @@ class InventaryViewModel(context: Context) : BaseViewModel(context) {
     }
 
     fun workerMistakeType_get() {
-        silex!!.workerMistakeType_get()
+       silex.workerMistakeType_get()
             .enqueue(object : Callback<List<MistakeWorkerType>> {
                 override fun onFailure(call: Call<List<MistakeWorkerType>>, t: Throwable) {
                     val listError: ArrayList<MistakeWorkerType> = ArrayList()
@@ -349,7 +349,7 @@ class InventaryViewModel(context: Context) : BaseViewModel(context) {
         vUserFk: Int,
         vTypeFk: String
     ) {
-        silex!!.workerMistake_Add(vUserFk, vTypeFk)
+       silex.workerMistake_Add(vUserFk, vTypeFk)
             .enqueue(object :
                 Callback<Unit> {
                 override fun onFailure(call: Call<Unit>, t: Throwable) {
@@ -392,7 +392,7 @@ class InventaryViewModel(context: Context) : BaseViewModel(context) {
         vExpeditionFk: Int,
         vTypeFk: String
     ) {
-        silex!!.expeditionMistake_add(vExpeditionFk, vTypeFk)
+       silex.expeditionMistake_add(vExpeditionFk, vTypeFk)
             .enqueue(object :
                 Callback<Unit> {
                 override fun onFailure(call: Call<Unit>, t: Throwable) {
@@ -432,7 +432,7 @@ class InventaryViewModel(context: Context) : BaseViewModel(context) {
     }
 
     fun expeditionMistakeType_get() {
-        silex!!.expeditionMistakeType_get()
+       silex.expeditionMistakeType_get()
             .enqueue(object : Callback<List<MistakeWorkerType>> {
                 override fun onFailure(call: Call<List<MistakeWorkerType>>, t: Throwable) {
                     val listError: ArrayList<MistakeWorkerType> = ArrayList()

app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt

@@ -1,7 +1,6 @@
 package es.verdnatura.presentation.view.feature.login.fragment
 
 import android.content.Context
-import android.util.Log.d
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
@@ -9,7 +8,6 @@ import com.google.gson.Gson
 import com.google.gson.JsonObject
 import com.google.gson.reflect.TypeToken
 import es.verdnatura.domain.GetLoginUserCase
-import es.verdnatura.domain.NodeJsService
 import es.verdnatura.domain.SilexCallback
 import es.verdnatura.presentation.base.BaseViewModel
 import es.verdnatura.presentation.base.getMessageFromAllResponse
@@ -57,10 +55,6 @@ class LoginViewModel(var context: Context) : BaseViewModel(context) {
     val workerId: LiveData<workerId>
         get() = _workerId
 
-    private val _nodejs by lazy { MutableLiveData<NodeJsService.SmartTagNode>() }
-    val nodejs: LiveData<NodeJsService.SmartTagNode>
-        get() = _nodejs
-
 
     private val _workergetSector by lazy { MutableLiveData<SectorItemVO>() }
     val workergetSector: LiveData<SectorItemVO>
@@ -204,7 +198,7 @@ class LoginViewModel(var context: Context) : BaseViewModel(context) {
     fun deviceLog_add(
         app: String, versionApp: String, android_id: String
     ) {
-        silex!!.deviceLog_add(app, versionApp, android_id)
+       silex.deviceLog_add(app, versionApp, android_id)
             .enqueue(object : SilexCallback<Void>(context) {
                 override fun onError(t: Throwable) {
                     throw Error(nameofFunction((this)) + "->" + t.message)
@@ -417,7 +411,7 @@ class LoginViewModel(var context: Context) : BaseViewModel(context) {
 
     fun operator_getNumberOfWagons() {
 
-        silex!!.operator_getNumberOfWagons()
+       silex.operator_getNumberOfWagons()
             .enqueue(object : Callback<Int?> {
                 override fun onFailure(call: Call<Int?>, t: Throwable) {
 

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

@@ -64,8 +64,6 @@ import es.verdnatura.presentation.view.feature.sacador.fragment.SacadorFragment
 import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
 import es.verdnatura.presentation.view.feature.shelvingparking.fragment.ShelvingParkingFragment
 import es.verdnatura.presentation.view.feature.showticket.ShowTicketFragment
-import es.verdnatura.presentation.view.feature.smarttag.register.RegisterSmartTagsFragment
-import es.verdnatura.presentation.view.feature.smarttag.sacador.fragment.AssociateSmartTagsFragment
 import es.verdnatura.presentation.view.feature.ubicador.fragment.AutomaticAddItemFragment
 import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorFragment
 import es.verdnatura.presentation.view.feature.workermistake.adapter.WorkermistakeFragment
@@ -318,13 +316,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
 
         when (item.title) {
 
-            getString(R.string.titleSmarttagPickerAssociate) -> {
-                addFragmentOnTop(AssociateSmartTagsFragment.newInstance(getString(R.string.SmarttagAssociate)))
-            }
-
-            getString(R.string.titleSmarttagsRegister) -> {
-                addFragmentOnTop(RegisterSmartTagsFragment.newInstance(item.title))
-            }
 
             //BUFFERS
             getString(R.string.titlePalletizar) -> {

app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt

@@ -5,9 +5,7 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import es.verdnatura.domain.GetUbicadorUserCase
 import es.verdnatura.presentation.base.BaseViewModel
-
 import es.verdnatura.presentation.base.getMessageFromAllResponse
 import es.verdnatura.presentation.base.nameofFunction
 import es.verdnatura.presentation.common.ResponseItemVO
@@ -16,7 +14,7 @@ import retrofit2.Callback
 import retrofit2.Response
 
 class ParkingViewModel(context: Context) : BaseViewModel(context) {
-   // private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context)
+    // private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context)
 
     private val _response by lazy { MutableLiveData<ResponseItemVO>() }
     val response: LiveData<ResponseItemVO>
@@ -35,25 +33,35 @@ class ParkingViewModel(context: Context) : BaseViewModel(context) {
     fun hideProgressLoading() {
         _isLoading.value = false
     }
-    fun ProgressLoading(visibility:Int) {
+
+    fun ProgressLoading(visibility: Int) {
         _isLoadingProgress.value = visibility
     }
 
-    fun parking(scanItem: String,parking:String){
+    fun parking(scanItem: String, parking: String) {
         ProgressLoading(VISIBLE)
-        silex!!.shelvingPark(scanItem,parking).enqueue(object :
+        silex.shelvingPark(scanItem, parking).enqueue(object :
             Callback<Any> {
             override fun onFailure(call: Call<Any>, t: Throwable) {
-                _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
+                _response.value = ResponseItemVO(
+                    isError = true,
+                    errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
+                )
             }
 
             override fun onResponse(call: Call<Any>, response: Response<Any>) {
                 ProgressLoading(GONE)
 
-                    if (response.isSuccessful)
+                if (response.isSuccessful)
-                        _response.value = ResponseItemVO(isError = false,response = response.message())
+                    _response.value = ResponseItemVO(isError = false, response = response.message())
-                    else
+                else
-                        _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
+                    _response.value = ResponseItemVO(
+                        isError = true,
+                        errorMessage = getMessageFromAllResponse(
+                            nameofFunction(this),
+                            response.message()
+                        )
+                    )
 
             }
         })

app/src/main/java/es/verdnatura/presentation/view/feature/parkingSale/fragment/ParkingViewModel.kt

@@ -47,7 +47,7 @@ class ParkingSaleViewModel(context: Context) : BaseViewModel(context) {
 
     fun parking(scanItem: String,parking:String){
         ProgressLoading(VISIBLE)
-        silex!!.shelvingPark(scanItem,parking).enqueue(object :
+       silex.shelvingPark(scanItem,parking).enqueue(object :
             Callback<Any> {
             override fun onFailure(call: Call<Any>, t: Throwable) {
                 _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))

app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt

@@ -66,10 +66,8 @@ class PreControladorFragment :
                     binding.splashProgress.visibility = VISIBLE
 
                     viewModel.collectionTicketGet(
-                        usuario = getData(USER),
-                        password = getData(PASSWORD),
                         sectorFk = getData(SECTORFK),
-                        collectionFk = binding.scanInput.text.toString(),
+                        collectionFk = binding.scanInput.text.toString().toInt(),
                         type = type
                     )
 

app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorViewModel.kt

@@ -27,7 +27,7 @@ class PreControladorViewModel(context: Context) : BaseViewModel(context) {
         getPreControladorUserCase.collectionTicketGet(usuario,password,collectionFk,sectorFk,"0",type).enqueue(object :
             Callback<CollectionVO> {
             override fun onFailure(call: Call<CollectionVO>, t: Throwable) {
-                _collectionTicketList.value = CollectionVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))
+                _collectionTicketList.value = CollectionVO(0,isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))
             }
             override fun onResponse(
                 call: Call<CollectionVO>,
@@ -36,7 +36,7 @@ class PreControladorViewModel(context: Context) : BaseViewModel(context) {
                 if (response.body() != null){
                     _collectionTicketList.value = response.body()?.let { it.map(contextApp) }
                 }else{
-                    _collectionTicketList.value = CollectionVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
+                    _collectionTicketList.value = CollectionVO(0,isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
                 }
             }
         })

app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt

@@ -67,7 +67,7 @@ class PreSacadorAdapter (
                 }
 
                 itemArticleItemFk.setOnClickListener {
-                    onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = binding.root.context.resources.getString(R.string.titleItemConsult)),sale.itemFk)
+                    onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = binding.root.context.resources.getString(R.string.titleItemConsult)),sale.itemFk.toString())
                 }
 
                 itemArticleQuantity.setOnClickListener {

app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt

@@ -36,7 +36,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
 
 @Suppress("UNUSED_ANONYMOUS_PARAMETER")
 class EndSacadorFragment(
-    var collection: CollectionVO = CollectionVO(),
+    var collection: CollectionVO = CollectionVO(0),
     var type: String = ""
 ) :
     BaseFragment<FragmentPreSacadorBinding, PreSacadorViewModel>(PreSacadorViewModel::class) {
@@ -313,8 +313,6 @@ class EndSacadorFragment(
 
                     } else {
                         viewModel.sectorCollection_getSale(
-                            getData(USER),
-                            getData(PASSWORD),
                             collection.collectionFk,
                             getData(SECTORFK)
                         )
@@ -566,8 +564,6 @@ class EndSacadorFragment(
     private fun searchSaleCollection() {
         binding.splashProgress.visibility = View.VISIBLE
         viewModel.sectorCollection_getSale(
-            getData(USER),
-            getData(PASSWORD),
             collection.collectionFk,
             vSectorFk = getData(SECTORFK)
         )
@@ -589,7 +585,7 @@ class EndSacadorFragment(
         if (!ticketFk.isNullOrEmpty())
             binding.splashProgress.visibility = View.VISIBLE
         viewModel.sectorCollectionSaleGroup_add(
-            getData(USER), getData(PASSWORD), ticketFk,
+            ticketFk,
             collection.collectionFk
         )
     }
@@ -607,7 +603,7 @@ class EndSacadorFragment(
 
         } else {
             if (ticket.isNullOrBlank()) {
-                binding.mainToolbar.toolbarTitle.text = collection.collectionFk
+                binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString()
             }
             sales = ArrayList()
 
@@ -692,7 +688,7 @@ class EndSacadorFragment(
                 totalMark += 1
         }
         if (ticket.isNullOrBlank()) {
-            binding.mainToolbar.toolbarTitle.text = collection.collectionFk
+            binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString()
         }
 
         binding.mainToolbar.toolbarSubtitle.text = "" + totalMark + "/" + sales.size
@@ -709,7 +705,6 @@ class EndSacadorFragment(
 
         binding.splashProgress.visibility = VISIBLE
         viewModel.saleTracking_addPrevOK(
-            usuario = getData(USER), password = getData(PASSWORD),
             vSectorCollectionFk = collection.collectionFk
         )
 
@@ -878,7 +873,7 @@ class EndSacadorFragment(
         viewModel.itemPlacementSupplyAiming(
             usuario = getData(USER),
             password = getData(PASSWORD),
-            itemFk = sales[position].itemFk,
+            itemFk = sales[position].itemFk.toString(),
             quantity = quantityGet,
             shelvingFk = sales[position].carros[shelvingPosition].shelving
         )
@@ -1047,7 +1042,7 @@ class EndSacadorFragment(
 
     private fun checkItemScan(valueToCheck: String): Boolean {
         val saleToCheck = sales[storedPosition]
-        return saleToCheck.itemFk == valueToCheck
+        return saleToCheck.itemFk == valueToCheck.toInt()
     }
 
     /*  private fun showScannerParking(ticket: String) {
@@ -1165,7 +1160,7 @@ class EndSacadorFragment(
     //OTROS
     private fun setToolBar() {
         binding.mainToolbar.toolbarSubtitle.visibility = VISIBLE
-        binding.mainToolbar.toolbarTitle.text = collection.collectionFk
+        binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString()
 
         val listIcons: ArrayList<ImageView> = ArrayList()
 

app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt

@@ -130,7 +130,7 @@ class InitPreSacadorFragment (
                         ma.messageWithSound(it.errorMessage,true,false)
 
                     } else {
-                        if (goBack) addCollectionToList(it.response)
+                        if (goBack) addCollectionToList(it.response.toInt())
                     }
                     goBack = false
                     //sergio:para asegurarnos que aparece en pantalla. En mi movil personal y trabajo no hacia falta.
@@ -165,7 +165,7 @@ class InitPreSacadorFragment (
 
         }
 
-        private fun addCollectionToList(collection: String) {
+        private fun addCollectionToList(collection: Int) {
             var isNew = true
             collectionsList.forEach {
                 if (it.collectionFk == collection) {

app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt

@@ -133,14 +133,10 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
     }
 
     fun collectionStickerPrint(
-        usuario: String,
+        collectionFk: Int,
-        password: String,
+        sectorFk: Int
-        collectionFk: String,
-        sectorFk: String
     ) {
         getSacadorControladorUserCase.collectionStickerPrint(
-            usuario,
-            password,
             collectionFk,
             sectorFk
         ).enqueue(object : Callback<Any> {
@@ -172,7 +168,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
         ticketFk: String,
         parking: String
     ) {
-        silex!!.shelvingPark(ticketFk, parking)
+       silex.shelvingPark(ticketFk, parking)
             .enqueue(object : Callback<Any> {
                 override fun onFailure(call: Call<Any>, t: Throwable) {
                     _response.value = ResponseItemVO(
@@ -611,7 +607,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
             override fun onFailure(call: Call<List<CollectionVO>>, t: Throwable) {
                 val listError: ArrayList<CollectionVO> = ArrayList()
                 listError.add(
-                    CollectionVO(
+                    CollectionVO(0,
                         isError = true,
                         errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
                     )
@@ -630,7 +626,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
                 } else {
                     val listError: ArrayList<CollectionVO> = ArrayList()
                     listError.add(
-                        CollectionVO(
+                        CollectionVO(0,
                             isError = true,
                             errorMessage = getMessageFromAllResponse(
                                 nameofFunction(this),
@@ -709,14 +705,10 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
     }
 
     fun sectorCollection_getSale(
-        usuario: String,
+        sectorCollectionFK: Int,
-        password: String,
-        sectorCollectionFK: String,
         vSectorFk: String
     ) {
         getPreSacadorUseCase.sectorCollection_getSale(
-            usuario,
-            password,
             sectorCollectionFK,
             vSectorFk
         )
@@ -741,14 +733,11 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
     }
 
     fun sectorCollectionSaleGroup_add(
-        usuario: String,
+
-        password: String,
         vSaleGroupFk: String,
-        vSectorCollectionFk: String
+        vSectorCollectionFk: Int
     ) {
         getPreSacadorUseCase.sectorCollectionSaleGroup_add(
-            usuario,
-            password,
             vSaleGroupFk,
             vSectorCollectionFk
         ).enqueue(
@@ -795,11 +784,9 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
     }
 
     fun saleTracking_addPrevOK(
-        usuario: String,
+        vSectorCollectionFk: Int
-        password: String,
-        vSectorCollectionFk: String
     ) {
-        getPreSacadorUseCase.saleTracking_addPrevOK(usuario, password, vSectorCollectionFk).enqueue(
+        silex.saleTracking_addPrevOK(vSectorCollectionFk).enqueue(
             object :
                 Callback<Unit> {
                 override fun onFailure(call: Call<Unit>, t: Throwable) {

app/src/main/java/es/verdnatura/presentation/view/feature/presacador/model/PreSacadorItemVO.kt

@@ -4,7 +4,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.PlacementVO
 
 class PreSacadorItemVO(
     var id: String = "",
-    var itemFk: String = "",
+    var itemFk: Int ,
     var packingType: String? = "",//sergio:cuando subida versión de tarea #3510 se puede quitar incialización
     var longName: String = "",
     var subName: String? = "",//sergio:cuando subida versión de tarea #3510 se puede quitar incialización

app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/adapter/ReposicionAdapter.kt

@@ -65,7 +65,7 @@ class ReposicionAdapter (
                 }
 
                 itemArticleItemFk.setOnClickListener {
-                    onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = binding.root.context.resources.getString(R.string.titleItemConsult)),sale.itemFk)
+                    onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = binding.root.context.resources.getString(R.string.titleItemConsult)),sale.itemFk.toString())
                 }
 
 

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

@@ -353,7 +353,7 @@ class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionVie
         viewModel.itemPlacementSupplyAiming(
             usuario = getData(USER),
             password = getData(PASSWORD),
-            itemFk = sales[position].itemFk,
+            itemFk = sales[position].itemFk.toString(),
             quantity = quantityGet,
             shelvingFk = sales[position].carros[shelvingPosition].shelving
         )
@@ -541,7 +541,7 @@ class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionVie
 
     private fun checkItemScan(valueToCheck: String): Boolean {
         val saleToCheck = sales[storedPosition]
-        return saleToCheck.itemFk == valueToCheck
+        return saleToCheck.itemFk == valueToCheck.toInt()
     }
 
     private fun showErrorMessage(text: String) {

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

@@ -75,7 +75,7 @@ class ReposicionViewModel(context: Context) : BaseViewModel(context) {
         parking: String
 
     ) {
-        silex!!.shelvingPark(ticketFk, parking)
+       silex.shelvingPark(ticketFk, parking)
             .enqueue(object : Callback<Any> {
                 override fun onFailure(call: Call<Any>, t: Throwable) {
                     _response.value = ResponseItemVO(

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

@@ -6,21 +6,21 @@ import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.ImageView
-import androidx.fragment.app.setFragmentResultListener
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import es.verdnatura.R
 import es.verdnatura.databinding.FragmentSacadorBinding
 import es.verdnatura.domain.ConstAndValues.SACADOR
 import es.verdnatura.presentation.base.BaseFragment
-import es.verdnatura.presentation.common.*
+import es.verdnatura.presentation.common.OnCollectionSelectedListener
+import es.verdnatura.presentation.common.OnOptionsSelectedListener
+import es.verdnatura.presentation.common.TAG
+import es.verdnatura.presentation.common.ToolBarAdapterTooltip
 import es.verdnatura.presentation.view.component.CustomDialog
 import es.verdnatura.presentation.view.feature.sacador.adapter.CollectionAdapter
 import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
-import es.verdnatura.presentation.view.feature.smarttag.sacador.fragment.AssociateSmartTagsFragment
 
-
+//private var getCollections = false
-private var getCollections = false
 
 class SacadorFragment :
     BaseFragment<FragmentSacadorBinding, SacadorViewModel>(SacadorViewModel::class) {
@@ -55,25 +55,25 @@ class SacadorFragment :
         setToolBar()
         setEvents()
 
-        if (getCollections) {
+        /* if (getCollections) {
-            viewModel.collection_new_smart(
+             viewModel.collection_new_smart(
-                getData(USER),
+                 getData(USER),
-                getData(PASSWORD),
+                 getData(PASSWORD),
-                getData(SECTORFK),
+                 getData(SECTORFK),
-                getData(WAGON),
+                 getData(WAGON),
-                getData(TAGSTYPE)
+                 getData(TAGSTYPE)
-            )
+             )
 
+         } else {*/
+        val working_in_test = true //sergio:  Ok en app
+        if (!working_in_test) {
+            viewModel.collectionGetSalix(token = getData(TOKEN))
         } else {
-            val working_in_test = true //sergio:  Ok en app
+            viewModel.collectionGet(
-            if (!working_in_test) {
+            )
-                viewModel.collectionGetSalix(token = getData(TOKEN))
-            } else {
-                viewModel.collectionGet(
-                )
-            }
-
         }
+
+        //}
         super.init()
     }
 
@@ -81,19 +81,19 @@ class SacadorFragment :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        setFragmentResultListener("requestKey") { _, bundle ->
+        /*  setFragmentResultListener("requestKey") { _, bundle ->
 
-            val result = bundle.getString("tagMode")
+              val result = bundle.getString("tagMode")
 
-            resultTagMode = result
+              resultTagMode = result
-            if (result.equals(getString(R.string.complete)) && getData(TAGSTYPE).equals(getString(R.string.smarttags))) {
+              if (result.equals(getString(R.string.complete)) && getData(TAGSTYPE).equals(getString(R.string.smarttags))) {
-                getCollections = true
+                  getCollections = true
 
-            } else {
+              } else {
-                getCollections = false
+                  getCollections = false
-            }
+              }
 
-        }
+          }*/
 
     }
 
@@ -107,7 +107,7 @@ class SacadorFragment :
 
         ma.hideBottomNavigation(View.VISIBLE)
 
-        binding.mainToolbar.backButton.setOnClickListener{
+        binding.mainToolbar.backButton.setOnClickListener {
             requireActivity().onBackPressed()
         }
 
@@ -160,38 +160,38 @@ class SacadorFragment :
     }
 
 
-    private fun checkTagsMode() {
+    /* private fun checkTagsMode() {
 
-        //sergio:codigo smarttags
+         //sergio:codigo smarttags
-        //Tarea 4351 cambiar getData(WAGON por NUMBEROFWAGONS)
+         //Tarea 4351 cambiar getData(WAGON por NUMBEROFWAGONS)
-        if (getData(TAGSTYPE).equals(getString(R.string.stickers))) {
+         if (getData(TAGSTYPE).equals(getString(R.string.stickers))) {
-            viewModel.collectionNew(
+             viewModel.collectionNew(
-                getData(USER),
+                 getData(USER),
-                getData(PASSWORD),
+                 getData(PASSWORD),
-                getData(SECTORFK),
+                 getData(SECTORFK),
-                getData(NUMBEROFWAGONS)
+                 getData(NUMBEROFWAGONS)
-            )
+             )
-        } else if (getCollections) {
+         } else if (getCollections) {
 
-            viewModel.collection_new_smart(
+             viewModel.collection_new_smart(
-                getData(USER),
+                 getData(USER),
-                getData(PASSWORD),
+                 getData(PASSWORD),
-                getData(SECTORFK),
+                 getData(SECTORFK),
-                getData(WAGON),
+                 getData(WAGON),
-                getData(TAGSTYPE)
+                 getData(TAGSTYPE)
-            )
+             )
 
-        } else {
+         } else {
-            requireActivity().addFragment(
+             requireActivity().addFragment(
-                AssociateSmartTagsFragment.newInstance(AssociateSmartTagsFragment.TAG),
+                 AssociateSmartTagsFragment.newInstance(AssociateSmartTagsFragment.TAG),
-                R.id.main_frame_layout,
+                 R.id.main_frame_layout,
-                AssociateSmartTagsFragment.TAG
+                 AssociateSmartTagsFragment.TAG
-            )
+             )
 
-        }
+         }
 
 
-    }
+     }*/
 
 
     override fun observeViewModel() {
@@ -222,7 +222,7 @@ class SacadorFragment :
                     ma.messageWithSound(it.errorMessage, true, false)
 
                 } else {
-                    if (goBack) addCollectionToList(it.response)
+                    if (goBack) addCollectionToList(it.response.toInt())
                 }
                 goBack = false
                 //sergio:para asegurarnos que aparece en pantalla.
@@ -237,39 +237,39 @@ class SacadorFragment :
 
             })
 
-            responseCollectionSmart.observe(viewLifecycleOwner, Observer {
+            /*   responseCollectionSmart.observe(viewLifecycleOwner, Observer {
-                binding.splashProgress.visibility = View.GONE
+                   binding.splashProgress.visibility = View.GONE
 
-                getCollections = false
+                   getCollections = false
-                if (!goBack) {
+                   if (!goBack) {
-                    if (it.isError) {
+                       if (it.isError) {
-                        ma.messageWithSound(it.errorMessage, true, false)
+                           ma.messageWithSound(it.errorMessage, true, false)
 
-                    } else {
+                       } else {
 
-                        viewModel.smartTagInsertTicket(it.response)
+                           viewModel.smartTagInsertTicket(it.response)
 
-                        goBack = false
+                           goBack = false
-                    }
+                       }
-                }
+                   }
-            })
+               })*/
 
 
-            registerSmarttagInsert.observe(viewLifecycleOwner, Observer {
+            /* registerSmarttagInsert.observe(viewLifecycleOwner, Observer {
-
-                if (!goBack) {
-                    if (it.isError) {
-                        ma.messageWithSound(it.errorMessage, true, false)
-                        getCollections = true
-                    } else {
-                        ma.messageWithSound(getString(R.string.ticketInsert), false, false)
-                        getCollections = false
-                        viewModel.collectionGetSalix(getData(TOKEN))
-                    }
-                    goBack = false
-                }
-            })
 
+                 if (!goBack) {
+                     if (it.isError) {
+                         ma.messageWithSound(it.errorMessage, true, false)
+                         getCollections = true
+                     } else {
+                         ma.messageWithSound(getString(R.string.ticketInsert), false, false)
+                         getCollections = false
+                         viewModel.collectionGetSalix(getData(TOKEN))
+                     }
+                     goBack = false
+                 }
+             })
+ */
 
         }
     }
@@ -286,7 +286,7 @@ class SacadorFragment :
 
     }
 
-    private fun addCollectionToList(collection: String) {
+    private fun addCollectionToList(collection: Int) {
         var isNew = true
 
         collectionsList.forEach {

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

@@ -2,11 +2,9 @@ package es.verdnatura.presentation.view.feature.sacador.fragment
 
 
 import android.content.Context
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import es.verdnatura.domain.GetSacadorControladorUserCase
-import es.verdnatura.domain.GetSmarttagsUserCase
 import es.verdnatura.presentation.base.BaseViewModel
 
 import es.verdnatura.presentation.base.getMessageFromAllResponse
@@ -16,8 +14,6 @@ import es.verdnatura.presentation.view.feature.collection.mapper.map
 import es.verdnatura.presentation.view.feature.sacador.mapper.toDateFormat
 import es.verdnatura.presentation.view.feature.sacador.model.CollectionListVO
 import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
-import es.verdnatura.presentation.view.feature.smarttag.sacador.model.SmartTagRegister
-import org.json.JSONObject
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -31,9 +27,6 @@ class SacadorViewModel(context: Context) : BaseViewModel(context) {
         context
     )
 
-    private val GetSmarttagsUserCase: GetSmarttagsUserCase = GetSmarttagsUserCase(
-        context
-    )
 
     private val _collectionList by lazy { MutableLiveData<CollectionListVO>() }
     val collectionList: LiveData<CollectionListVO>
@@ -52,22 +45,13 @@ class SacadorViewModel(context: Context) : BaseViewModel(context) {
         get() = _responseCollectionSmart
 
 
-    private val _registerSmarttagInsert by lazy { MutableLiveData<SmartTagRegister>() }
-    val registerSmarttagInsert: LiveData<SmartTagRegister>
-        get() = _registerSmarttagInsert
-
-
     fun collectionTicketGet(
-        usuario: String,
+        collectionFk: Int,
-        password: String,
-        collectionFk: String,
         sectorFk: String,
         print: String,
         type:String
     ){
         getSacadorControladorUserCase.collectionTicketGet(
-            usuario,
-            password,
             collectionFk,
             sectorFk,
             print,
@@ -75,7 +59,7 @@ class SacadorViewModel(context: Context) : BaseViewModel(context) {
         ).enqueue(object :
             Callback<CollectionVO> {
             override fun onFailure(call: Call<CollectionVO>, t: Throwable) {
-                _collectionTicketList.value = CollectionVO(
+                _collectionTicketList.value = CollectionVO(0,
                     isError = true,
                     errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!)
                 )
@@ -88,7 +72,7 @@ class SacadorViewModel(context: Context) : BaseViewModel(context) {
                 if (response.body() != null) {
                     _collectionTicketList.value = response.body()?.let { it.map(contextApp) }
                 } else {
-                    _collectionTicketList.value = CollectionVO(
+                    _collectionTicketList.value = CollectionVO(0,
                         isError = true,
                         errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())
                     )
@@ -225,7 +209,7 @@ class SacadorViewModel(context: Context) : BaseViewModel(context) {
             Callback<List<CollectionVO>> {
             override fun onFailure(call: Call<List<CollectionVO>>, t: Throwable) {
                 val listError: ArrayList<CollectionVO> = ArrayList()
-                listError.add(CollectionVO(isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)))
+                listError.add(CollectionVO(0,isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)))
                 _collectionList.value = CollectionListVO(listError)
             }
 
@@ -240,7 +224,7 @@ class SacadorViewModel(context: Context) : BaseViewModel(context) {
                 } else {
                     val listError: ArrayList<CollectionVO> = ArrayList()
                     listError.add(
-                        CollectionVO(
+                        CollectionVO(0,
                             isError = true,
                             errorMessage =  getMessageFromAllResponse(nameofFunction(this),response.message())
                         )
@@ -258,7 +242,7 @@ class SacadorViewModel(context: Context) : BaseViewModel(context) {
             Callback<List<CollectionVO>> {
             override fun onFailure(call: Call<List<CollectionVO>>, t: Throwable) {
                 val listError: ArrayList<CollectionVO> = ArrayList()
-                listError.add(CollectionVO(isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)))
+                listError.add(CollectionVO(0,isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)))
                 _collectionList.value = CollectionListVO(listError)
             }
 
@@ -273,7 +257,7 @@ class SacadorViewModel(context: Context) : BaseViewModel(context) {
                 } else {
                     val listError: ArrayList<CollectionVO> = ArrayList()
                     listError.add(
-                        CollectionVO(
+                        CollectionVO(0,
                             isError = true,
                             errorMessage =  getMessageFromAllResponse(nameofFunction(this),response.message())
                         )
@@ -287,51 +271,4 @@ class SacadorViewModel(context: Context) : BaseViewModel(context) {
     }
 
 
-    fun smartTagInsertTicket(collectionFk: String)
-    {
-        GetSmarttagsUserCase.smartTagInsertTicket(collectionFk)
-            .enqueue(object : Callback<SmartTagRegister>
-            {
-                override fun onResponse(
-                    call: Call<SmartTagRegister>,
-                    response: Response<SmartTagRegister>
-                )
-                {
-
-                    val responseSmart: SmartTagRegister
-
-                    if (response.isSuccessful){
-                        responseSmart = SmartTagRegister(
-                            message="",
-                            isError = false,
-                            errorMessage = ""
-                        )
-
-                    }else{
-                        var text = JSONObject(response.errorBody()!!.string()).get("error")
-                        var message = JSONObject(text.toString()).get("message")
-
-                        responseSmart = SmartTagRegister(
-                            isError = true,
-                            errorMessage = message.toString()
-                        )
-                    }
-
-
-                    _registerSmarttagInsert.value = responseSmart
-                }
-
-                override fun onFailure(call: Call<SmartTagRegister>, t: Throwable)
-                {
-                    val responseSmart =
-                        SmartTagRegister(isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))
-
-                    _registerSmarttagInsert.value = responseSmart
-                }
-
-            })
-    }
-
-
-
 }

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

@@ -5,7 +5,7 @@ class CollectionListVO(
 )
 
 class CollectionVO(
-    var collectionFk: String = "",
+    var collectionFk: Int,
     var created: String = "",
     var tickets: List<TicketVO> = listOf(),
     var isError: Boolean = false,
@@ -32,7 +32,7 @@ class SaleVO(
     var agencyName: String = "",
     var saleOrder: Int = 9999,
     var saleFk: String = "",
-    var itemFk: String = "",
+    var itemFk: Int=0,
     var quantity: Int?,
     var longName: String = "",
     var size: String = "",

app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt

@@ -73,10 +73,8 @@ class ShowTicketFragment(var menuOrigin: String) :
                     binding.splashProgress.visibility = View.VISIBLE
 
                     viewModel.collectionTicketGet(
-                        usuario = getData(USER),
-                        password = getData(PASSWORD),
                         sectorFk = getData(SECTORFK),
-                        collectionFk = binding.scanInput.text.toString(),
+                        collectionFk = binding.scanInput.text.toString().toInt(),
                         type = type
 
                     )

app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketViewModel.kt

@@ -27,11 +27,11 @@ class ShowTicketViewModel(context: Context) : BaseViewModel(context) {
     val responseTicket: LiveData<ResponseItemVO>
         get() = _responseTicket
 
-    fun collectionTicketGet(usuario:String,password:String,collectionFk:String,sectorFk:String,type:String){
+    fun collectionTicketGet(collectionFk:Int,sectorFk:String,type:String){
-        getPreControladorUserCase.collectionTicketGet(usuario,password,collectionFk,sectorFk,"0",type).enqueue(object :
+        silex.collection_getTickets(collectionFk,sectorFk,"0",type).enqueue(object :
             Callback<CollectionVO> {
             override fun onFailure(call: Call<CollectionVO>, t: Throwable) {
-                _collectionTicketList.value = CollectionVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))
+                _collectionTicketList.value = CollectionVO(0,isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))
             }
             override fun onResponse(
                 call: Call<CollectionVO>,
@@ -40,7 +40,7 @@ class ShowTicketViewModel(context: Context) : BaseViewModel(context) {
                 if (response.body() != null){
                     _collectionTicketList.value = response.body()?.let { it.map(contextApp) }
                 }else{
-                    _collectionTicketList.value = CollectionVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
+                    _collectionTicketList.value = CollectionVO(0,isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))
                 }
             }
         })

app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/register/RegisterSmartTagsFragment.kt

@@ -1,348 +0,0 @@
-package es.verdnatura.presentation.view.feature.smarttag.register
-
-
-import android.content.Context
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import android.view.inputmethod.EditorInfo
-import androidx.activity.OnBackPressedCallback
-import androidx.recyclerview.widget.LinearLayoutManager
-import es.verdnatura.R
-import es.verdnatura.databinding.FragmentSacadorAssociatesmarttagBinding
-import es.verdnatura.presentation.base.BaseFragment
-import es.verdnatura.presentation.common.OnSmartTagRowClickListener
-import es.verdnatura.presentation.view.component.CustomDialog
-import es.verdnatura.presentation.view.component.CustomDialogList
-import es.verdnatura.presentation.view.feature.smarttag.adapter.SmartTagAdapter
-import es.verdnatura.presentation.view.feature.smarttag.model.SmartTag
-import es.verdnatura.presentation.view.feature.smarttag.sacador.fragment.SmartTagsViewModel
-
-class RegisterSmartTagsFragment(
-    var entryPoint: String = ""
-) : BaseFragment<FragmentSacadorAssociatesmarttagBinding, SmartTagsViewModel>(
-    SmartTagsViewModel::class
-) {
-
-    private var goBack: Boolean = false
-
-    override fun getLayoutId(): Int = R.layout.fragment_sacador_associatesmarttag
-    private lateinit var customDialog: CustomDialog
-    private lateinit var customDialogList: CustomDialogList
-    private var listSmartTags: ArrayList<SmartTag> = ArrayList()
-    private var smartAdapter: SmartTagAdapter? = null
-    private var itemScaned: String = ""
-
-
-    companion object {
-        fun newInstance(entryPoint: String) = RegisterSmartTagsFragment(entryPoint)
-    }
-
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        //  sergio: en test: Log.i("VERDNATURA:","attached")
-        val callback: OnBackPressedCallback =
-            object : OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    // Leave empty do disable back press or
-                    // write your code which you want
-                    //  Log.i("VERDNATURA:","PULSADO")
-
-                }
-            }
-        requireActivity().onBackPressedDispatcher.addCallback(
-            this,
-            callback
-        )
-
-        //if (context is OnCollectionSelectedListener) onCollectionSelectedListener = context
-    }
-
-
-    override fun init() {
-
-        customDialog = CustomDialog(requireContext())
-        customDialogList = CustomDialogList(requireContext())
-        goBack = false
-        ma.hideBottomNavigation(GONE)
-        binding.splashProgress.visibility = GONE
-
-        setEvents()
-        setToolBar()
-
-        showScanSmartTags()
-        super.init()
-    }
-
-    override fun onPause() {
-        goBack = true
-        super.onPause()
-    }
-
-    private fun setToolBar() {
-
-        binding.mainToolbar.toolbarTitle.text = entryPoint
-        binding.splashProgress.visibility = GONE
-
-    }
-
-
-    private fun bindShelving_add(shelvingOrSmarttag: String) {
-
-        itemScaned = shelvingOrSmarttag
-
-        if (listSmartTags.size > 0) {
-            binding.splashProgress.visibility = VISIBLE
-            viewModel.smartTagRegister(
-                shelvingOrSmarttag,
-                listSmartTags.first().code!!,
-                listSmartTags.size.toString()
-            )
-            customDialogList.dismiss()
-        }
-
-        if (listSmartTags.isEmpty()) {
-            val nameSmartTagwithWagon =
-                getTextScaned(listSmartTags.size + 1) + itemScaned
-            customDialogList.setTitle(getTextToPosition(listSmartTags.size + 1))
-
-
-            listSmartTags.add(SmartTag(itemScaned, nameSmartTagwithWagon))
-            smartAdapter!!.notifyDataSetChanged()
-            customDialogList.setValue("")
-        }
-    }
-
-    private fun add_item() {
-        val nameSmartTagwithWagon: String
-
-        nameSmartTagwithWagon =
-            getTextScaned(listSmartTags.size + 1) + itemScaned
-        customDialogList.setTitle(getTextToPosition(listSmartTags.size + 1))
-
-
-        listSmartTags.add(SmartTag(itemScaned, nameSmartTagwithWagon))
-        smartAdapter!!.notifyDataSetChanged()
-        customDialogList.setValue("")
-    }
-
-
-    /* private fun scanRequest() {
-         if (binding.scanInput != null) {
-             binding.scanInput.requestFocus()
-         }
-         hideKeyboards()
-     }*/
-
-    /* private fun hideKeyboards() {
-         try {
-             requireActivity().hideKeyboard()
-         } catch (e: Exception) {
-         }
-     }*/
-
-    private fun setEvents() {
-
-        binding.mainToolbar.backButton.setOnClickListener {
-
-            customDialogList.dismiss()
-            requireActivity().onBackPressed()
-
-        }
-
-    }
-
-
-    override fun observeViewModel() {
-
-
-        with(viewModel) {
-            binding.splashProgress.visibility = GONE
-
-            registerSmarttagNode.observe(viewLifecycleOwner) {
-
-                if (it.isError) {
-                    //listSmartTags.clear()
-                    showScanSmartTags()
-                    binding.splashProgress.visibility = GONE
-                    ma.messageWithSound(it.errorMessage, true, false)
-                } else {
-                    add_item()
-                    if (listSmartTags.size > 3) {
-
-                        customDialog.setTitle(getString(R.string.info))
-                            .setDescription(getString(R.string.registerOneWagoon))
-                            .setOkButton(getString(R.string.accept))
-                            {
-                                listSmartTags.clear()
-                                customDialog.dismiss()
-                                showScanSmartTags()
-
-                            }
-                            .setKoButton(getString(R.string.exit)) {
-                                customDialog.dismiss()
-                                customDialogList.dismiss()
-                                requireActivity().onBackPressed()
-
-                            }
-                            .show()
-
-                    } else {
-                        showScanSmartTags()
-                    }
-                    ma.messageWithSound(it.message, false, false)
-                }
-            }
-
-
-            /*   responseadd.observe(viewLifecycleOwner) {
-
-                   if (it.isError) {
-                       ma.messageWithSound(it.errorMessage, true, false)
-
-                   } else {
-                       val nameSmartTagwithWagon: String
-
-                       nameSmartTagwithWagon =
-                           getTextScaned(listSmartTags.size + 1) + itemScaned
-                       customDialogList.setTitle(getTextToPosition(listSmartTags.size + 1))
-
-
-                       listSmartTags.add(SmartTag(itemScaned, nameSmartTagwithWagon))
-                       smartAdapter!!.notifyDataSetChanged()
-                       customDialogList.setValue("")
-
-                   }
-                   binding.splashProgress.visibility = GONE
-               }*/
-
-        }
-
-    }
-
-    private fun getTextToPosition(TagsScaned: Int): String {
-        var message = ""
-
-        when (TagsScaned) {
-            0 -> message = getString(R.string.scanUpToDown)
-            1 -> message = getString(R.string.scanHighLabel)
-            2 -> message = getString(R.string.scanMedLabel)
-            3 -> message = getString(R.string.scanLowLabel)
-            4 -> message = getString(R.string.scannedWagon)
-        }
-
-        return message
-
-    }
-
-    private fun getTextScaned(TagScaned: Int): String {
-        var message = ""
-
-        when (TagScaned) {
-            1 -> message = getString(R.string.scannedWagon)
-            2 -> message = getString(R.string.highLabel)
-            3 -> message = getString(R.string.midLabel)
-            4 -> message = getString(R.string.lowLabel)
-        }
-
-        return message
-
-    }
-
-    private fun showScanSmartTags() {
-
-
-        customDialogList.setTitle(getTextToPosition(listSmartTags.size))
-            .setOkButton(getString(R.string.end)) {
-
-                ma.hideKeyboard(customDialogList.getEditText())
-
-                if (listSmartTags.size > 0) {
-
-                    customDialogList.dismiss()
-                    requireActivity().onBackPressed()
-
-
-                } else {
-
-                    customDialogList.dismiss()
-                    requireActivity().onBackPressed()
-
-
-                }
-
-                /*   }.setKoButton("Deshacer") {
-                       ma.hideKeyboard(customDialogList.getEditText())
-
-                       if (!listSmartTags.isEmpty()) {
-
-                           bindShelving_remove()
-
-                       } else {
-                           customDialogList.dismiss()
-                           requireActivity().onBackPressed()
-
-                       }*/
-
-
-                //
-            }.setValue("").show()
-
-        customDialogList.getEditText().requestFocus()
-        ma.hideKeyboard(customDialogList.getEditText())
-
-        customDialogList.getEditText().setOnEditorActionListener { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) {
-                if (!customDialogList.getValue().isEmpty()) {
-                    // Log.i("VERDNATURA:", "scan valor ${customDialogList.getValue()}")
-
-                    if (listSmartTags.size > 3) {
-
-                        customDialog.setTitle(getString(R.string.info))
-                            .setDescription(getString(R.string.registerOneWagoon))
-                            .setOkButton(getString(R.string.accept))
-                            {
-                                listSmartTags.clear()
-                                customDialog.dismiss()
-                                showScanSmartTags()
-
-                            }
-                            .setKoButton(getString(R.string.exit)) {
-                                customDialog.dismiss()
-                                customDialogList.dismiss()
-                                requireActivity().onBackPressed()
-
-                            }
-                            .show()
-
-
-                    } else {
-                        bindShelving_add(customDialogList.getValue().uppercase())
-                    }
-
-
-                }
-                customDialogList.setValue("")
-                ma.hideKeyboard(customDialogList.getEditText())
-                return@setOnEditorActionListener true
-            }
-            false
-        }
-
-
-        smartAdapter = SmartTagAdapter(listSmartTags, object : OnSmartTagRowClickListener {
-            override fun OnSmartTagRowClickListener(item: SmartTag) {
-            }
-        }, showDelete = false)
-        customDialogList.getRecyclerView().adapter = smartAdapter
-        customDialogList.getRecyclerView().layoutManager =
-            LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
-
-
-    }
-
-
-}
-
-
-

app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/fragment/AssociateSmartTagsFragment.kt

@@ -1,295 +0,0 @@
-package es.verdnatura.presentation.view.feature.smarttag.sacador.fragment
-
-import android.content.Context
-import android.util.Log
-import android.view.View
-import android.view.View.*
-import android.view.inputmethod.EditorInfo
-import androidx.activity.OnBackPressedCallback
-import androidx.core.os.bundleOf
-import androidx.fragment.app.setFragmentResult
-import androidx.lifecycle.Observer
-import androidx.recyclerview.widget.LinearLayoutManager
-import es.verdnatura.R
-import es.verdnatura.databinding.FragmentSacadorAssociatesmarttagBinding
-import es.verdnatura.databinding.FragmentSacadorAssociatesmarttagBindingImpl
-import es.verdnatura.databinding.FragmentVehiclecontrolBinding
-import es.verdnatura.domain.toast
-import es.verdnatura.presentation.base.BaseFragment
-import es.verdnatura.presentation.common.*
-import es.verdnatura.presentation.view.component.CustomDialog
-import es.verdnatura.presentation.view.component.CustomDialogInput
-import es.verdnatura.presentation.view.component.CustomDialogList
-import es.verdnatura.presentation.view.component.CustomDialogThreeButtons
-import es.verdnatura.presentation.view.feature.main.activity.MainActivity
-import es.verdnatura.presentation.view.feature.smarttag.adapter.SmartTagAdapter
-import es.verdnatura.presentation.view.feature.smarttag.model.SmartTag
-import timber.log.Timber
-
-class AssociateSmartTagsFragment(
-    var entryPoint: String = ""
-) : BaseFragment<FragmentSacadorAssociatesmarttagBinding, SmartTagsViewModel>(
-    SmartTagsViewModel::class
-) {
-
-
-    private var goBack: Boolean = false
-    override fun getLayoutId(): Int = R.layout.fragment_sacador_associatesmarttag
-    private lateinit var customDialog: CustomDialog
-    private lateinit var customDialogList: CustomDialogList
-    private lateinit var customDialogInput: CustomDialogInput
-    private lateinit var customDialogThreeButtons: CustomDialogThreeButtons
-    private var listSmartTags: ArrayList<SmartTag> = ArrayList()
-    private var smartAdapter: SmartTagAdapter? = null
-    private var itemScaned: String = ""
-
-    companion object {
-        fun newInstance(entryPoint: String) = AssociateSmartTagsFragment(entryPoint)
-    }
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-       // Timber.i("VERDNATURA:attached")
-        val callback: OnBackPressedCallback =
-            object : OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    // Leave empty do disable back press or
-                    // write your code which you want
-                    //Log.i("VERDNATURA:", "PULSADO")
-
-                }
-            }
-        requireActivity().onBackPressedDispatcher.addCallback(
-            this,
-            callback
-        )
-
-        //if (context is OnCollectionSelectedListener) onCollectionSelectedListener = context
-    }
-
-    override fun init() {
-
-        customDialog = CustomDialog(requireContext())
-        customDialogList = CustomDialogList(requireContext())
-        customDialogInput = CustomDialogInput(requireContext())
-        customDialogThreeButtons = CustomDialogThreeButtons(requireContext())
-        goBack = false
-         ma.hideBottomNavigation(View.GONE)
-        binding.splashProgress.visibility = GONE
-
-        setEvents()
-        setToolBar()
-
-        showScanSmartTags()
-        super.init()
-    }
-
-    override fun onPause() {
-        goBack = true
-        super.onPause()
-    }
-
-    private fun setToolBar() {
-
-        binding.mainToolbar.toolbarTitle.text = getString(R.string.smarttagAssociate)
-
-    }
-
-    private fun bindShelving_add(shelvingOrSmarttag: String) {
-
-        binding.splashProgress.visibility = VISIBLE
-        //poner el bindshelving aqui
-
-        viewModel.workerShelving_add(getData(USER),
-            getData(PASSWORD), shelvingOrSmarttag)
-
-        itemScaned = shelvingOrSmarttag
-
-    }
-
-    private fun bindShelving_remove() {
-
-        // binding.splashProgress.visibility = VISIBLE
-        //ponser el unbindshleving aqui
-        //sergio:esto se debe hacer en
-
-        /*viewModel.workerShelving_delete(getData(USER),
-            getData(PASSWORD), listSmartTags.last().code.toString())*/
-
-       /* ("http://localhost:7777/unbindShelving/${listSmartTags.first().code}" + "&" + listSmartTags.last().code + "&${listSmartTags.size}").toast(
-            requireContext()
-        )*/
-
-    }
-
-    private fun scanRequest() {
-        binding.scanInput.requestFocus()
-        hideKeyboards()
-    }
-
-    private fun hideKeyboards() {
-        try {
-            requireActivity().hideKeyboard()
-        } catch (e: Exception) {
-        }
-    }
-
-    private fun setEvents() {
-
-        binding.mainToolbar.backButton.setOnClickListener {
-            requireActivity().onBackPressed()
-        }
-
-    }
-
-    override fun observeViewModel() {
-
-        with(viewModel) {
-            binding.splashProgress.visibility = GONE
-            responseadd.observe(viewLifecycleOwner, Observer {
-               // Log.i("VERDNATURA::", "Revisar llamada de las etiquetas smarttags : ${it.response}")
-
-                if (it.isError) {
-                    ma.messageWithSound(getString(R.string.shelvingSure)+it.errorMessage,true,false)
-
-                } else {
-
-                    ma.messageWithSound(getString(R.string.insertedLabel),false,false)
-                        var nameSmartTagwithWagon =
-                            getTextScaned(0) + itemScaned
-                        customDialogList.setTitle(getTextToPosition(0))
-
-                            listSmartTags.add(SmartTag(itemScaned, nameSmartTagwithWagon))
-                            smartAdapter!!.notifyDataSetChanged()
-
-                        customDialogList.setValue("")
-
-
-                }
-                binding.splashProgress.visibility = GONE
-            })
-            responseremove.observe(viewLifecycleOwner, Observer {
-
-                if (it.isError) {
-                    ma.messageWithSound(it.errorMessage,true,false)
-                    /*customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage)
-                        .setOkButton(getString(R.string.close)) {
-                            customDialog.dismiss()
-                        }.show()*/
-                } else {
-
-
-                    listSmartTags.removeAt(listSmartTags.size - 1)
-                    smartAdapter!!.notifyDataSetChanged()
-
-                    customDialogList.setValue("")
-                    ma.messageWithSound(getString(R.string.deletedLabel),false,false)
-                }
-                binding.splashProgress.visibility = GONE
-            })
-        }
-
-    }
-
-    private fun getTextToPosition(TagsScaned: Int): String {
-
-
-        return when (TagsScaned) {
-            0 -> getString(R.string.scanSmarttagOrShelving)
-            1 ->  getString(R.string.scanHighLabel)
-            2 ->  getString(R.string.scanMedLabel)
-            3 ->  getString(R.string.scanLowLabel)
-            4 -> getString(R.string.scannedWagon)
-            else -> {""}
-        }
-
-    }
-
-    private fun getTextScaned(TagScaned: Int): String {
-
-
-        return when (TagScaned) {
-            0 ->  getString(R.string.scanned)
-            1 ->  getString(R.string.wagoon)
-            2 -> getString(R.string.scanHighLabel)
-            3 -> getString(R.string.scanMedLabel)
-            4 -> getString(R.string.scanLowLabel)
-            else -> {""}
-        }
-
-
-
-    }
-
-    private fun showScanSmartTags() {
-
-        customDialogList.setTitle(getString(R.string.scanSmarttagOrShelving))
-            .setOkButton(getString(R.string.end)) {
-
-                ma.hideKeyboard(customDialogList.getEditText())
-
-                if (listSmartTags.size > 0) {
-                    //  setFragmentResult("requestkey", bundleOf("tagMode" to "SmartTag"))
-                    customDialogList.dismiss()
-                        val result = getString(R.string.complete)
-                        setFragmentResult("requestKey", bundleOf("tagMode" to result))
-                       ma.openFragmentPickers(true)
-                    /*listSmartTags.forEach {
-                        Log.i("VERDNATURA:","El codigo es :${it.code}")
-                        }
-                      workerShelving_add(userFk, it.code!!)*/
-
-                } else {
-                  /*  customDialog.setTitle("Atención").setDescription("No ha escaneado Smartags")
-                        .setOkButton("Ok")
-                        {*/
-                            customDialogList.dismiss()
-                            requireActivity().onBackPressed()
-
-                       // }.show()
-                }
-
-            }.setKoButton(getString(R.string.undone)) {
-                ma.hideKeyboard(customDialogList.getEditText())
-
-                if (!listSmartTags.isEmpty()) {
-
-                    bindShelving_remove()
-
-                } else {
-                    customDialogList.dismiss()
-                    requireActivity().onBackPressed()
-
-                }
-
-                //
-            }.setValue("").show()
-
-        customDialogList.getEditText().requestFocus()
-        ma.hideKeyboard(customDialogList.getEditText())
-
-        customDialogList.getEditText().setOnEditorActionListener { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) {
-                if (!customDialogList.getValue().isNullOrEmpty()) {
-                    bindShelving_add(customDialogList.getValue().uppercase())
-                }
-                customDialogList.setValue("")
-                ma.hideKeyboard(customDialogList.getEditText())
-                return@setOnEditorActionListener true
-            }
-            false
-        }
-
-
-        smartAdapter = SmartTagAdapter(listSmartTags, object : OnSmartTagRowClickListener {
-            override fun OnSmartTagRowClickListener(item: SmartTag) {
-            }
-        }, showDelete = false)
-        customDialogList.getRecyclerView().adapter = smartAdapter
-        customDialogList.getRecyclerView().layoutManager =
-            LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
-
-    }
-
-}
-

app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/fragment/SmartTagsViewModel.kt

@@ -1,167 +0,0 @@
-package es.verdnatura.presentation.view.feature.smarttag.sacador.fragment
-
-import android.content.Context
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import es.verdnatura.domain.GetSmarttagsUserCase
-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 es.verdnatura.presentation.view.feature.smarttag.sacador.model.SmartTagRegister
-import org.json.JSONObject
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class SmartTagsViewModel(context: Context) : BaseViewModel(context) {
-
-    private val GetSmarttagsUserCase: GetSmarttagsUserCase = GetSmarttagsUserCase(context)
-
-    private val _responseinsert by lazy { MutableLiveData<ResponseItemVO>() }
-    val responseinsert: LiveData<ResponseItemVO>
-        get() = _responseinsert
-
-    private val _responsecontrol by lazy { MutableLiveData<ResponseItemVO>() }
-    val responsecontrol: LiveData<ResponseItemVO>
-        get() = _responsecontrol
-
-    private val _responseadd by lazy { MutableLiveData<ResponseItemVO>() }
-    val responseadd: LiveData<ResponseItemVO>
-        get() = _responseadd
-
-    private val _responseremove by lazy { MutableLiveData<ResponseItemVO>() }
-    val responseremove: LiveData<ResponseItemVO>
-        get() = _responseremove
-
-
-    private val _responselevel by lazy { MutableLiveData<ResponseItemVO>() }
-    val responselevel: LiveData<ResponseItemVO>
-        get() = _responselevel
-
-    private val _registerSmarttagNode by lazy { MutableLiveData<SmartTagRegister>() }
-    val registerSmarttagNode: LiveData<SmartTagRegister>
-        get() = _registerSmarttagNode
-
-
-    fun workerShelving_add(usuario: String, password: String, shelvingFK: String) {
-        GetSmarttagsUserCase.workerShelving_add(usuario, password, shelvingFK)
-            .enqueue(object : Callback<Void> {
-                override fun onFailure(call: Call<Void>, t: Throwable) {
-
-                    _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 = 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 workerShelving_delete(usuario: String, password: String, vBarcode: String) {
-        GetSmarttagsUserCase.workerShelving_delete(usuario, password, vBarcode)
-            .enqueue(object : Callback<Void> {
-                override fun onFailure(call: Call<Void>, t: Throwable) {
-                    //_responseremove.value = ResponseItemVO(isError = true,errorMessage = "Error al llamar a workerShelving_remove")
-                    _responseremove.value = ResponseItemVO(
-                        isError = true,
-                        errorMessage = getMessageFromAllResponse(
-                            nameofFunction(this),
-                            t.message!!
-                        ))
-                }
-
-                override fun onResponse(call: Call<Void>, response: Response<Void>) {
-
-                    if (!response.isSuccessful) {
-                        _responseremove.value = ResponseItemVO(
-                            isError = true,
-                            errorMessage = getMessageFromAllResponse(
-                                nameofFunction(this),
-                                response.message()
-                            )
-                        )
-                    } else {
-                        _responseremove.value =
-                            ResponseItemVO(isError = false, response = response.message()!!)
-                    }
-
-
-                }
-
-            })
-    }
-*/
-    fun smartTagRegister(smarttag: String, wagon: String, shelving: String) {
-        GetSmarttagsUserCase.smartTagRegister(smarttag, wagon, shelving)
-            .enqueue(object : Callback<SmartTagRegister> {
-                override fun onResponse(
-                    call: Call<SmartTagRegister>,
-                    response: Response<SmartTagRegister>
-                ) {
-
-                    val responseSmart: SmartTagRegister
-
-                    if (response.isSuccessful) {
-                        responseSmart = SmartTagRegister(
-                            message = response.message(),
-                            isError = false,
-                            errorMessage = ""
-                        )
-
-                    } else {
-                        // sergio: buscar JSON obtindre el "message" Smarttag
-                        var text = JSONObject(response.errorBody()!!.string()).get("error")
-                        var message = JSONObject(text.toString()).get("message")
-
-                        responseSmart = SmartTagRegister(
-                            isError = true,
-                            errorMessage = message.toString()
-                        )
-
-                    }
-
-                    _registerSmarttagNode.value = responseSmart
-                }
-
-                override fun onFailure(call: Call<SmartTagRegister>, t: Throwable) {
-                    val responseSmart =
-                        SmartTagRegister(isError = true, errorMessage = t.message!!)
-
-                    //Log.d("VERDNATURA::","el error nodejs es "+t.message+"--"+t.cause.toString()+"--"+t.stackTrace.toString())
-
-                    _registerSmarttagNode.value = responseSmart
-                }
-
-            })
-    }
-
-}

app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/model/SmartTagAdapter.kt

@@ -1,49 +0,0 @@
-package es.verdnatura.presentation.view.feature.smarttag.model
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import es.verdnatura.databinding.ItemSmarttagRowBinding
-import es.verdnatura.presentation.common.OnSmartTagRowClickListener
-
-
-class SmartTagAdapter(
-private val items: List<SmartTag>,
-private val OnSmartTagRowClickListener: OnSmartTagRowClickListener,
-private var showDelete: Boolean = true
-): RecyclerView.Adapter<SmartTagAdapter.ItemHolder> () {
-
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
-        return ItemHolder(
-            ItemSmarttagRowBinding.inflate(LayoutInflater.from(parent.context),parent,false)
-        )
-    }
-
-    override fun getItemCount() =items.size
-
-    override fun onBindViewHolder(holder: ItemHolder, position: Int) {
-        holder.bind(items[position])
-
-        holder.binding.root.setOnClickListener {
-            OnSmartTagRowClickListener.OnSmartTagRowClickListener(items[position])
-        }
-
-    }
-
-
-    inner class ItemHolder(
-        val binding: ItemSmarttagRowBinding
-    ) : RecyclerView.ViewHolder(binding.root){
-        private val res = binding.root.context.resources
-        fun bind(item: SmartTag) {
-            binding.apply {
-                this.item = item
-                if (showDelete) itemImage.visibility = View.VISIBLE
-                else itemImage.visibility = View.GONE
-            }
-        }
-    }
-}
-

app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/model/SmartTagScan.kt

@@ -1,23 +0,0 @@
-package es.verdnatura.presentation.view.feature.smarttag.sacador.model
-
-
-class SmartTagScan (
-    var expeditionFk:String = "",
-    var palletFk:String = "",
-    var isError:Boolean = false,
-    var errorMessage:String = ""
-)
-
-class SmartTagScanList(
-    var list:List<SmartTagScan> = listOf()
-)
-
-class SmartTagRegister(
-    var message: String = "",
-    var smarttag: String = "",
-    var wagon: String = "",
-    var shelving: String = "",
-    var isError: Boolean = false,
-    var errorMessage: String = ""
-)
-

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

@@ -96,7 +96,7 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) {
         shelving: String
 
     ) {
-        silex!!.shelvingPriorityUpdate(priority, shelving)
+       silex.shelvingPriorityUpdate(priority, shelving)
             .enqueue(object : Callback<Any> {
                 override fun onFailure(call: Call<Any>, t: Throwable) {
                     _responsepriority.value = ResponseItemVO(
@@ -229,7 +229,7 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) {
         shelving: String,
         parking: String
     ) {
-        silex!!.shelvingPark(shelving, parking)
+       silex.shelvingPark(shelving, parking)
             .enqueue(object : Callback<Any> {
                 override fun onFailure(call: Call<Any>, t: Throwable) {
                     _response.value = ResponseItemVO(

app/src/main/res/layout/item_article_row.xml

@@ -155,7 +155,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/layout_margin_min"
                 android:layout_marginEnd="@dimen/layout_margin_min"
-                android:text="@{sale.itemFk}"
+                android:text="@{Integer.toString(sale.itemFk)}"
                 tool:text="85478"
                 android:textColor="@color/verdnatura_white"
                 android:textSize="@dimen/h6"

app/src/main/res/layout/item_article_row_fragment.xml

@@ -180,7 +180,7 @@
                 android:layout_marginStart="@dimen/layout_margin_min_to_modify"
                 android:layout_marginEnd="@dimen/layout_margin_min"
                 android:maxLines="1"
-                android:text="@{sale.itemFk}"
+                android:text="@{Integer.toString(sale.itemFk)}"
                 android:textColor="@color/verdnatura_white"
                 android:textSize="@dimen/body1"
                 android:textStyle="bold"

app/src/main/res/layout/item_article_row_presacador.xml

@@ -152,7 +152,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/layout_margin_min"
                 android:layout_marginEnd="@dimen/layout_margin_min"
-                android:text="@{sale.itemFk}"
+                android:text="@{Integer.toString(sale.itemFk)}"
                 tool:text="85478"
                 android:textColor="@color/verdnatura_white"
                 android:textSize="@dimen/h6"

app/src/main/res/layout/item_collection_row.xml

@@ -25,7 +25,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:text="@{item.collectionFk}"
+                android:text="@{Integer.toString(item.collectionFk)}"
                 android:textColor="@color/verdnatura_white"
                 android:textSize="@dimen/h7"
                 android:gravity="center_vertical"