verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Version 7.5.1 Se deja ticket_checkFullyControlled en lugar de ticketOrCollection y se permite que sea nulo el subname y packingType de tickettopreprepare

This commit is contained in:
Sergio De la torre 2022-01-13 17:10:18 +01:00
parent 0973600efa
commit 5b5171ab1d
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt
View File

@ -58,14 +58,14 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
params params
) )
} }
fun ticketOrCollection_checkFullyControlled( fun ticket_checkFullyControlled(
usuario: String, usuario: String,
password: String, password: String,
collectionFk: String collectionFk: String
): Call<String> { ): Call<String> {
val params: ArrayList<String> = ArrayList() val params: ArrayList<String> = ArrayList()
params.add(collectionFk) params.add(collectionFk)
return restClient!!.ticketOrCollection_checkFullyControlled( return restClient!!.ticket_checkFullyControlled(
"json", "json",
"1", "1",
usuario, usuario,

2
app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
View File

@ -180,7 +180,7 @@ interface VerdnaturaService {
Call<CollectionVO>*/ Call<CollectionVO>*/
@POST("almacennew/ticket_checkFullyControlled")//REVISADA @POST("almacennew/ticket_checkFullyControlled")//REVISADA
fun ticketOrCollection_checkFullyControlled( fun ticket_checkFullyControlled(
@Header("aplicacion") aplicacion: String, @Header("aplicacion") aplicacion: String,
@Header("version") version: String, @Header("version") version: String,
@Header("user") user: String, @Header("user") user: String,

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

@ -136,11 +136,11 @@ class CollectionFragment(
//sergio: comprueba si viene de la pantalla de controlador //sergio: comprueba si viene de la pantalla de controlador
viewModel.ticketOrCollection_checkFullyControlled( viewModel.ticket_checkFullyControlled(
user, user,
password, password,
collection.collectionFk, collection.collectionFk,
"ticketOrCollection_checkFullyControlled" "ticket_checkFullyControlled"
) )
workerFkFromTicket = collection.tickets.get(0).sales.get(0).workerFk workerFkFromTicket = collection.tickets.get(0).sales.get(0).workerFk
} }
@ -967,11 +967,11 @@ class CollectionFragment(
) )
if (type.equals(CONTROLADOR)) { if (type.equals(CONTROLADOR)) {
viewModel.ticketOrCollection_checkFullyControlled( viewModel.ticket_checkFullyControlled(
user, user,
password, password,
txtscan, txtscan,
"ticketOrCollection_checkFullyControlled" "ticket_checkFullyControlled"
) )
} }
// } else { // } else {

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

@ -892,13 +892,13 @@ class CollectionViewModel(context: Context) : BaseViewModel()
}) })
} }
fun ticketOrCollection_checkFullyControlled( fun ticket_checkFullyControlled(
usuario: String, usuario: String,
password: String, password: String,
collectionFk: String,callFunction:String collectionFk: String,callFunction:String
) )
{ {
getSacadorControladorUserCase.ticketOrCollection_checkFullyControlled( getSacadorControladorUserCase.ticket_checkFullyControlled(
usuario, usuario,
password, password,
collectionFk collectionFk

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

@ -5,9 +5,9 @@ import es.verdnatura.presentation.view.feature.sacador.model.PlacementVO
class PreSacadorItemVO ( class PreSacadorItemVO (
var id : String = "", var id : String = "",
var itemFk : String = "", var itemFk : String = "",
var packingType: String="", var packingType: String?="",
var longName : String = "", var longName : String = "",
var subName : String = "", var subName : String? = "",
var quantity : Int = 0, var quantity : Int = 0,
var saldo : Int = 0, var saldo : Int = 0,
var picked : Int = 45, var picked : Int = 45,

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

@ -47,7 +47,7 @@ class SaleVO(
var clientFk: String = "", var clientFk: String = "",
var originalQuantity: String = "", var originalQuantity: String = "",
var line1: String = "", var line1: String = "",
var line2: String = "", var line2: String? = "",
var line3: String = "", var line3: String = "",
var isAdded: String = "", var isAdded: String = "",
var pickedQuantity: String = "", var pickedQuantity: String = "",
@ -56,7 +56,7 @@ class SaleVO(
var Barcodes: List<String> = listOf(), var Barcodes: List<String> = listOf(),
var isNew: Boolean = false, var isNew: Boolean = false,
var salePersonFk: String = "", var salePersonFk: String = "",
var packingType: String = "", var packingType: String? = "",
var cel1: String = "", var cel1: String = "",
var cel2: String = "", var cel2: String = "",
var cel3: String = "", var cel3: String = "",