diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 88ea3aa1..f2c274a9 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -117,6 +117,9 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ed9c379e..ce1e579a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
-
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000..146ab09b
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 23704740..35ffc9d8 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 860da66a..523c1f36 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,77 @@
+
+
+
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index e497da99..00000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 48436dfd..4ad285cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,15 +8,21 @@ apply plugin: 'com.google.firebase.crashlytics'
android {
compileSdkVersion 29
- buildToolsVersion "29.0.3"
+ // buildToolsVersion "29.0.3"
defaultConfig {
applicationId "es.verdnatura"
minSdkVersion 21
targetSdkVersion 29
- versionCode 64
- // versionName "5.4.4"
- versionName "6.1.6" //control vehiculo , visualizar y filtrar historico
+ versionCode 74
+ versionName "6.1.8.5" //VERSION CODE 74 . Modificado itemtrash, deprecated preferenceManager, quitados ;,puesto menu general al controlador
+ //versionName "6.1.8.4.1" //VERSION CODE 73 . Modificar itemtrash
+ //versionName "6.1.8.4" //VERSION CODE 72 . Se añade ExpedtionScan para el Sorter, y modificion llamadas itemtrash y collectionGetTicket.
+ //versionName "6.1.8.3.1"//(VERSION CODE 71) Se añade ViewModel.collectionGet cuando se hace un collectionNew y un refresco de adapter
+ //versionName "6.1.8.3" //(VERSION CODE 69) Tres campos más en pantalla cel1,cel2,cel3, obtener artículos similares con filtro, mostrar foto del sacador.
+ //versionName "6.1.8.2" //(VERSIONCODE 68) Menu Operaciones buffer, pantalla mas grande en control vehiculo, deletefragments a todos los menus.
+ //versionName "6.1.8.1" //(VERSIONCODE 67) Control vehiculo , visualizar y filtrar historico
+ // versionName "5.4.4" //version inicial
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@@ -61,6 +67,12 @@ dependencies {
implementation "com.airbnb.android:lottie:$lottieVersion"
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
+ //preferences
+ implementation 'androidx.preference:preference:1.1.1'
+
+ //Fragments
+ implementation("androidx.fragment:fragment-ktx:1.3.6")
+
// Architecture components
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle"
@@ -88,4 +100,8 @@ dependencies {
//search
implementation 'com.github.mirrajabi:search-dialog:1.1'
+ //logs
+ implementation 'com.jakewharton.timber:timber:4.7.1'
+
+
}
diff --git a/app/release/20210611-vn-picking.apk b/app/release/20210611-vn-picking.apk
deleted file mode 100644
index 207aa4d4..00000000
Binary files a/app/release/20210611-vn-picking.apk and /dev/null differ
diff --git a/app/release/app-controlmatricula.apk b/app/release/app-controlmatricula.apk
deleted file mode 100644
index 785f0fb8..00000000
Binary files a/app/release/app-controlmatricula.apk and /dev/null differ
diff --git a/app/release/app-inventario_activity.apk b/app/release/app-inventario_activity.apk
new file mode 100644
index 00000000..603f836b
Binary files /dev/null and b/app/release/app-inventario_activity.apk differ
diff --git a/app/release/app-release_filtro_coches.apk b/app/release/app-release_filtro_coches.apk
deleted file mode 100644
index b5881a38..00000000
Binary files a/app/release/app-release_filtro_coches.apk and /dev/null differ
diff --git a/app/release/app-release_filtro_coches_old.apk b/app/release/app-release_filtro_coches_old.apk
deleted file mode 100644
index abcc2628..00000000
Binary files a/app/release/app-release_filtro_coches_old.apk and /dev/null differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index da5e6957..625aa2fb 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -1,18 +1,20 @@
{
- "version": 2,
+ "version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "es.verdnatura",
- "variantName": "processReleaseResources",
+ "variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
- "versionCode": 64,
- "versionName": "6.1.6",
+ "attributes": [],
+ "versionCode": 73,
+ "versionName": "6.1.8.4.1",
"outputFile": "app-release.apk"
}
- ]
+ ],
+ "elementType": "File"
}
\ No newline at end of file
diff --git a/app/release/output.json b/app/release/output.json
deleted file mode 100644
index 439b2143..00000000
--- a/app/release/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"5.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/release/test-control.apk b/app/release/test-control.apk
deleted file mode 100644
index ed0f9033..00000000
Binary files a/app/release/test-control.apk and /dev/null differ
diff --git a/app/release/vn-picking-old-old.apk b/app/release/vn-picking-old-old.apk
deleted file mode 100644
index 6995a4da..00000000
Binary files a/app/release/vn-picking-old-old.apk and /dev/null differ
diff --git a/app/release/vn-picking-old.apk b/app/release/vn-picking-old.apk
deleted file mode 100644
index 65960acf..00000000
Binary files a/app/release/vn-picking-old.apk and /dev/null differ
diff --git a/app/release/vn-picking-test(delete_fragments).apk b/app/release/vn-picking-test(delete_fragments).apk
deleted file mode 100644
index 8e543fd4..00000000
Binary files a/app/release/vn-picking-test(delete_fragments).apk and /dev/null differ
diff --git a/app/release/vn-picking.apk b/app/release/vn-picking.apk
deleted file mode 100644
index b3d233d6..00000000
Binary files a/app/release/vn-picking.apk and /dev/null differ
diff --git a/app/release/vn-picking_deletefragments.apk b/app/release/vn-picking_deletefragments.apk
deleted file mode 100644
index 8e543fd4..00000000
Binary files a/app/release/vn-picking_deletefragments.apk and /dev/null differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 39866f8a..868888ae 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,8 +8,15 @@
-
+
+
+
+
+
+
+
+
> {
- return restClient!!.getSectors("json","1",usuario,password,"application/json")
+ fun getSectors(usuario: String, password: String): Call> {
+ return restClient!!.getSectors("json", "1", usuario, password, "application/json")
}
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/domain/GetBuscarItemAllUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetBuscarItemAllUserCase.kt
index 590ed25b..949c977c 100644
--- a/app/src/main/java/es/verdnatura/domain/GetBuscarItemAllUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetBuscarItemAllUserCase.kt
@@ -6,10 +6,21 @@ import retrofit2.Call
class GetBuscarItemAllUserCase(context: Context) : RestClient(context) {
- fun searchItemsUbicadorAll(usuario:String,password:String,itemFk:String) : Call> {
- val params:ArrayList = ArrayList()
+ fun searchItemsUbicadorAll(
+ usuario: String,
+ password: String,
+ itemFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
- return restClient!!.searchItemsUbicadorAll("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.searchItemsUbicadorAll(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/domain/GetBuscarItemUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetBuscarItemUserCase.kt
index 5448f6bc..5adbfce5 100644
--- a/app/src/main/java/es/verdnatura/domain/GetBuscarItemUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetBuscarItemUserCase.kt
@@ -6,10 +6,21 @@ import retrofit2.Call
class GetBuscarItemUserCase(context: Context) : RestClient(context) {
- fun searchItemsUbicador(usuario:String,password:String,itemFk:String) : Call> {
- val params:ArrayList = ArrayList();
+ fun searchItemsUbicador(
+ usuario: String,
+ password: String,
+ itemFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
- return restClient!!.searchItemsUbicador("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.searchItemsUbicador(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt
index 2e61ba27..b802e321 100644
--- a/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt
@@ -1,7 +1,6 @@
package es.verdnatura.domain
import android.content.Context
-import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO
import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO
import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO
@@ -9,36 +8,80 @@ import retrofit2.Call
class GetInventaryUserCase(context: Context) : RestClient(context) {
- fun itemShelvingRadar(usuario:String,password:String,sectorFk:String) : Call> {
- val params:ArrayList = ArrayList();
+ fun itemShelvingRadar(
+ usuario: String,
+ password: String,
+ sectorFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(sectorFk)
- return restClient!!.itemShelvingRadar("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.itemShelvingRadar(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun itemShelvingRadarFilterBuyer(usuario:String,password:String,buyerFk:String,warehouseFk: String) : Call> {
- val params:ArrayList = ArrayList();
+ fun itemShelvingRadarFilterBuyer(
+ usuario: String,
+ password: String,
+ buyerFk: String,
+ warehouseFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(buyerFk)
params.add(warehouseFk)
- return restClient!!.itemShelvingRadarFilterBuyer("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.itemShelvingRadarFilterBuyer(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun faultsReview(usuario:String,password:String,warehouseFk:String) : Call> {
- val params:ArrayList = ArrayList();
+ fun faultsReview(
+ usuario: String,
+ password: String,
+ warehouseFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(warehouseFk)
- return restClient!!.faultsReview("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.faultsReview(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun faultsReview_isChecked(usuario:String,password:String,itemFk:String,warehouseFk:String) : Call {
- val params:ArrayList = ArrayList();
+ fun faultsReview_isChecked(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ warehouseFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
params.add(warehouseFk)
- return restClient!!.faultsReview_isChecked("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.faultsReview_isChecked(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
-
- fun itemShelvingBuyerGet(usuario:String,password:String) : Call> {
- return restClient!!.itemShelvingBuyerGet("json","1",usuario,password,"application/json")
+ fun itemShelvingBuyerGet(usuario: String, password: String): Call> {
+ return restClient!!.itemShelvingBuyerGet("json", "1", usuario, password, "application/json")
}
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
index 814a2d25..76d67b7e 100644
--- a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
@@ -3,92 +3,254 @@ package es.verdnatura.domain
import android.content.Context
import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO
import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType
+import es.verdnatura.presentation.view.feature.articulo.model.ItemProposal
import es.verdnatura.presentation.view.feature.historico.model.ItemHistoricoVO
import retrofit2.Call
class GetItemCardUserCase(context: Context) : RestClient(context) {
- fun getItemCard(usuario:String,password:String,itemFk:String,warehouseFk:String) : Call {
- val params:ArrayList = ArrayList();
+ fun getItemCard(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ warehouseFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
params.add(warehouseFk)
- return restClient!!.getItemCard("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.getItemCard(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun getItemPackingType(usuario:String,password:String) : Call> {
- val params:ArrayList = ArrayList();
- return restClient!!.getItemPackingType("json","1",usuario,password,"application/json",params = params)
+ fun item_getSimilar(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ warehouseFk: String,
+ vshipped: String,
+ vIsShowedByType: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
+ params.add(itemFk)
+ params.add(warehouseFk)
+ params.add(vshipped)
+ params.add(vIsShowedByType)
+
+ return restClient!!.item_getSimilar(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun itemStockUpdate(usuario:String,password:String,itemFk:String,warehouseFk:String,newVisible:String,isTrash:String ) : Call {
- val params:ArrayList = ArrayList();
+ fun getItemPackingType(usuario: String, password: String): Call> {
+ val params: ArrayList = ArrayList()
+ return restClient!!.getItemPackingType(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
+ }
+
+ fun itemStockUpdate(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ warehouseFk: String,
+ newVisible: String,
+ isTrash: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
params.add(warehouseFk)
params.add(newVisible)
params.add(isTrash)
- return restClient!!.itemStockUpdate("json","1",usuario,password,"application/json",params = params)
+
+ //sergio: se modifica por CAU a itemTrash// Faltas también accede a itemStockUpdate ( falta comprobar porque no aparece nada más)
+ //return restClient!!.itemStockUpdate("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.itemTrash(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun itemTrash(usuario:String,password:String,itemFk:String,warehouseFk:String,newVisible:String,isTrash:String ) : Call {
- val params:ArrayList = ArrayList();
+ fun itemTrash(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ warehouseFk: String,
+ newVisible: String,
+ isTrash: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
params.add(warehouseFk)
params.add(newVisible)
params.add(isTrash)
- return restClient!!.itemTrash("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.itemTrash(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun itemPlacementSave(usuario:String,password:String,itemFk:String,warehouseFk:String,value:String ) : Call {
- val params:ArrayList = ArrayList();
+ fun itemPlacementSave(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ warehouseFk: String,
+ value: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
params.add(warehouseFk)
params.add(value)
- return restClient!!.itemPlacementSave("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.itemPlacementSave(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun updateGrouping(usuario:String,password:String,itemFk:String,value:String ,warehouseFk:String) : Call {
- val params:ArrayList = ArrayList();
+ fun updateGrouping(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ value: String,
+ warehouseFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
params.add(value)
params.add(warehouseFk)
- return restClient!!.updateGrouping("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.updateGrouping(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun updatePacking(usuario:String,password:String,itemFk:String,value:String ,warehouseFk:String) : Call {
- val params:ArrayList = ArrayList();
+ fun updatePacking(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ value: String,
+ warehouseFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
params.add(value)
params.add(warehouseFk)
- return restClient!!.updatePacking("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.updatePacking(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun updatePackingType(usuario:String,password:String,itemFk:String,ItemPackingType:String) : Call {
- val params:ArrayList = ArrayList();
+ fun updatePackingType(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ ItemPackingType: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
params.add(ItemPackingType)
- return restClient!!.updatePackingType("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.updatePackingType(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
-
- fun itemSaveMin(usuario:String,password:String,itemFk:String,value:String) : Call {
- val params:ArrayList = ArrayList();
+ fun itemSaveMin(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ value: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
params.add(value)
- return restClient!!.itemSaveMin("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.itemSaveMin(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun barcodes_edit(usuario:String,password:String,itemFk:String,value:String, delete:String) : Call {
- val params:ArrayList = ArrayList();
+ fun barcodes_edit(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ value: String,
+ delete: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(value)
params.add(itemFk)
params.add(delete)
- return restClient!!.barcodes_edit("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.barcodes_edit(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun itemDiary(usuario:String,password:String,itemFk:String,warehouseFk: String) : Call> {
- val params:ArrayList = ArrayList();
+ fun itemDiary(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ warehouseFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
params.add(warehouseFk)
- return restClient!!.itemDiary("json","1",usuario,password,"application/json",params = params)
+ return restClient!!.itemDiary(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt
index deb5acef..f138c3b3 100644
--- a/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt
@@ -1,39 +1,105 @@
package es.verdnatura.domain
import android.content.Context
+import es.verdnatura.presentation.view.feature.login.model.LoginDevice
import es.verdnatura.presentation.view.feature.login.model.LoginSalixVO
-import es.verdnatura.presentation.view.feature.login.model.SalixMessageVO
+import es.verdnatura.presentation.view.feature.login.model.SalixGrupo
import es.verdnatura.presentation.view.feature.login.model.versionApp
import retrofit2.Call
class GetLoginUserCase(context: Context) : RestClient(context) {
- fun login(usuario:String,password:String,imei:String) : Call{
- val params:ArrayList = ArrayList()
+ fun login(usuario: String, password: String, androiid: String): Call {
+ val params: ArrayList = ArrayList()
params.add(usuario)
params.add(password)
- //params.add(imei)
- return restClient!!.login("json","1",usuario,password,"application/json",params)
+ params.add(androiid)
+ return restClient!!.login("json", "1", usuario, password, "application/json", params)
}
- fun salixLogin(usuario:String,password:String) : Call{
- return salixClient!!.login("application/json", LoginSalixVO(usuario,password))
+ fun device_checkLogin(
+ usuario: String,
+ password: String,
+ android_id: String
+ ): Call {
+ val params: ArrayList = ArrayList()
+ params.add(usuario)
+ params.add(android_id)
+ return restClient!!.device_checkLogin(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun checkVersion_old(usuario:String,password:String,version:String) : Call {
- val params:ArrayList = ArrayList()
+ fun worker_getId(usuario: String, password: String): Call {
+ val params: ArrayList = ArrayList()
+ return restClient!!.worker_getId("json", "1", usuario, password, "application/json", params)
+ }
+
+ fun deviceLog_add(
+ usuario: String,
+ password: String,
+ app: String,
+ versionApp: String,
+ android_id: String
+ ): Call {
+ val params: ArrayList = ArrayList()
+ params.add(app)
+ params.add(versionApp)
+ params.add(android_id)
+ return restClient!!.deviceLog_add(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
+ }
+
+ fun salixLogin(usuario: String, password: String): Call {
+ return salixClient!!.login("application/json", LoginSalixVO(usuario, password))
+ }
+ //NODEJS TEST
+
+ fun nodeJsTest(
+ smarttag: String,
+ wagon: String,
+ shelving: String
+ ): Call {
+ return nodejsClient!!.bindShelving("application/json", "A0A3B8224DBF", "ABC", "2")
+ // return nodejsClient!!.bindShelving("application/json", NodeJsService.SmartTagNode(smarttag, wagon, shelving),"A0A3B8224DBF","ABC","2")
+
+ }
+
+ fun checkVersion_old(usuario: String, password: String, version: String): Call {
+ val params: ArrayList = ArrayList()
params.add(version)
- return restClient!!.version("json","1",usuario,password,"application/json",params)
+ return restClient!!.version("json", "1", usuario, password, "application/json", params)
}
- fun sendChekingPresence(token:String,workerId:Int,message:String) : Call{
+ //SALIX MENSAJE :SERGIO: PARA NO ENVIAR MENSAJES A COMERCIALES PONGO QUE LAS MODIFICACIONES SE ENVIAN AL CANAL CREADO.
+
+ /* fun sendChekingPresence(token:String,workerId:Int,message:String) : Call{
return salixClient!!.sendChekingPresence(content_type = "application/json", authorization = token, params = SalixMessageVO(workerId = workerId,message = message))
+ }*/
+ // SERGIO: PARA DESARROLLO Y PRUEBAS SE DESCOMENTA ESTAS LÍNEAS Y SE COMENTAN LAS DE ARRIBA
+ fun sendChekingPresence(token: String, workerId: Int, message: String): Call {
+ return salixClient!!.sendGroup(
+ content_type = "application/json",
+ authorization = token,
+ params = SalixGrupo(to = "#android-test", message = message)
+ )
}
- fun checkVersion(usuario:String,password:String,nameApp:String) : Call {
- val params:ArrayList = ArrayList()
+ fun checkVersion(usuario: String, password: String, nameApp: String): Call {
+ val params: ArrayList = ArrayList()
params.add(nameApp)
- return restClient!!.version2("json","1",usuario,password,"application/json",params)
+ return restClient!!.getVersion("json", "1", usuario, password, "application/json", params)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt
index 27ab0003..c556ea5e 100644
--- a/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt
@@ -1,74 +1,239 @@
package es.verdnatura.domain
import android.content.Context
+import com.google.gson.JsonObject
import es.verdnatura.presentation.view.feature.paletizador.model.*
import retrofit2.Call
class GetPaletizadoresUserCase(context: Context) : RestClient(context) {
- fun expeditionTruckList(usuario:String,password:String) : Call> {
- val params:ArrayList = ArrayList();
- return restClient!!.expeditionTruckList("json","1",usuario,password,"application/json")
+ //buffer
+ fun buffer_setTypeByName(
+ usuario: String,
+ password: String,
+ vBufferFk: String,
+ vType: String
+ ): Call {
+ val params: ArrayList = ArrayList()
+ params.add(vBufferFk)
+ params.add(vType)
+ return restClient!!.buffer_setTypeByName(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
}
- fun expeditionTruckAdd(usuario:String,password:String,vHour:String,vDescription:String) : Call {
- val params:ArrayList = ArrayList()
+ //expeditionScan opciones paletizadores
+ fun expedition_scan(usuario: String, password: String, vExpeditionId: String): Call {
+ val params: ArrayList = ArrayList()
+ params.add(vExpeditionId)
+ return restClient!!.expedition_scan(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
+ }
+
+ //expedition
+
+ fun expedition_getState(
+ usuario: String,
+ password: String,
+ expeditionFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
+ params.add(expeditionFk)
+ return restClient!!.expedition_getState(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
+ }
+
+ fun expedition_getStateJSON(
+ usuario: String,
+ password: String,
+ expeditionFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
+ params.add(expeditionFk)
+ return restClient!!.expedition_getStateJSON(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
+ }
+
+ fun expeditionTruckList(usuario: String, password: String): Call> {
+ // val params: ArrayList = ArrayList()
+ return restClient!!.expeditionTruckList("json", "1", usuario, password, "application/json")
+ }
+
+ fun expeditionTruckAdd(
+ usuario: String,
+ password: String,
+ vHour: String,
+ vDescription: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(vHour)
params.add(vDescription)
- // //////Log.i("VERDNATURA:"," La hora es $vHour y descrip $vDescription")
- return restClient!!.expeditionTruckAdd("json","1",usuario,password,"application/json",params)
+ // //////Log.i("VERDNATURA:"," La hora es $vHour y descrip $vDescription")
+ return restClient!!.expeditionTruckAdd(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun expeditionPallet_List(usuario:String,password:String,vTruckFk:String) : Call> {
- val params:ArrayList = ArrayList()
+ fun expeditionPallet_List(
+ usuario: String,
+ password: String,
+ vTruckFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(vTruckFk)
- return restClient!!.expeditionPallet_List("json","1",usuario,password,"application/json",params)
+ return restClient!!.expeditionPallet_List(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun expeditionScanAdd(usuario:String,password:String,vPalletFk:String,vTruckFk:String) : Call> {
- val params:ArrayList = ArrayList()
+ fun expeditionScanAdd(
+ usuario: String,
+ password: String,
+ vPalletFk: String,
+ vTruckFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(vPalletFk)
params.add(vTruckFk)
- return restClient!!.expeditionScanAdd("json","1",usuario,password,"application/json",params)
+ return restClient!!.expeditionScanAdd(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun expeditionScanPut(usuario:String,password:String,vPalletFk:String,vExpeditionFk:String) : Call {
- val params:ArrayList = ArrayList()
+ fun expeditionScanPut(
+ usuario: String,
+ password: String,
+ vPalletFk: String,
+ vExpeditionFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(vPalletFk)
params.add(vExpeditionFk)
- return restClient!!.expeditionScanPut("json","1",usuario,password,"application/json",params)
+ return restClient!!.expeditionScanPut(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun checkRouteExpeditionScanPut(usuario:String,password:String,vPalletFk:String,vExpeditionFk:String) : Call {
- val params:ArrayList = ArrayList()
+
+ fun checkRouteExpeditionScanPut(
+ usuario: String,
+ password: String,
+ vPalletFk: String,
+ vExpeditionFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(vPalletFk)
params.add(vExpeditionFk)
- return restClient!!.checkRouteExpeditionScanPut("json","1",usuario,password,"application/json",params)
+ return restClient!!.checkRouteExpeditionScanPut(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
-
-
- fun expeditionPalletView(usuario:String,password:String,vPalletFk:String) : Call> {
- val params:ArrayList = ArrayList()
+ fun expeditionPalletView(
+ usuario: String,
+ password: String,
+ vPalletFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(vPalletFk)
- return restClient!!.expeditionPalletView("json","1",usuario,password,"application/json",params)
+ return restClient!!.expeditionPalletView(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun expeditionPalletDel(usuario:String,password:String,vPalletFk:String) : Call {
- val params:ArrayList = ArrayList()
+ fun expeditionPalletDel(usuario: String, password: String, vPalletFk: String): Call {
+ val params: ArrayList = ArrayList()
params.add(vPalletFk)
- return restClient!!.expeditionPalletDel("json","1",usuario,password,"application/json",params)
+ return restClient!!.expeditionPalletDel(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun expeditionScanList(usuario:String,password:String,vPalletFk:String) : Call> {
- val params:ArrayList = ArrayList()
+ fun expeditionScanList(
+ usuario: String,
+ password: String,
+ vPalletFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(vPalletFk)
- return restClient!!.expeditionScanList("json","1",usuario,password,"application/json",params)
+ return restClient!!.expeditionScanList(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun expeditionScanDel(usuario:String,password:String,vScanFk:String) : Call {
- val params:ArrayList = ArrayList()
+ fun expeditionScanDel(usuario: String, password: String, vScanFk: String): Call {
+ val params: ArrayList = ArrayList()
params.add(vScanFk)
- return restClient!!.expeditionScanDel("json","1",usuario,password,"application/json",params)
+ return restClient!!.expeditionScanDel(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
fun expeditionPalletPrintSet(
@@ -76,11 +241,18 @@ class GetPaletizadoresUserCase(context: Context) : RestClient(context) {
password: String,
vPalletFk: String,
vSectorFk: String
- ) : Call {
- val params:ArrayList = ArrayList();
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(vPalletFk)
params.add(vSectorFk)
- return restClient!!.expeditionPalletPrintSet("json","1",usuario,password,"application/json",params)
+ return restClient!!.expeditionPalletPrintSet(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
}
diff --git a/app/src/main/java/es/verdnatura/domain/GetPreControladorUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetPreControladorUserCase.kt
index 4f78a00c..9a6f4f60 100644
--- a/app/src/main/java/es/verdnatura/domain/GetPreControladorUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetPreControladorUserCase.kt
@@ -6,15 +6,27 @@ import retrofit2.Call
class GetPreControladorUserCase(context: Context) : RestClient(context) {
-
- fun collectionTicketGet(usuario:String,password:String,collectionFk:String,sectorFk:String,print:String,type:String) : Call {
- val params:ArrayList = ArrayList();
+ fun collectionTicketGet(
+ usuario: String,
+ password: String,
+ collectionFk: String,
+ sectorFk: String,
+ print: String,
+ type: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(collectionFk)
params.add(sectorFk)
params.add(print)
params.add(type)
- return restClient!!.collection_getTickets("json","1",usuario,password,"application/json",params)
+ return restClient!!.collection_getTickets(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt b/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt
index 4880ed77..9a43f051 100644
--- a/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt
@@ -6,26 +6,59 @@ import retrofit2.Call
class GetPreSacadorUseCase(context: Context) : RestClient(context) {
- fun ticketToPrePrepare(usuario:String,password:String,ticketFk:String,sectorFk:String) : Call> {
- val params:ArrayList = ArrayList();
+ fun ticketToPrePrepare(
+ usuario: String,
+ password: String,
+ ticketFk: String,
+ sectorFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(ticketFk)
params.add(sectorFk)
- return restClient!!.ticketToPrePrepare("json","1",usuario,password,"application/json",params)
+ return restClient!!.ticketToPrePrepare(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun itemPlacementSupplyGetOrder(usuario:String,password:String,sectorFk:String) : Call> {
- val params:ArrayList = ArrayList();
+ fun itemPlacementSupplyGetOrder(
+ usuario: String,
+ password: String,
+ sectorFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(sectorFk)
- return restClient!!.itemPlacementSupplyGetOrder("json","1",usuario,password,"application/json",params)
+ return restClient!!.itemPlacementSupplyGetOrder(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun itemPlacementSupplyCloseOrder(usuario:String,password:String,id:String,quantity:String) : Call {
- val params:ArrayList = ArrayList();
+ fun itemPlacementSupplyCloseOrder(
+ usuario: String,
+ password: String,
+ id: String,
+ quantity: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(id)
params.add(quantity)
- return restClient!!.itemPlacementSupplyCloseOrder("json","1",usuario,password,"application/json",params)
+ return restClient!!.itemPlacementSupplyCloseOrder(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
-
-
}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/domain/GetQrReaderUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetQrReaderUserCase.kt
new file mode 100644
index 00000000..69f1f4b5
--- /dev/null
+++ b/app/src/main/java/es/verdnatura/domain/GetQrReaderUserCase.kt
@@ -0,0 +1,26 @@
+package es.verdnatura.domain
+
+import android.content.Context
+import retrofit2.Call
+
+class GetQrReaderUserCase(context: Context) : RestClient(context) {
+
+ fun qr_getCall(
+ usuario: String,
+ password: String,
+ call: String
+
+ ): Call {
+ val params: ArrayList = ArrayList()
+ params.add(call)
+ return restClient!!.qr_getCall(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
+ }
+
+}
diff --git a/app/src/main/java/es/verdnatura/domain/GetQualityUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetQualityUserCase.kt
index ee2264f8..135c33ab 100644
--- a/app/src/main/java/es/verdnatura/domain/GetQualityUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetQualityUserCase.kt
@@ -7,20 +7,43 @@ import retrofit2.Call
class GetQualityUserCase(context: Context) : RestClient(context) {
- fun itemShelvingBuyerGet(usuario:String,password:String) : Call> {
- return restClient!!.itemShelvingBuyerGet("json","1",usuario,password,"application/json")
+ fun itemShelvingBuyerGet(usuario: String, password: String): Call> {
+ return restClient!!.itemShelvingBuyerGet("json", "1", usuario, password, "application/json")
}
- fun itemShelvingBuyerTask(usuario:String,password:String, userFk: String) : Call> {
- val params:ArrayList = ArrayList();
+ fun itemShelvingBuyerTask(
+ usuario: String,
+ password: String,
+ userFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(userFk)
- return restClient!!.itemShelvingBuyerTask("json","1",usuario,password,"application/json",params)
+ return restClient!!.itemShelvingBuyerTask(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun itemShelvingStarsUpdate(usuario:String,password:String, vId: String,vStars: String) : Call {
- val params:ArrayList = ArrayList();
+ fun itemShelvingStarsUpdate(
+ usuario: String,
+ password: String,
+ vId: String,
+ vStars: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(vId)
params.add(vStars)
- return restClient!!.itemShelvingStarsUpdate("json","1",usuario,password,"application/json",params)
+ return restClient!!.itemShelvingStarsUpdate(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt
index e11560e5..390820dc 100644
--- a/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt
@@ -1,7 +1,6 @@
package es.verdnatura.domain
import android.content.Context
-import android.util.Log
import es.verdnatura.presentation.view.feature.collection.ItemVO
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO
@@ -10,143 +9,380 @@ import retrofit2.Call
class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
- fun collectionTicketGet(usuario:String,password:String,collectionFk:String,sectorFk:String,print:String,type:String) : Call {
- val params:ArrayList = ArrayList()
+ //sergio: se quita para ir colocando collection_getTickets
+ /* fun collectionTicketGet(usuario:String,password:String,collectionFk:String,sectorFk:String,print:String,type:String) : Call {
+ val params:ArrayList = ArrayList()
+ params.add(collectionFk)
+ params.add(sectorFk)
+ params.add(print)
+ params.add(type)
+ return restClient!!.collectionTicketGet("json","1",usuario,password,"application/json",params)
+ }*/
+ //sergio: se cambia llamada a collection_getTickets
+
+ fun collectionTicketGet(
+ usuario: String,
+ password: String,
+ collectionFk: String,
+ sectorFk: String,
+ print: String,
+ type: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(collectionFk)
params.add(sectorFk)
params.add(print)
params.add(type)
- return restClient!!.collectionTicketGet("json","1",usuario,password,"application/json",params)
+ return restClient!!.collection_getTickets(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
+ fun ticket_checkFullyControlled(
+ usuario: String,
+ password: String,
+ collectionFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
+ params.add(collectionFk)
+ return restClient!!.ticket_checkFullyControlled(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
+ }
- fun collectionNew(usuario:String,password:String,sectorFk:String,carros:String) : Call {
- val params:ArrayList = ArrayList();
+ fun collectionNew(
+ usuario: String,
+ password: String,
+ sectorFk: String,
+ carros: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(sectorFk)
params.add(carros)
- return restClient!!.collectionNew("json","1",usuario,password,"application/json",params)
+ return restClient!!.collectionNew(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
- }
-
-
- fun collectionGet(usuario:String,password:String) : Call> {
- val params:ArrayList = ArrayList();
- return restClient!!.collectionGet("json","1",usuario,password,"application/json")
}
- fun saleTrackingReplace(usuario:String,password:String,saleFk:String,vOriginalQuantity:String,vStateFk:String,vIsChecked:String,vBuyFk:String) : Call {
- val params:ArrayList = ArrayList();
+ fun collectionNew(
+ usuario: String,
+ password: String,
+ sectorFk: String,
+ carros: String,
+ tagtype: String
+ ): Call {
+ val params: ArrayList = ArrayList()
+ params.add(sectorFk)
+ params.add(carros)
+ params.add(tagtype)
+ return restClient!!.collectionNew(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
+
+ }
+
+ fun collectionGet(usuario: String, password: String): Call> {
+ // val params:ArrayList = ArrayList()
+ return restClient!!.collectionGet("json", "1", usuario, password, "application/json")
+ }
+
+ fun saleTrackingReplace(
+ usuario: String,
+ password: String,
+ saleFk: String,
+ vOriginalQuantity: String,
+ vStateFk: String,
+ vIsChecked: String,
+ vBuyFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(saleFk)
params.add(vOriginalQuantity)
params.add(vStateFk)
params.add(vIsChecked)
params.add(vBuyFk)
- return restClient!!.saleTrackingReplace("json","1",usuario,password,"application/json",params)
+ return restClient!!.saleTrackingReplace(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun itemPlacementSupplyAiming(usuario:String,password:String,shelvingFk:String,quantity:String,itemFk:String) : Call> {
- val params:ArrayList = ArrayList();
+ fun itemPlacementSupplyAiming(
+ usuario: String,
+ password: String,
+ shelvingFk: String,
+ quantity: String,
+ itemFk: String
+ ): Call> {
+ val params: ArrayList = ArrayList()
params.add(shelvingFk)
params.add(quantity)
params.add(itemFk)
- return restClient!!.itemPlacementSupplyAiming("json","1",usuario,password,"application/json",params)
+ return restClient!!.itemPlacementSupplyAiming(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun itemShelvingSaleSupplyAdd(usuario:String,password:String,itemShelvingFk:String,saleFk:String,quantity:String) : Call {
- val params:ArrayList = ArrayList();
+ fun itemShelvingSaleSupplyAdd(
+ usuario: String,
+ password: String,
+ itemShelvingFk: String,
+ saleFk: String,
+ quantity: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemShelvingFk)
params.add(saleFk)
params.add(quantity)
- return restClient!!.itemShelvingSaleSupplyAdd("json","1",usuario,password,"application/json",params)
+ return restClient!!.itemShelvingSaleSupplyAdd(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun itemShelvingPlacementSupplyAdd(usuario:String,password:String,itemShelvingFk:String,itemPlacementSupplyFk:String,quantity:String) : Call {
- val params:ArrayList = ArrayList();
+ fun itemShelvingPlacementSupplyAdd(
+ usuario: String,
+ password: String,
+ itemShelvingFk: String,
+ itemPlacementSupplyFk: String,
+ quantity: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemShelvingFk)
params.add(itemPlacementSupplyFk)
params.add(quantity)
- return restClient!!.itemShelvingPlacementSupplyAdd("json","1",usuario,password,"application/json",params)
+ return restClient!!.itemShelvingPlacementSupplyAdd(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun collectionStickerPrint(usuario:String,password:String,collectionFk: String,sectorFk: String) : Call {
- val params:ArrayList = ArrayList()
+ fun collectionStickerPrint(
+ usuario: String,
+ password: String,
+ collectionFk: String,
+ sectorFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(collectionFk)
params.add(sectorFk)
- return restClient!!.collectionStickerPrint("json","1",usuario,password,"application/json",params)
+ return restClient!!.collectionStickerPrint(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun itemGetAvailable(usuario:String,password:String,itemFk: String,warehouseFk: String) : Call {
- val params:ArrayList = ArrayList()
+ fun itemGetAvailable(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ warehouseFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
params.add(warehouseFk)
- return restClient!!.itemGetAvailable("json","1",usuario,password,"application/json",params)
+ return restClient!!.itemGetAvailable(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun collectionAddItem(usuario:String,password:String,itemFk: String,quantityFk: String,ticketFk: String,warehouseFk: String) : Call {
- val params:ArrayList = ArrayList()
+ fun collectionAddItem(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ quantityFk: String,
+ ticketFk: String,
+ warehouseFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(itemFk)
params.add(quantityFk)
params.add(ticketFk)
params.add(warehouseFk)
- return restClient!!.collectionAddItem("json","1",usuario,password,"application/json",params)
+ return restClient!!.collectionAddItem(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun saleMove(usuario:String,password:String,saleFk: String,quantity: String,originalQuantity:String) : Call {
- val params:ArrayList = ArrayList()
+ fun saleMove(
+ usuario: String,
+ password: String,
+ saleFk: String,
+ quantity: String,
+ originalQuantity: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(saleFk)
params.add(quantity)
params.add(originalQuantity)
- return restClient!!.saleMove("json","1",usuario,password,"application/json",params)
+ return restClient!!.saleMove("json", "1", usuario, password, "application/json", params)
}
- fun collectionMissingTrash(usuario:String,password:String,saleFk: String,quantity: String,type:String,warehouseFk:String,originalQuantity: String) : Call {
- val params:ArrayList = ArrayList()
+ fun collectionMissingTrash(
+ usuario: String,
+ password: String,
+ saleFk: String,
+ quantity: String,
+ type: String,
+ warehouseFk: String,
+ originalQuantity: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(saleFk)
params.add(quantity)
params.add(type)
params.add(warehouseFk)
params.add(originalQuantity)
- return restClient!!.collectionMissingTrash("json","1",usuario,password,"application/json",params)
+ return restClient!!.collectionMissingTrash(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun saleTrackingDel(usuario:String,password:String,saleFk: String) : Call {
- val params:ArrayList = ArrayList()
+ fun saleTrackingDel(usuario: String, password: String, saleFk: String): Call {
+ val params: ArrayList = ArrayList()
params.add(saleFk)
- return restClient!!.saleTrackingDel("json","1",usuario,password,"application/json",params)
+ return restClient!!.saleTrackingDel(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun collectionUpdateState(usuario:String,password:String,collectionFk: String,state : String) : Call {
- val params:ArrayList = ArrayList()
+ fun collectionUpdateState(
+ usuario: String,
+ password: String,
+ collectionFk: String,
+ state: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(collectionFk)
params.add(state)
- return restClient!!.collectionUpdateState("json","1",usuario,password,"application/json",params)
+ return restClient!!.collectionUpdateState(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun getIdFromCode(usuario:String,password:String,code: String) : Call {
- val params:ArrayList = ArrayList()
+ fun getIdFromCode(usuario: String, password: String, code: String): Call {
+ val params: ArrayList = ArrayList()
params.add(code)
- return restClient!!.getIdFromCode("json","1",usuario,password,"application/json",params)
+ return restClient!!.getIdFromCode(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun collectionIncreaseQuantity(usuario:String,password:String,saleFk: String, quantity: String) : Call {
- val params:ArrayList = ArrayList()
+ fun collectionIncreaseQuantity(
+ usuario: String,
+ password: String,
+ saleFk: String,
+ quantity: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(saleFk)
params.add(quantity)
- return restClient!!.collectionIncreaseQuantity("json","1",usuario,password,"application/json",params)
+ return restClient!!.collectionIncreaseQuantity(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun saleMistakeAdd(usuario:String,password:String,vSaleFk: String, vUserFk: String, vTypeFk: String) : Call {
- val params:ArrayList = ArrayList()
+ fun saleMistakeAdd(
+ usuario: String,
+ password: String,
+ vSaleFk: String,
+ vUserFk: String,
+ vTypeFk: String
+ ): Call {
+ val params: ArrayList = ArrayList()
params.add(vSaleFk)
params.add(vUserFk)
params.add(vTypeFk)
- return restClient!!.saleMistakeAdd("json","1",usuario,password,"application/json",params)
+ return restClient!!.saleMistakeAdd(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params
+ )
}
- fun mistakeType(usuario:String,password:String) : Call