diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt index ccf3e179..1fdc5e37 100644 --- a/app/src/main/java/es/verdnatura/domain/SalixService.kt +++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt @@ -10,6 +10,7 @@ import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO import es.verdnatura.presentation.view.feature.ajustes.model.Train import es.verdnatura.presentation.view.feature.articulo.model.AddressLoses import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO +import es.verdnatura.presentation.view.feature.articulo.model.ItemDetails import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType import es.verdnatura.presentation.view.feature.articulo.model.ItemProposal import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO @@ -58,6 +59,9 @@ import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO import es.verdnatura.presentation.view.feature.sacador.model.TicketStateSalix +import es.verdnatura.presentation.view.feature.truck.model.RoadMapTruck +import es.verdnatura.presentation.view.feature.truck.model.StopMapTruck +import es.verdnatura.presentation.view.feature.truck.model.StopMapTruckPallet import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicador import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake @@ -176,7 +180,7 @@ interface SalixService { @Query("params") params: Any? = null ): Call - @POST("Applications/itemShelvingSale_reserveBySectorCollection/execute-proc") + @POST("Applications/itemShelvingSale_addBySectorCollection/execute-proc") // PERMISOS GRANT fun getReserveBySectorCollection( @Query("schema") schema: String = "vn", @Query("params") params: Any? = null @@ -218,6 +222,12 @@ interface SalixService { @Body params: Any //description ): Call + @POST("TicketObservations/addDropOff") + fun addFropOff( + @Query("ticketFk") ticketFk: Long , + @Query("note") note: String , + ): Call + @POST("Applications/item_getBalance/execute-proc") fun itemGetBalance( @Query("params") params: Any? = null, @@ -450,6 +460,7 @@ interface SalixService { @Query("schema") schema: String = "vn" ): Call + @POST("Applications/saleTracking_updateIsChecked/execute-proc") fun saleTrackingUpdateIsChecked( @Query("params") params: Any? = null, @@ -512,6 +523,18 @@ interface SalixService { @Query("schema") schema: String = "vn" ): Call> + @POST("Applications/sectorCollection_getPartial/execute-proc") + fun sectorCollectionGetPartial( + @Query("params") params: Any? = null, + @Query("schema") schema: String = "vn" + ): Call> + + @POST("Applications/sectorCollection_hasSalesReserved/execute-func") + fun hasSalesReserved( + @Query("params") params: Any? = null, + @Query("schema") schema: String = "vn" + ): Call + @POST("Applications/worker_getFromHasMistake/execute-proc") fun workerGetFromHasMistake( @Query("params") params: Any, @@ -656,6 +679,20 @@ interface SalixService { @Query("params") params: Any, ): Call + @POST("Applications/item_devalueA2/execute-proc") + fun itemDevalueA2( + @Query("schema") schema: String = "vn", + @Query("params") params: Any, + ): Call + + @POST("Applications/itemShelving_getItemDetails/execute-proc") + fun itemShelvingGetItemDetails( + @Query("schema") schema: String = "vn", + @Query("params") params: Any, + ): + Call> + + @POST("Applications/expedition_getState/execute-proc") fun expedition_getState( @Query("schema") schema: String = "vn", @@ -712,7 +749,7 @@ interface SalixService { ): Call @Multipart - @POST("Entries/{id}/uploadFile") + @POST("EntryDms/{id}/uploadFile") fun uploadEntryPhoto( @Path("id") id: Number, @Query("warehouseId") warehouseId: Number, @@ -834,6 +871,22 @@ interface SalixService { @Query("filter") filter: String ): Call> + @GET("RoadMaps") + fun roadmapTruckGet( + @Query("filter") filter: String + ): Call> + + @GET("ExpeditionTrucks") + fun getStopMapTruckList( + @Query("filter") filter: String + ): Call> + + @POST("Applications/expeditionPallet_List/execute-proc") + fun getStopMapTruckPalletList( + @Query("params") params: Any? = null, + @Query("schema") schema: String = "vn" + ): Call> + @POST("PackingSiteAdvanceds") fun ticket_advancePackaging( @Body parms: packingSiteSalix diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt index 4ac0ce3d..7c419be3 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt @@ -72,7 +72,7 @@ class ExpeditionPalletDetailFragment( } binding.buttonOk.setOnClickListener { - ma.onMyBackPressed() + ma.openFragmentTruckFragment() } } @@ -160,7 +160,7 @@ class ExpeditionPalletDetailFragment( if (it.isError) { ma.messageWithSound(it.errorMessage, true, false) } else { - ma.onMyBackPressed() + ma.openFragmentTruckFragment() } })