From 7ae8244cd2c8b586a672a2af1357d88b2bde9136 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Fri, 22 Mar 2024 13:19:55 +0100
Subject: [PATCH] refs #6964 feat:hasItemOlder

---
 .../java/es/verdnatura/domain/SalixService.kt | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt
index 68593c07..2f57f742 100644
--- a/app/src/main/java/es/verdnatura/domain/SalixService.kt
+++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt
@@ -2,6 +2,7 @@ package es.verdnatura.domain
 
 import com.google.gson.JsonObject
 import es.verdnatura.presentation.common.ItemBarCodeSalix
+import es.verdnatura.presentation.common.SaleTrackingSalix
 import es.verdnatura.presentation.common.TicketState
 import es.verdnatura.presentation.common.packingSiteSalix
 import es.verdnatura.presentation.view.feature.ajustes.model.Printers
@@ -63,6 +64,7 @@ import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMis
 import es.verdnatura.presentation.view.feature.workermistake.model.ExpeditionMistakeSalix
 import es.verdnatura.presentation.view.feature.workermistake.model.MistakeType
 import es.verdnatura.presentation.view.feature.workermistake.model.SaleMistakeSalix
+import es.verdnatura.presentation.view.feature.workermistake.model.SaleTrackingDelSalix
 import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
 import es.verdnatura.presentation.view.feature.workermistake.model.WorkerMistakeSalix
 import okhttp3.MultipartBody
@@ -288,19 +290,18 @@ interface SalixService {
     ):
             Call<List<Printers>>
 
-    @GET("Collections/getSalesFromTicketOrCollection")//REVISADA
+    @GET("Collections/getSales")//REVISADA
     fun collectionGetTickets(
         @Query("collectionOrTicketFk") collectionOrTicketFk: Number,
-        @Query("sectorFk") sectorFk: Number,
-        @Query("printFk") printFk: Number,
+        @Query("print") printFk: Boolean,
         @Query("source") source: String,
 
         ):
             Call<CollectionVO>
 
-    @POST("almacennew/SaleTrackings/mark")//REVISADA
+    @POST("SaleTrackings/setPicked")//REVISADA
     fun saleTrackingMark(
-        @Body vararg params: Any?
+        @Body saleTRackingSalix: SaleTrackingSalix
     ):
             Call<Any>
 
@@ -317,11 +318,16 @@ interface SalixService {
     ):
             Call<Any>
 
-    @POST("Collections/assignCollection")
+    @POST("Collections/assign")
     fun collectionAssign(
     ):
             Call<Int>
 
+    @POST("Collections/assignCollection")
+    fun collectionAssigned(
+    ):
+            Call<Int>
+
     @POST("ItemShelvings/updateFromSale")//REVISADA
     fun itemShelvingUpdateFromSale(
         @Body params: Any
@@ -330,7 +336,7 @@ interface SalixService {
 
     @POST("SaleTrackings/delete")//REVISADA
     fun saleTrackingDel(
-        @Body params: Any
+        @Body params: SaleTrackingDelSalix
     ):
             Call<Any>
 
@@ -340,8 +346,8 @@ interface SalixService {
     ):
             Call<Any>
 
-    @POST("ItemShelvings/makeMulti")//REVISADA
-    fun itemShelvingMakeMulti(
+    @POST("ItemShelvings/upsertItem")//REVISADA
+    fun upsertItem(
         @Body params: Any
     ):
             Call<Any>
@@ -457,8 +463,10 @@ interface SalixService {
 
     @GET("ItemShelvings/hasItemOlder")
     fun hasItemOlder(
-        @Query("shelvingFk") shelving: Any? = null,
+        @Query("shelvingFkIn") shelvingFkIn: Any,
         @Query("parking") parking: Any? = null,
+        @Query("shelvingFkOut") shelvingFkOut: Any? = null,
+        @Query("itemFk") itemFk: Any? = null,
     ): Call<Any>
 
     @POST("Applications/sectorCollectionSaleGroup_add/execute-proc")