diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5ba12d88..b09f1615 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -127,111 +127,25 @@ - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - { + "keyToString": { + "ApkExportedModule": "Gestor_Almacén.app", + "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app", + "KotlinFunctionFindUsagesOptions.isSearchForTextOccurrences": "true", + "PROJECT_TRUSTED_KEY": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.cidr.known.project.marker": "true", + "SHARE_PROJECT_CONFIGURATION_FILES": "true", + "ScreenRecorder.SavePath": "C:\\Users\\sergiodt", + "android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED": "RecyclerView", + "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED": "TextView", + "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-33/android/view/View.java_SELECTED": "View", + "cidr.known.project.marker": "true", + "com.android.tools.idea.devicemanager.tab": "Physical", + "com.google.services.firebase.aqiPopupShown": "true", + "git-widget-placeholder": "dev", + "last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable", + "project.structure.last.edited": "Suggestions", + "project.structure.proportion": "0.17", + "project.structure.side.proportion": "0.2", + "run.code.analysis.last.selected.profile": "pProject Default", + "settings.editor.selected.configurable": "preferences.sourceCode.Kotlin" }, - "keyToStringList": { - "ExportApk.BuildVariants": [ - "betaRelease" + "keyToStringList": { + "ExportApk.BuildVariants": [ + "betaRelease" ] } -}]]> +} @@ -1034,8 +948,6 @@ diff --git a/app/build.gradle b/app/build.gradle index cf633076..8bca4e31 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { applicationId "es.verdnatura" minSdkVersion 24 //21 targetSdkVersion 33 - versionCode 238 + versionCode 239 versionName = "23.48Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt index 0e058b54..bd23f7ba 100644 --- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt +++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt @@ -3,6 +3,10 @@ package es.verdnatura.domain import es.verdnatura.presentation.view.feature.ajustes.model.Printers import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO import es.verdnatura.presentation.view.feature.delivery.model.* +import es.verdnatura.presentation.view.feature.diadeventa.model.ItemShelvingSaleDate +import es.verdnatura.presentation.view.feature.historicoarticulo.model.ItemHistoricoVO +import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLog +import es.verdnatura.presentation.view.feature.historicovehiculo.model.ItemHistoricoVehiculo import es.verdnatura.presentation.view.feature.login.model.versionApp import es.verdnatura.presentation.view.feature.packaging.model.ItemSupplier import es.verdnatura.presentation.view.feature.paletizador.model.* @@ -345,11 +349,11 @@ interface VerdnaturaService { //PASILLEROS ========================================================================> //CONSULTAR ARTICULO ========================================================================> -/* @POST("almacennew/itemDiary")//REVISADA + @POST("almacennew/itemDiary")//REVISADA fun itemDiary( @Body vararg params: Any ): - Call>*/ + Call> @POST("almacennew/item_card")//REVISADA fun getItemCard( @@ -466,11 +470,11 @@ interface VerdnaturaService { ): Call*/ -/* @POST("almacennew/machineWorker_getHistorical")//REVISADA + @POST("almacennew/machineWorker_getHistorical")//REVISADA fun machineWorker_getHistorical( @Body vararg params: Any ): - Call>*/ + Call> //UBICADOR ========================================================================> /* @POST("almacennew/itemShelvingList")//REVISADA @@ -622,17 +626,17 @@ interface VerdnaturaService { ): Call*/ - /* @POST("almacennew/itemShelving_getSaleDate")//REVISADA + @POST("almacennew/itemShelving_getSaleDate")//REVISADA fun itemShelving_getSaleDate( @Body vararg params: Any ): - Call>*/ + Call> - /* @POST("almacennew/itemShelvingLog_get")//REVISADA + @POST("almacennew/itemShelvingLog_get")//REVISADA fun itemShelvingLog_get( @Body vararg params: Any ): - Call>*/ + Call> /* @POST("almacennew/itemShelving_updateSpam")//REVISADA fun itemShelving_updateSpam( @@ -762,17 +766,17 @@ interface VerdnaturaService { ): Call>*/ - @POST("delivery/expedition_getLog")//NO SALIX + /* @POST("delivery/expedition_getLog")//NO SALIX fun expedition_getLog( @Body vararg params: Any ): - Call> + Call>*/ - @POST("delivery/get_routesFromExpedition")//NO SALIX + /* @POST("delivery/get_routesFromExpedition")//NO SALIX fun get_routesFromExpedition( @Body vararg params: Any ): - Call> + Call>*/ @POST("delivery/expeditionState_add")// PENDIENTE REDMINE fun expeditionState_add( @@ -791,6 +795,8 @@ interface VerdnaturaService { @Body vararg params: Any ): Call>*/ + + @POST("/delivery/route_getExpeditionSummary") fun route_getExpeditionSummary( @Body vararg params: Any diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.kt index 5229fe94..e96c098e 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.kt @@ -6,12 +6,10 @@ import androidx.room.TypeConverters import es.verdnatura.db.MapTypeConverter import java.io.Serializable - class ClientTicketList( var list: MutableList = mutableListOf() ) - @Entity(tableName = "clientTickets") data class ClientTicket( @PrimaryKey var Id: Long, @@ -25,8 +23,8 @@ data class ClientTicket( var Warehouse: String?, var SalePersonPhone: String?, var Note: String?, - @TypeConverters(MapTypeConverter::class) var Phones: List?, - @TypeConverters(MapTypeConverter::class) var Location: MyLocation?, + @TypeConverters(MapTypeConverter::class) var Phones: List?, + @TypeConverters(MapTypeConverter::class) var Location: MyLocation?, var Signed: Int, var Latitude: Double?, var Longitude: Double?, @@ -35,8 +33,35 @@ data class ClientTicket( @TypeConverters(MapTypeConverter::class) var tickets: MutableList, //Tarea 5996, falta mostrar o no si no es null var cmrFk: Int? = null, - var route:Long? = null, - var email:String? = null + var route: Long? = null, + var email: String? = null +) : Serializable + +//Tarea 6275 +data class ClientTicketSalix( + @PrimaryKey var id: Long, + var clientFk: Int, + var nickname: String, + var addressFk: Int, + var packages: Int, + var street: String, + var postalCode: String, + var city: String, + var warehouseName: String?, + var salePersonPhone: String?, + var ticketObservation: String?, + var clientPhone: Int?, + var clientMobile: Int?, + var addressPhone: Int?, + var addressMobile: Int?, + var signed: Int, + var latitude: Double?, + var longitude: Double?, + var ipt: String?, + @TypeConverters(MapTypeConverter::class) var tickets: MutableList, + var cmrFk: Int? = null, + var route: Long? = null, + var email: String? = null ) : Serializable data class MyLocation( diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt index 1ea75d0f..968970c2 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt @@ -29,7 +29,9 @@ class DayOfSaleViewModel(val context: Context) : BaseViewModel(context) { val loadItemShelvingSaleDateList = Transformations.map(_itemShelvingSaleDateList) { Event(it) } fun itemShelvingGetSaleDate(vShelvingFK: String) { - salix.itemShelvingGetSaleDate(params = listOf(vShelvingFK).formatWithQuotes()) + //salix falla fecha + silex.itemShelving_getSaleDate(vShelvingFK) + // salix.itemShelvingGetSaleDate(params = listOf(vShelvingFK).formatWithQuotes()) .enqueue(object : SalixCallback>(context) { override fun onError(t: Throwable) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt index 4ba58c1f..7570bbe0 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt @@ -22,7 +22,10 @@ class HistoricoArticuloViewModel(val context: Context) : BaseViewModel(context) val loadHistoricoList = Transformations.map(_historicoList) { Event(it) } fun itemGetBalance(itemFk: Int, vWarehouseFk: Int) { - salix.itemGetBalance(arrayListOf(itemFk, vWarehouseFk, null)).enqueue(object : + //salix falla fecha + silex.itemDiary(itemFk, vWarehouseFk) + // salix.itemGetBalance(arrayListOf(itemFk, vWarehouseFk, null)) + .enqueue(object : SalixCallback>(context) { override fun onSuccess(response: Response>) { _historicoList.value = response.body()?.let { ItemHistoricoListVO(it) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt index 48e350f2..97d88fda 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt @@ -5,7 +5,6 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations import es.verdnatura.domain.SilexCallback -import es.verdnatura.domain.formatWithQuotes import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction @@ -23,7 +22,9 @@ class ItemShelvingLogViewModel(val context: Context) : BaseViewModel(context) { val loadItemShelvingLogList = Transformations.map(_itemShelvingLogList) { Event(it) } fun itemShelvingLogGet(vShelvingFK: String) { - salix.itemShelvingLogGet(params = listOf(vShelvingFK).formatWithQuotes()) + //salix falla fecha + silex.itemShelvingLog_get(vShelvingFK) + // salix.itemShelvingLogGet(params = listOf(vShelvingFK).formatWithQuotes()) .enqueue(object : SilexCallback>(context) { override fun onSuccess(response: Response>) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt index e65c9b7a..775b8ff6 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt @@ -4,7 +4,6 @@ import android.content.Context import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations import es.verdnatura.domain.SalixCallback -import es.verdnatura.domain.formatWithQuotes import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction @@ -19,8 +18,9 @@ class HistoricoVehiculoViewModel(var context: Context) : BaseViewModel(context) val loadHistoricoVehiculoList = Transformations.map(_historicovehiculoList) { Event(it) } fun machineWorkeGetHistorical(plateNumber: String, workerId:Int) { - - salix.machineWorkerGetHistorical(arrayListOf(plateNumber,workerId).formatWithQuotes()) + //salix falla fecha + silex.machineWorker_getHistorical(plateNumber,workerId) + //salix.machineWorkerGetHistorical(arrayListOf(plateNumber,workerId).formatWithQuotes()) .enqueue(object : SalixCallback>(context) { override fun onSuccess(response: Response>) {