refs #5890
This commit is contained in:
parent
3a83af4818
commit
973f13bc8a
|
@ -90,7 +90,7 @@ class SaleAdapterNew(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
itemArticleItemFk.setOnClickListener {
|
/* itemArticleItemFk.setOnClickListener {
|
||||||
onPasillerosItemClickListener.onPasillerosItemClickListener(
|
onPasillerosItemClickListener.onPasillerosItemClickListener(
|
||||||
PasillerosItemVO(
|
PasillerosItemVO(
|
||||||
title = binding.root.context.getString(R.string.titleItemConsult)
|
title = binding.root.context.getString(R.string.titleItemConsult)
|
||||||
|
@ -108,16 +108,36 @@ class SaleAdapterNew(
|
||||||
|
|
||||||
itemArticleQuantityPicked.setOnClickListener {
|
itemArticleQuantityPicked.setOnClickListener {
|
||||||
onQuantityClick.onQuantityClick(sale)
|
onQuantityClick.onQuantityClick(sale)
|
||||||
|
}*/
|
||||||
|
|
||||||
|
/* txtde.setOnClickListener {
|
||||||
|
onQuantityClick.onQuantityClick(sale)
|
||||||
|
}*/
|
||||||
|
|
||||||
|
packingTopicker.setOnClickListener {
|
||||||
|
onQuantityClick.onQuantityClick(sale)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
txtde.setOnClickListener {
|
itemParkingCode.setOnClickListener {
|
||||||
onQuantityClick.onQuantityClick(sale)
|
onPackingClick.onPackingClick(sale)
|
||||||
|
}
|
||||||
|
itemArticleItemFkNew.setOnClickListener {
|
||||||
|
onPasillerosItemClickListener.onPasillerosItemClickListener(
|
||||||
|
PasillerosItemVO(
|
||||||
|
title = binding.root.context.getString(R.string.titleItemConsult)
|
||||||
|
), sale.itemFk.toString()
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
itemArticleFirstAccumulate.setOnClickListener {
|
itemArticleFirstAccumulate.setOnClickListener {
|
||||||
onQuantityClick.onQuantityClick(sale)
|
onQuantityClick.onQuantityClick(sale)
|
||||||
}
|
}
|
||||||
itemFirstToPicker.setOnClickListener {
|
itemFirstToPicker.setOnClickListener {
|
||||||
|
onPackingClick.onPackingClick(sale)
|
||||||
|
|
||||||
|
}
|
||||||
|
quantityReserved.setOnClickListener{
|
||||||
onQuantityClick.onQuantityClick(sale)
|
onQuantityClick.onQuantityClick(sale)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -193,7 +213,7 @@ class SaleAdapterNew(
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sale.isParent) {
|
if (sale.isParent) {
|
||||||
itemArticleItemFk.visibility = View.INVISIBLE
|
/* itemArticleItemFk.visibility = View.INVISIBLE
|
||||||
itemPackingText.visibility = View.INVISIBLE
|
itemPackingText.visibility = View.INVISIBLE
|
||||||
itemPackingItemFk.visibility = View.INVISIBLE
|
itemPackingItemFk.visibility = View.INVISIBLE
|
||||||
itemArticleCel1.visibility = View.INVISIBLE
|
itemArticleCel1.visibility = View.INVISIBLE
|
||||||
|
@ -202,7 +222,7 @@ class SaleAdapterNew(
|
||||||
itemArticleQuantity.visibility = View.INVISIBLE
|
itemArticleQuantity.visibility = View.INVISIBLE
|
||||||
txtdeNew.visibility = View.INVISIBLE
|
txtdeNew.visibility = View.INVISIBLE
|
||||||
itemArticleQuantityPicked.visibility = View.INVISIBLE
|
itemArticleQuantityPicked.visibility = View.INVISIBLE
|
||||||
itemArticleQuantityLine3.visibility = View.VISIBLE
|
itemArticleQuantityLine3.visibility = View.VISIBLE*/
|
||||||
imageErrorMessage.visibility = View.INVISIBLE
|
imageErrorMessage.visibility = View.INVISIBLE
|
||||||
ivArrow.visibility = View.VISIBLE
|
ivArrow.visibility = View.VISIBLE
|
||||||
|
|
||||||
|
@ -266,6 +286,7 @@ class SaleAdapterNew(
|
||||||
previous.visibility = View.INVISIBLE
|
previous.visibility = View.INVISIBLE
|
||||||
} else {
|
} else {
|
||||||
previous.visibility = View.VISIBLE
|
previous.visibility = View.VISIBLE
|
||||||
|
previous.text = "${previous.text} ${sale.saleGroupFk}"
|
||||||
}
|
}
|
||||||
|
|
||||||
var result: Int
|
var result: Int
|
||||||
|
@ -279,8 +300,8 @@ class SaleAdapterNew(
|
||||||
textToConcat =
|
textToConcat =
|
||||||
"${sale.reservedQuantity / (sale.packing ?: 1)} pack de ${sale.packing ?: "1"}"
|
"${sale.reservedQuantity / (sale.packing ?: 1)} pack de ${sale.packing ?: "1"}"
|
||||||
}
|
}
|
||||||
binding.itemArticleCel2.text = textToConcat
|
// binding.itemArticleCel2.text = textToConcat
|
||||||
binding.itemFirstToPicker.text = textToConcat
|
binding.packingTopicker.text = textToConcat
|
||||||
|
|
||||||
var result2: Int
|
var result2: Int
|
||||||
var textToConcat2: String
|
var textToConcat2: String
|
||||||
|
@ -296,31 +317,36 @@ class SaleAdapterNew(
|
||||||
|
|
||||||
|
|
||||||
if (sale.totalItemShelving > 1) {
|
if (sale.totalItemShelving > 1) {
|
||||||
binding.itemArticleCel1.text = textToConcat2
|
binding.packingTopicker.text = textToConcat
|
||||||
binding.itemSecondToPicker.text = textToConcat2
|
binding.itemSecondToPicker.text = textToConcat2
|
||||||
|
|
||||||
binding.itemReservedNumber.text =
|
binding.itemReservedNumber.text =
|
||||||
"${sale.currentItemShelving}/${sale.totalItemShelving}"
|
"${sale.currentItemShelving}/${sale.totalItemShelving}"
|
||||||
|
|
||||||
binding.itemSecond.text =
|
// binding.itemSecond.text =
|
||||||
"${sale.saleQuantity - sale.accumulatedQuantity} de ${sale.saleQuantity}"
|
// "${sale.saleQuantity - sale.accumulatedQuantity} de ${sale.saleQuantity}"
|
||||||
binding.itemArticleSecondAccumulate.text =
|
binding.itemArticleSecondAccumulate.text =
|
||||||
"${sale.saleQuantity - sale.accumulatedQuantity} de ${sale.saleQuantity}"
|
"${sale.saleQuantity - sale.accumulatedQuantity} de ${sale.saleQuantity}"
|
||||||
|
binding.selectToPicker.visibility = View.VISIBLE
|
||||||
|
binding.quantityReserved.text = "${sale.reservedQuantity}/${sale.saleQuantity}"
|
||||||
} else {
|
} else {
|
||||||
binding.itemArticleCel1.text = ""
|
binding.quantityReserved.text = "${sale.reservedQuantity}"
|
||||||
|
// binding.packingTopicker.text = ""
|
||||||
binding.itemReservedNumber.text = ""
|
binding.itemReservedNumber.text = ""
|
||||||
binding.itemSecond.text = ""
|
// binding.itemSecond.text = ""
|
||||||
binding.itemArticleSecondAccumulate.text = ""
|
binding.itemArticleSecondAccumulate.text = ""
|
||||||
binding.itemSecondToPicker.text = ""
|
binding.itemSecondToPicker.text = ""
|
||||||
|
binding.selectToPicker.visibility = View.INVISIBLE
|
||||||
|
|
||||||
} //segona linea començant per d'alt
|
} //segona linea començant per d'alt
|
||||||
|
|
||||||
binding.itemArticleCel3.text =
|
binding.selectToPicker.text =
|
||||||
"${sale.currentItemShelving}/${sale.totalItemShelving}"
|
"${sale.currentItemShelving}/${sale.totalItemShelving}"
|
||||||
|
|
||||||
binding.itemArticleFirstAccumulate.text =
|
binding.itemArticleFirstAccumulate.text =
|
||||||
"${sale.reservedQuantity} de ${sale.saleQuantity}"
|
"${sale.reservedQuantity} de ${sale.saleQuantity}"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
this.sale = sale
|
this.sale = sale
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,6 @@ class CollectionFragmentPickerNew(
|
||||||
private lateinit var customDialogList: CustomDialogList
|
private lateinit var customDialogList: CustomDialogList
|
||||||
private var placementSupplyAdapter: BarcodeAdapter? = null
|
private var placementSupplyAdapter: BarcodeAdapter? = null
|
||||||
private var listPlacementSupply: ArrayList<BarcodeVO> = ArrayList()
|
private var listPlacementSupply: ArrayList<BarcodeVO> = ArrayList()
|
||||||
private var storedShelvingPosition: Int = 0
|
|
||||||
private lateinit var customDialogInput: CustomDialogInput
|
private lateinit var customDialogInput: CustomDialogInput
|
||||||
private lateinit var customDialogThreeButtons: CustomDialogThreeButtons
|
private lateinit var customDialogThreeButtons: CustomDialogThreeButtons
|
||||||
private lateinit var customDialogThreeButtonsQuantity: CustomDialogThreeButtons
|
private lateinit var customDialogThreeButtonsQuantity: CustomDialogThreeButtons
|
||||||
|
@ -261,13 +260,21 @@ class CollectionFragmentPickerNew(
|
||||||
|
|
||||||
|
|
||||||
private fun markPrevia(saleGroupScanned: String): Boolean {
|
private fun markPrevia(saleGroupScanned: String): Boolean {
|
||||||
|
println("Sacador Marcamos la previa ?")
|
||||||
|
println("Sacador saleGroup $saleGroupScanned ")
|
||||||
try {
|
try {
|
||||||
for (indice in sales.indices) {
|
for (indice in sales.indices) {
|
||||||
if (sales[indice].saleGroupFk != null && sales[indice].saleGroupFk == saleGroupScanned.toInt()) {
|
|
||||||
|
|
||||||
viewModel.saleTracking_add(
|
if (sales[indice].saleGroupFk != null && sales[indice].saleGroupFk == saleGroupScanned.toInt()) {
|
||||||
saleGroupScanned.toInt()
|
println("Sacador saleGroup ${sales[indice].itemShelvingSaleFk}")
|
||||||
|
viewModel.confirmItemShelvingReserved(
|
||||||
|
sales[indice].itemShelvingSaleFk,
|
||||||
|
sales[indice].reservedQuantity,
|
||||||
|
false
|
||||||
)
|
)
|
||||||
|
/* viewModel.saleTracking_add(
|
||||||
|
saleGroupScanned.toInt()
|
||||||
|
)*/
|
||||||
return true
|
return true
|
||||||
|
|
||||||
mpok!!.start()
|
mpok!!.start()
|
||||||
|
@ -547,7 +554,6 @@ class CollectionFragmentPickerNew(
|
||||||
getString(R.string.splitOk),
|
getString(R.string.splitOk),
|
||||||
it.isError, true
|
it.isError, true
|
||||||
)
|
)
|
||||||
//responseSaleMoveSuccesful()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -585,10 +591,10 @@ class CollectionFragmentPickerNew(
|
||||||
sales[positionConfirm].isPicked = 1
|
sales[positionConfirm].isPicked = 1
|
||||||
saleAdapter!!.notifyDataSetChanged()
|
saleAdapter!!.notifyDataSetChanged()
|
||||||
|
|
||||||
/* viewModel.collectionTicketGetSalix(
|
viewModel.collectionTicketGetSalix(
|
||||||
collection.collectionFk,
|
collection.collectionFk,
|
||||||
print = false
|
print = false
|
||||||
)*/
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
|
@ -683,10 +689,10 @@ class CollectionFragmentPickerNew(
|
||||||
var value = customDialogList.getValueTwo()
|
var value = customDialogList.getValueTwo()
|
||||||
customDialogList.setValueTwo("")
|
customDialogList.setValueTwo("")
|
||||||
if (it.response.isBlank() || it.response.isEmpty()) {
|
if (it.response.isBlank() || it.response.isEmpty()) {
|
||||||
showErrorMessage(getString(R.string.codeNotExist))
|
showErrorMessage(text = getString(R.string.codeNotExist))
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
showErrorMessage(getString(R.string.lineNotExist))
|
showErrorMessage(text = getString(R.string.lineNotExist))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -958,25 +964,6 @@ class CollectionFragmentPickerNew(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun responseSaleMoveSuccesful() {
|
|
||||||
sales[positionCollectionSplit].saleQuantity = quantityCollectionSplit
|
|
||||||
|
|
||||||
if (quantityCollectionSplit == 0)
|
|
||||||
markLine(
|
|
||||||
positionCollectionSplit,
|
|
||||||
sales[positionCollectionSplit].saleQuantity,
|
|
||||||
false
|
|
||||||
)
|
|
||||||
saleAdapter!!.notifyDataSetChanged()
|
|
||||||
|
|
||||||
/* val ticket =
|
|
||||||
"[" + sales[positionCollectionSplit].ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + sales[positionCollectionSplit].ticketFk + "/summary)"
|
|
||||||
val message =
|
|
||||||
getString(R.string.splitSent) + sales[positionCollectionSplit].itemFk + getString(R.string.fromTicket) + ticket
|
|
||||||
|
|
||||||
sendSalixMessageNew(message, sales[positionCollectionSplit].salePersonFk)*/
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun callPicker(extensionNumber: String) {
|
private fun callPicker(extensionNumber: String) {
|
||||||
|
|
||||||
|
@ -1015,14 +1002,15 @@ class CollectionFragmentPickerNew(
|
||||||
}
|
}
|
||||||
println("Sacador esta vacia las sales: ${salesList.isEmpty()}")
|
println("Sacador esta vacia las sales: ${salesList.isEmpty()}")
|
||||||
for (s in salesList) {
|
for (s in salesList) {
|
||||||
println("Sacador la saleeeee es ${s.saleFk} cantidad: ${s.saleQuantity} y ${s.pickingOrder}")
|
// println("Sacador la saleeeee es ${s.saleFk} cantidad: ${s.saleQuantity} y ${s.pickingOrder}")
|
||||||
}
|
}
|
||||||
sales = salesList.sortedWith(compareBy<Sale> { it.pickingOrder }.thenBy { it.itemFk })
|
sales = salesList.sortedWith(compareBy<Sale> { it.pickingOrder }.thenBy { it.itemFk })
|
||||||
for (s in sales) {
|
for (s in sales) {
|
||||||
println("Sacador la sale es ${s.saleFk} cantidad: ${s.saleQuantity} y ${s.pickingOrder}")
|
// println("Sacador la sale es ${s.saleFk} cantidad: ${s.saleQuantity} y ${s.pickingOrder}")
|
||||||
}
|
}
|
||||||
//quitar comentarios FALTA AGRUPAR LAS PREVIAS
|
//quitar comentarios FALTA AGRUPAR LAS PREVIAS
|
||||||
myGroupList = groupSaleGroup(salesList).sortedWith(compareBy({ it.pickingOrder }))
|
myGroupList =
|
||||||
|
groupSaleGroup(salesList).sortedWith(compareBy<Sale> { it.pickingOrder }.thenBy { it.itemFk })
|
||||||
saleAdapter =
|
saleAdapter =
|
||||||
SaleAdapterNew(
|
SaleAdapterNew(
|
||||||
myGroupList,
|
myGroupList,
|
||||||
|
@ -1031,8 +1019,14 @@ class CollectionFragmentPickerNew(
|
||||||
|
|
||||||
override fun onQuantityClick(sale: Sale) {
|
override fun onQuantityClick(sale: Sale) {
|
||||||
sales.forEachIndexed { index, saleVO ->
|
sales.forEachIndexed { index, saleVO ->
|
||||||
|
|
||||||
if (saleVO.saleFk == sale.saleFk) {
|
if (saleVO.saleFk == sale.saleFk) {
|
||||||
if (type != "PRECHECKER") {
|
if (sale.isPicked == 1) {
|
||||||
|
showErrorMessage(
|
||||||
|
title = getString(R.string.info),
|
||||||
|
text = "Tienes que desmarcar la línea para poder modificar la cantidad"
|
||||||
|
)
|
||||||
|
} else {
|
||||||
showQuantityDialog(index)
|
showQuantityDialog(index)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1244,16 +1238,27 @@ class CollectionFragmentPickerNew(
|
||||||
private fun findSale(txtscan: String, position: Int, sale: Sale) {
|
private fun findSale(txtscan: String, position: Int, sale: Sale) {
|
||||||
println("Sacador La position es $position")
|
println("Sacador La position es $position")
|
||||||
println("Sacador El escaneado es $txtscan y el code ${sale.code}")
|
println("Sacador El escaneado es $txtscan y el code ${sale.code}")
|
||||||
|
|
||||||
|
storedPosition = position
|
||||||
|
|
||||||
if (sale.code!!.uppercase() == txtscan.uppercase()) {
|
if (sale.code!!.uppercase() == txtscan.uppercase()) {
|
||||||
mpok!!.start()
|
mpok!!.start()
|
||||||
//showShelving(position)
|
//showShelving(position)
|
||||||
sale.isPicked = 1
|
|
||||||
binding.splashProgress.visibility = View.VISIBLE
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
viewModel.confirmItemShelvingReserved(
|
|
||||||
|
viewModel.itemPlacementSupplyAiming(
|
||||||
|
itemFk = sales[position].itemFk,
|
||||||
|
quantity = sales[position].reservedQuantity,
|
||||||
|
shelvingFk = sales[position].code!!
|
||||||
|
|
||||||
|
)
|
||||||
|
/* viewModel.confirmItemShelvingReserved(
|
||||||
sale.itemShelvingSaleFk,
|
sale.itemShelvingSaleFk,
|
||||||
sale.reservedQuantity!!,
|
sale.reservedQuantity!!,
|
||||||
false
|
false
|
||||||
)
|
)*/
|
||||||
|
sale.isPicked = 1
|
||||||
saleAdapter!!.notifyDataSetChanged()
|
saleAdapter!!.notifyDataSetChanged()
|
||||||
} else {
|
} else {
|
||||||
mperror!!.start()
|
mperror!!.start()
|
||||||
|
@ -1269,7 +1274,7 @@ class CollectionFragmentPickerNew(
|
||||||
positionConfirm = position
|
positionConfirm = position
|
||||||
viewModel.confirmItemShelvingReserved(
|
viewModel.confirmItemShelvingReserved(
|
||||||
sales[position].itemShelvingSaleFk,
|
sales[position].itemShelvingSaleFk,
|
||||||
sales[position].reservedQuantity,
|
quantity,
|
||||||
isItemShelvingSaleEmpty
|
isItemShelvingSaleEmpty
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -1277,9 +1282,10 @@ class CollectionFragmentPickerNew(
|
||||||
|
|
||||||
//nuevo tema agrupacion sales
|
//nuevo tema agrupacion sales
|
||||||
checkStateParent()
|
checkStateParent()
|
||||||
var mySale = sales[position].saleFk
|
// var mySale = sales[position].saleFk Ordenar setPosition
|
||||||
|
var mySale = sales[position].itemShelvingSaleFk
|
||||||
for (indice in myGroupList.indices) {
|
for (indice in myGroupList.indices) {
|
||||||
if (!myGroupList[indice].isParent && myGroupList[indice].saleFk == mySale) {
|
if (!myGroupList[indice].isParent && myGroupList[indice].itemShelvingSaleFk == mySale) {
|
||||||
d("VERDNATURA::", "la pos del index de la sale es" + indice)
|
d("VERDNATURA::", "la pos del index de la sale es" + indice)
|
||||||
storedBackPosition = indice
|
storedBackPosition = indice
|
||||||
}
|
}
|
||||||
|
@ -1363,8 +1369,18 @@ class CollectionFragmentPickerNew(
|
||||||
|
|
||||||
private fun setListPosition(position: Int, isFromBack: Boolean) {
|
private fun setListPosition(position: Int, isFromBack: Boolean) {
|
||||||
d("VERDNATURA::", "Vamos a la pos" + storedBackPosition)
|
d("VERDNATURA::", "Vamos a la pos" + storedBackPosition)
|
||||||
lm!!.scrollToPositionWithOffset(storedBackPosition, 0)
|
if (storedPosition == 0 && storedBackPosition == 0) { // se inicia lista, se busca porqué item vamos.
|
||||||
|
for (indice in myGroupList.indices) {
|
||||||
|
if (myGroupList[indice].isPicked == 0) {
|
||||||
|
//storedPosition = indice
|
||||||
|
lm!!.scrollToPositionWithOffset(storedPosition, 0)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
lm!!.scrollToPositionWithOffset(storedBackPosition, 0)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun saleTrackingReplace(position: Int, type: String) {
|
private fun saleTrackingReplace(position: Int, type: String) {
|
||||||
|
@ -1457,7 +1473,6 @@ class CollectionFragmentPickerNew(
|
||||||
|
|
||||||
//SHELVINGS
|
//SHELVINGS
|
||||||
private fun showShelving(position: Int) {
|
private fun showShelving(position: Int) {
|
||||||
// storedShelvingPosition = shelvingPosition
|
|
||||||
storedPosition = position
|
storedPosition = position
|
||||||
binding.splashProgress.visibility = View.VISIBLE
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
try {
|
try {
|
||||||
|
@ -1472,25 +1487,7 @@ class CollectionFragmentPickerNew(
|
||||||
)
|
)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private fun showShelvingOld(position: Int, shelvingPosition: Int) {
|
|
||||||
storedShelvingPosition = shelvingPosition
|
|
||||||
storedPosition = position
|
|
||||||
binding.splashProgress.visibility = View.VISIBLE
|
|
||||||
var quantityGet = 0
|
|
||||||
try {
|
|
||||||
quantityGet =
|
|
||||||
(sales[position].reservedQuantity!!)
|
|
||||||
} catch (e: Exception) {
|
|
||||||
}
|
|
||||||
|
|
||||||
viewModel.itemPlacementSupplyAiming(
|
|
||||||
itemFk = sales[position].itemFk,
|
|
||||||
quantity = quantityGet,
|
|
||||||
shelvingFk = sales[position].placements[shelvingPosition].shelving
|
|
||||||
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequiresApi(Build.VERSION_CODES.O)
|
@RequiresApi(Build.VERSION_CODES.O)
|
||||||
|
@ -1551,10 +1548,33 @@ class CollectionFragmentPickerNew(
|
||||||
originalItemScan = customDialogList.getValueTwo().toLong()
|
originalItemScan = customDialogList.getValueTwo().toLong()
|
||||||
// Log.i("VERDNATURA","Le pasamos el siguiente item $originalItemScan que es el escaneado")
|
// Log.i("VERDNATURA","Le pasamos el siguiente item $originalItemScan que es el escaneado")
|
||||||
if (checkItemScan(customDialogList.getValueTwo())) {
|
if (checkItemScan(customDialogList.getValueTwo())) {
|
||||||
|
|
||||||
onQuantityOfShelvingSelected(
|
onQuantityOfShelvingSelected(
|
||||||
itemShelvingFk,
|
itemShelvingFk,
|
||||||
customDialogList.getValue().toInt()
|
customDialogList.getValue().toInt()
|
||||||
)
|
)
|
||||||
|
println("Entramos a scanRequest")
|
||||||
|
|
||||||
|
scanRequest()
|
||||||
|
hideKeyboards()
|
||||||
|
hideKeyboard()
|
||||||
|
customDialogList.hideTextInput()
|
||||||
|
customDialogList.dismiss()
|
||||||
|
try {
|
||||||
|
customDialogList.getEditTextTwo().post(Runnable {
|
||||||
|
customDialogList.getEditTextTwo().requestFocusFromTouch()
|
||||||
|
if (activity != null) {
|
||||||
|
val lManager: InputMethodManager =
|
||||||
|
requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
|
||||||
|
lManager.hideSoftInputFromWindow(
|
||||||
|
customDialogList.getEditTextTwo().windowToken,
|
||||||
|
InputMethodManager.SHOW_FORCED
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
})
|
||||||
|
} catch (e: Exception) {
|
||||||
|
}
|
||||||
//Log.i("VERDNATURA:","Cantidad seleccionada")
|
//Log.i("VERDNATURA:","Cantidad seleccionada")
|
||||||
mpok?.start()
|
mpok?.start()
|
||||||
customDialogList.dismiss()
|
customDialogList.dismiss()
|
||||||
|
@ -1693,6 +1713,7 @@ class CollectionFragmentPickerNew(
|
||||||
customDialogList.getRecyclerView().layoutManager =
|
customDialogList.getRecyclerView().layoutManager =
|
||||||
LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
||||||
|
|
||||||
|
hideKeyboards()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun ReviewQuantityForRefreshingAndSorting(
|
private fun ReviewQuantityForRefreshingAndSorting(
|
||||||
|
@ -1750,52 +1771,7 @@ class CollectionFragmentPickerNew(
|
||||||
markLine(storedPosition, quantity, false)
|
markLine(storedPosition, quantity, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* //1 - MODIFICAR CANTIDAD DEL CARRO
|
|
||||||
try {
|
|
||||||
val shelvingVisible =
|
|
||||||
sales[storedPosition].placements[storedShelvingPosition].visible.substring(
|
|
||||||
1,
|
|
||||||
sales[storedPosition].placements[storedShelvingPosition].visible.indexOf(")")
|
|
||||||
)
|
|
||||||
|
|
||||||
if (quantity == 0) {
|
|
||||||
sales[storedPosition].placements[storedShelvingPosition].visible =
|
|
||||||
"(" + (shelvingVisible.toInt() - customDialogList.getValue()
|
|
||||||
.toInt()).toString() + ")"
|
|
||||||
} else {
|
|
||||||
sales[storedPosition].placements[storedShelvingPosition].visible =
|
|
||||||
"(" + (shelvingVisible.toInt() - quantity.toInt()).toString() + ")"
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (e: Exception) {
|
|
||||||
}
|
|
||||||
|
|
||||||
//2- MODIFICAR EL PICKED DEL SALE
|
|
||||||
try {
|
|
||||||
if (quantity == 0) {
|
|
||||||
sales[storedPosition].pickedQuantity =
|
|
||||||
(sales[storedPosition].pickedQuantity!! + customDialogList.getValue()
|
|
||||||
.toInt())
|
|
||||||
} else {
|
|
||||||
sales[storedPosition].pickedQuantity =
|
|
||||||
(sales[storedPosition].pickedQuantity!! + quantity
|
|
||||||
.toInt())
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
}
|
|
||||||
|
|
||||||
//3- MARCAR LINEA
|
|
||||||
|
|
||||||
//Tarea #4371
|
|
||||||
itemShelvingTracking_mark = itemShelvingFk
|
|
||||||
|
|
||||||
if (sales[storedPosition].pickedQuantity != sales[storedPosition].quantity) {
|
|
||||||
sales[storedPosition].isPrepared = "1"
|
|
||||||
markLine(storedPosition, OK)
|
|
||||||
} else {
|
|
||||||
markLine(storedPosition, type)
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showQuestionUbicationEmpty(position: Int) {
|
private fun showQuestionUbicationEmpty(position: Int) {
|
||||||
|
@ -2148,6 +2124,11 @@ class CollectionFragmentPickerNew(
|
||||||
if (customDialogThreeButtons.getValue().toInt() == 0) {
|
if (customDialogThreeButtons.getValue().toInt() == 0) {
|
||||||
showQuestionUbicationEmpty(position)
|
showQuestionUbicationEmpty(position)
|
||||||
} else {
|
} else {
|
||||||
|
println("Sacador reservedQuantity ${sales[position].reservedQuantity}")
|
||||||
|
println("Sacador item ${sales[position].itemFk}")
|
||||||
|
println("Sacador cantidad introducida ${customDialogThreeButtons.getValue()}")
|
||||||
|
|
||||||
|
|
||||||
if (customDialogThreeButtons.getValue()
|
if (customDialogThreeButtons.getValue()
|
||||||
.toInt() != sales[position].reservedQuantity
|
.toInt() != sales[position].reservedQuantity
|
||||||
) {
|
) {
|
||||||
|
@ -2240,8 +2221,8 @@ class CollectionFragmentPickerNew(
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showErrorMessage(text: String) {
|
private fun showErrorMessage(title: String = getString(R.string.errorMarkLine), text: String) {
|
||||||
customDialog.setTitle(getString(R.string.errorMarkLine)).setDescription(text)
|
customDialog.setTitle(title).setDescription(text)
|
||||||
.setKoButton(getString(R.string.close)) {
|
.setKoButton(getString(R.string.close)) {
|
||||||
customDialog.dismiss()
|
customDialog.dismiss()
|
||||||
}.show()
|
}.show()
|
||||||
|
@ -2360,7 +2341,7 @@ class CollectionFragmentPickerNew(
|
||||||
saleGroupFk = value[0].saleGroupFk,
|
saleGroupFk = value[0].saleGroupFk,
|
||||||
semaphore = value[0].semaphore,
|
semaphore = value[0].semaphore,
|
||||||
ticketFk = value[0].ticketFk,
|
ticketFk = value[0].ticketFk,
|
||||||
itemFk = value[0].itemFk,
|
itemFk = value[0].saleGroupFk!!,
|
||||||
isAdded = value[0].isAdded,
|
isAdded = value[0].isAdded,
|
||||||
hasMistake = value[0].hasMistake,
|
hasMistake = value[0].hasMistake,
|
||||||
origin = value[0].origin,
|
origin = value[0].origin,
|
||||||
|
|
|
@ -149,9 +149,18 @@
|
||||||
android:paddingBottom="@dimen/layout_margin_min">
|
android:paddingBottom="@dimen/layout_margin_min">
|
||||||
<!--SEMAFORO=================================================-->
|
<!--SEMAFORO=================================================-->
|
||||||
|
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/infoSale"
|
||||||
|
android:layout_width="250dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/linearLayoutItem"
|
android:id="@+id/linearLayoutItem"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="20dp"
|
android:layout_height="20dp"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
@ -161,20 +170,6 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_article_itemFkNew"
|
|
||||||
android:layout_width="80dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
|
||||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:text="@{Long.toString(sale.itemFk)}"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body1"
|
|
||||||
android:textStyle="bold"
|
|
||||||
tool:text="9999999" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/item_parking_code"
|
android:id="@+id/item_parking_code"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -184,24 +179,10 @@
|
||||||
android:layout_weight="0.5"
|
android:layout_weight="0.5"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:text="@{sale.parkingCode}"
|
android:text="@{sale.parkingCode}"
|
||||||
android:textColor="@color/verdnatura_warm_grey"
|
|
||||||
android:textSize="@dimen/body1"
|
|
||||||
android:textStyle="bold"
|
|
||||||
tool:text="B-01-1" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_code"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="1dp"
|
|
||||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
|
||||||
android:layout_weight="0.5"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:text="@{sale.code}"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
android:textColor="@color/verdnatura_white"
|
||||||
android:textSize="@dimen/body1"
|
android:textSize="@dimen/bodyPicker"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
tool:text="dIZXX" />
|
tool:text="A-01-1" />
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -215,14 +196,16 @@
|
||||||
android:textColor="@color/verdnatura_white"
|
android:textColor="@color/verdnatura_white"
|
||||||
android:textSize="@dimen/body1"
|
android:textSize="@dimen/body1"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
tool:text="25 x 1" />
|
android:visibility="invisible"
|
||||||
|
tool:text="3 x 1" />
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:id="@+id/item_ticket_color"
|
android:id="@+id/item_ticket_color"
|
||||||
android:layout_width="@dimen/semaforo_width"
|
android:layout_width="@dimen/semaforo_width"
|
||||||
android:layout_height="@dimen/ticketColor_height"
|
android:layout_height="@dimen/ticketColor_height"
|
||||||
android:layout_marginBottom="1dp"
|
android:layout_marginBottom="1dp"
|
||||||
android:background="@drawable/border" />
|
android:background="@drawable/border"
|
||||||
|
android:visibility="invisible" />
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -237,21 +220,20 @@
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:layout_marginEnd="25dp">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/item_article_long_info"
|
android:id="@+id/item_code"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:text="@{sale.longName}"
|
android:text="@{sale.code}"
|
||||||
android:textColor="@color/verdnatura_white"
|
android:textColor="@color/verdnatura_white"
|
||||||
android:textSize="@dimen/body1"
|
android:textSize="@dimen/bodyPicker"
|
||||||
tool:text="información de la linea 1" />
|
tool:text="ABC" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/item_second_to_picker"
|
android:id="@+id/item_second_to_picker"
|
||||||
|
@ -263,6 +245,7 @@
|
||||||
android:textColor="@color/verdnatura_white"
|
android:textColor="@color/verdnatura_white"
|
||||||
android:textSize="@dimen/body2"
|
android:textSize="@dimen/body2"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
tool:text="5 x 5" />
|
tool:text="5 x 5" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -277,21 +260,20 @@
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:layout_marginEnd="25dp">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/item_article_origin"
|
android:id="@+id/item_article_itemFkNew"
|
||||||
android:layout_width="200dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
android:layout_weight="2"
|
android:layout_weight="2"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:text="@{sale.origin}"
|
android:text="@{Long.toString(sale.itemFk)}"
|
||||||
android:textColor="@color/verdnatura_white"
|
android:textColor="@color/verdnatura_white"
|
||||||
android:textSize="@dimen/body1"
|
android:textSize="@dimen/bodyPicker"
|
||||||
tool:text="información de la linea Origin" />
|
tool:text="123456" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/item_article_first_accumulate"
|
android:id="@+id/item_article_first_accumulate"
|
||||||
|
@ -303,6 +285,7 @@
|
||||||
android:textColor="@color/verdnatura_brown_grey"
|
android:textColor="@color/verdnatura_brown_grey"
|
||||||
android:textSize="@dimen/body2"
|
android:textSize="@dimen/body2"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
tool:text="5 x 5" />
|
tool:text="5 x 5" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -328,7 +311,6 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="20dp"
|
android:layout_height="20dp"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_marginEnd="25dp"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/linearLayoutItemOrigin">
|
app:layout_constraintTop_toBottomOf="@+id/linearLayoutItemOrigin">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
@ -336,17 +318,17 @@
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/item_article_color"
|
android:id="@+id/item_article_long_info"
|
||||||
android:layout_width="200dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
android:layout_weight="2"
|
android:layout_weight="2"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:text="@{sale.color}"
|
android:text="@{sale.longName}"
|
||||||
android:textColor="@color/verdnatura_white"
|
android:textColor="@color/verdnatura_white"
|
||||||
android:textSize="@dimen/body1"
|
android:textSize="@dimen/bodyPicker"
|
||||||
tool:text="información de la linea Color" />
|
tool:text="RS Rosa Palo" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/item_article_second_accumulate"
|
android:id="@+id/item_article_second_accumulate"
|
||||||
|
@ -358,6 +340,7 @@
|
||||||
android:textColor="@color/verdnatura_brown_grey"
|
android:textColor="@color/verdnatura_brown_grey"
|
||||||
android:textSize="@dimen/body2"
|
android:textSize="@dimen/body2"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
tool:text="5 x 5" />
|
tool:text="5 x 5" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -370,262 +353,80 @@
|
||||||
android:textColor="@color/verdnatura_brown_grey"
|
android:textColor="@color/verdnatura_brown_grey"
|
||||||
android:textSize="@dimen/body2"
|
android:textSize="@dimen/body2"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
tool:text="5 x 5" />
|
tool:text="5 x 5" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/linearLayoutRight"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="50dp"
|
||||||
|
android:layout_marginStart="5dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/linearLayoutColor"
|
||||||
|
|
||||||
|
|
||||||
|
>
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/packingTopicker"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:text="3x1"
|
||||||
|
android:textSize="26sp"
|
||||||
|
android:gravity="end"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:textColor="@color/verdnatura_white">
|
||||||
|
|
||||||
|
</TextView>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/linearLayoutDown"
|
||||||
|
android:layout_width="150dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_marginStart="50dp"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/linearLayoutRight"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/linearLayoutColor"
|
||||||
|
tool:layout_editor_absoluteY="4dp">
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/selectToPicker"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:text="1/2"
|
||||||
|
android:textSize="22sp"
|
||||||
|
android:gravity="left"
|
||||||
|
android:textColor="@color/verdnatura_white">
|
||||||
|
|
||||||
|
</TextView>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/quantityReserved"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:text="100"
|
||||||
|
android:layout_weight="0.5"
|
||||||
|
android:textSize="22sp"
|
||||||
|
android:gravity="right"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:layout_marginEnd="5dp"
|
||||||
|
tool:text="20/30">
|
||||||
|
|
||||||
|
</TextView>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<!--CONTENIDO=================================================-->
|
<!--CONTENIDO=================================================-->
|
||||||
<!--app:layout_constraintEnd_toStartOf="@+id/item_article_quantity_picked"-->
|
<!--app:layout_constraintEnd_toStartOf="@+id/item_article_quantity_picked"-->
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_article_itemFk"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
|
||||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:text="@{Long.toString(sale.itemFk)}"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body1"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/linearLayoutItem"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
tool:text="85478" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_packing_text"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="10dp"
|
|
||||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:text="@{sale.parkingCode}"
|
|
||||||
android:textColor="@color/verdnatura_warm_grey"
|
|
||||||
android:textSize="@dimen/body1"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/item_article_itemFk"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
tool:text="B-01-1" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
|
|
||||||
android:id="@+id/item_packing_itemFk"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:text="@{sale.code}"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body1"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/item_packing_text"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
tool:text="IZXX" />
|
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/txtde"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
|
||||||
android:text="@string/de"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body1"
|
|
||||||
android:visibility="gone"
|
|
||||||
app:layout_constraintEnd_toStartOf="@+id/item_article_quantityOld"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_article_quantityOld"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginEnd="22dp"
|
|
||||||
android:paddingLeft="10dp"
|
|
||||||
android:paddingRight="10dp"
|
|
||||||
android:text="@{Integer.toString(sale.saleQuantity)}"
|
|
||||||
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body1"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:visibility="gone"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
tool:text="10" />
|
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_article_cel2"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginEnd="22dp"
|
|
||||||
android:paddingLeft="10dp"
|
|
||||||
android:text="15 x 5"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body1"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
tool:text="5x1" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_article_quantity_line1"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
|
||||||
android:layout_marginEnd="22dp"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:text="@{sale.longName}"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body1"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/linearLayoutItem"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/item_article_itemFk"
|
|
||||||
tool:text="información de la linea 1" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
|
|
||||||
android:id="@+id/item_article_cel1"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="cel1"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/item_article_quantity_line1"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line1"
|
|
||||||
tool:text="cel1" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_article_quantity_line2"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
|
||||||
android:layout_marginEnd="22dp"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:text="@{sale.origin}"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/linearLayoutItem"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/item_article_quantity_line1"
|
|
||||||
tool:text="información de la linea 2" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_article_quantity_picked"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
|
||||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
|
||||||
android:text="@{Integer.toString(sale.reservedQuantity)}"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body3"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintEnd_toStartOf="@+id/txtdeNew"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2"
|
|
||||||
tool:text="0" />
|
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/txtdeNew"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
|
||||||
android:text="@string/de"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body3"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintEnd_toStartOf="@+id/item_article_quantity"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_article_cel2_Old"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="cel2"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body3"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:visibility="gone"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/item_article_quantity_line2"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2"
|
|
||||||
tool:text="cel2" />
|
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_article_quantity"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingLeft="@dimen/layout_collection_quantity"
|
|
||||||
android:paddingTop="@dimen/layout_margin_minest"
|
|
||||||
android:paddingBottom="@dimen/default_layout_margin"
|
|
||||||
android:text="@{Integer.toString(sale.saleQuantity)}"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body3"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/item_article_quantity_line2"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2"
|
|
||||||
tool:text="100" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_article_quantity_line3"
|
|
||||||
android:layout_width="10dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
|
||||||
android:layout_marginEnd="22dp"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:text="@{sale.color}"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/linearLayoutItem"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/item_article_quantity_line2"
|
|
||||||
tool:text="información de la linea 3" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_second"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
|
||||||
android:layout_marginEnd="2dp"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:text="second"
|
|
||||||
android:textColor="@color/verdnatura_brown_grey"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/item_article_quantity_line3"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/item_article_quantity_line2"
|
|
||||||
tool:text="información de la linea 3" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/item_article_cel3"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="2/2"
|
|
||||||
android:textColor="@color/verdnatura_white"
|
|
||||||
android:textSize="@dimen/body2"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:visibility="invisible"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/item_second"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/item_second"
|
|
||||||
tool:text="cel3" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/linearLayoutColor"
|
android:id="@+id/linearLayoutColor"
|
||||||
|
@ -640,6 +441,7 @@
|
||||||
android:layout_width="@dimen/semaforo_width"
|
android:layout_width="@dimen/semaforo_width"
|
||||||
android:layout_height="@dimen/ticketColor_height"
|
android:layout_height="@dimen/ticketColor_height"
|
||||||
android:layout_marginBottom="1dp"
|
android:layout_marginBottom="1dp"
|
||||||
|
android:visibility="invisible"
|
||||||
android:background="@drawable/border" />
|
android:background="@drawable/border" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -0,0 +1,686 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tool="http://schemas.android.com/tools"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
|
<data>
|
||||||
|
|
||||||
|
<variable
|
||||||
|
name="sale"
|
||||||
|
type="es.verdnatura.presentation.view.feature.sacador.model.Sale" />
|
||||||
|
</data>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/linear_main"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="@dimen/layout_margin_1"
|
||||||
|
android:layout_marginBottom="@dimen/layout_margin_min"
|
||||||
|
android:orientation="vertical"
|
||||||
|
|
||||||
|
>
|
||||||
|
<!--CABECERA=================================================-->
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/item_row_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/rvHeadlines"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@id/content_layout"
|
||||||
|
android:layout_marginTop="6dp"
|
||||||
|
android:visibility="visible"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/verdnatura_white"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="@dimen/layout_margin_min"
|
||||||
|
android:textColor="@color/verdnatura_black">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginRight="@dimen/layout_margin_min"
|
||||||
|
android:text="@string/Nivel"
|
||||||
|
android:textColor="@color/verdnatura_black"
|
||||||
|
android:textSize="@dimen/h8" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/level"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginRight="@dimen/layout_margin_min"
|
||||||
|
android:text="@{sale.level}"
|
||||||
|
android:textColor="@color/verdnatura_black"
|
||||||
|
android:textSize="@dimen/h8"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tool:text="2" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginRight="@dimen/layout_margin_min"
|
||||||
|
android:text="@string/Ticket"
|
||||||
|
android:textColor="@color/verdnatura_black"
|
||||||
|
android:textSize="@dimen/h8" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/ticketFk"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@{Integer.toString(sale.ticketFk)}"
|
||||||
|
android:textColor="@color/verdnatura_black"
|
||||||
|
android:textSize="@dimen/h8"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tool:text="123456789"
|
||||||
|
|
||||||
|
/>
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/previous"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="PREVIA"
|
||||||
|
android:layout_marginStart="20dp"
|
||||||
|
android:textColor="@color/verdnatura_black"
|
||||||
|
android:textSize="@dimen/h8"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tool:text="PREVIA"
|
||||||
|
|
||||||
|
/>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/ivArrow"
|
||||||
|
android:layout_width="48dp"
|
||||||
|
android:layout_height="48dp"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_marginRight="20dp"
|
||||||
|
android:rotation="180"
|
||||||
|
android:src="@drawable/ic_arrow_down" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/imageErrorMessage"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
app:srcCompat="@drawable/emoticon_error_fragment" />
|
||||||
|
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/content_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/verdnatura_black"
|
||||||
|
android:paddingTop="@dimen/layout_margin_min"
|
||||||
|
android:paddingBottom="@dimen/layout_margin_min">
|
||||||
|
<!--SEMAFORO=================================================-->
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/linearLayoutItem"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="20dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_itemFkNew"
|
||||||
|
android:layout_width="80dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
|
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="@{Long.toString(sale.itemFk)}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tool:text="9999999" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_parking_code"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="1dp"
|
||||||
|
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||||
|
android:layout_weight="0.5"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="@{sale.parkingCode}"
|
||||||
|
android:textColor="@color/verdnatura_warm_grey"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tool:text="B-01-1" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_code"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="1dp"
|
||||||
|
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||||
|
android:layout_weight="0.5"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="@{sale.code}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tool:text="dIZXX" />
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_first_to_picker"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginEnd="1dp"
|
||||||
|
android:layout_weight="0.5"
|
||||||
|
android:gravity="right"
|
||||||
|
android:text="25 x 5"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tool:text="25 x 1" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/item_ticket_color"
|
||||||
|
android:layout_width="@dimen/semaforo_width"
|
||||||
|
android:layout_height="@dimen/ticketColor_height"
|
||||||
|
android:layout_marginBottom="1dp"
|
||||||
|
android:background="@drawable/border" />
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/linearLayoutLongItem"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="20dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/linearLayoutItem">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_marginEnd="25dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_long_info"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="@{sale.longName}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
tool:text="información de la linea 1" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_second_to_picker"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="0.25"
|
||||||
|
android:gravity="right"
|
||||||
|
android:text="secPicker"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body2"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tool:text="5 x 5" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/linearLayoutItemOrigin"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="20dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/linearLayoutLongItem">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_marginEnd="25dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_origin"
|
||||||
|
android:layout_width="200dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
|
android:layout_weight="2"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="@{sale.origin}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
tool:text="información de la linea Origin" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_first_accumulate"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="0.5"
|
||||||
|
android:gravity="start"
|
||||||
|
android:text="first_accum"
|
||||||
|
android:textColor="@color/verdnatura_brown_grey"
|
||||||
|
android:textSize="@dimen/body2"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tool:text="5 x 5" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_reserved_total_number"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="0.5"
|
||||||
|
android:gravity="end"
|
||||||
|
android:text="reserved_to"
|
||||||
|
android:textColor="@color/verdnatura_brown_grey"
|
||||||
|
android:textSize="@dimen/body2"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
|
tool:text="5 x 5" />
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/linearLayoutItemColor"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="20dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_marginEnd="25dp"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/linearLayoutItemOrigin">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_color"
|
||||||
|
android:layout_width="200dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
|
android:layout_weight="2"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="@{sale.color}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
tool:text="información de la linea Color" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_second_accumulate"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="0.5"
|
||||||
|
android:gravity="start"
|
||||||
|
android:text="second_a"
|
||||||
|
android:textColor="@color/verdnatura_brown_grey"
|
||||||
|
android:textSize="@dimen/body2"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tool:text="5 x 5" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_reserved_number"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="0.5"
|
||||||
|
android:gravity="end"
|
||||||
|
android:text="reser_n"
|
||||||
|
android:textColor="@color/verdnatura_brown_grey"
|
||||||
|
android:textSize="@dimen/body2"
|
||||||
|
android:textStyle="bold"
|
||||||
|
tool:text="5 x 5" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!--CONTENIDO=================================================-->
|
||||||
|
<!--app:layout_constraintEnd_toStartOf="@+id/item_article_quantity_picked"-->
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_itemFk"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
|
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="@{Long.toString(sale.itemFk)}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/linearLayoutItem"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tool:text="85478" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_packing_text"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
|
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="@{sale.parkingCode}"
|
||||||
|
android:textColor="@color/verdnatura_warm_grey"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/item_article_itemFk"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tool:text="B-01-1" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
|
||||||
|
android:id="@+id/item_packing_itemFk"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="5dp"
|
||||||
|
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="@{sale.code}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/item_packing_text"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tool:text="IZXX" />
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/txtde"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||||
|
android:text="@string/de"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/item_article_quantityOld"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_quantityOld"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginEnd="22dp"
|
||||||
|
android:paddingLeft="10dp"
|
||||||
|
android:paddingRight="10dp"
|
||||||
|
android:text="@{Integer.toString(sale.saleQuantity)}"
|
||||||
|
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tool:text="10" />
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_cel2"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginEnd="22dp"
|
||||||
|
android:paddingLeft="10dp"
|
||||||
|
android:text="15 x 5"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tool:text="5x1" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_quantity_line1"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
|
android:layout_marginEnd="22dp"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="@{sale.longName}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body1"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/linearLayoutItem"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/item_article_itemFk"
|
||||||
|
tool:text="información de la linea 1" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
|
||||||
|
android:id="@+id/item_article_cel1"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="cel1"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body2"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/item_article_quantity_line1"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line1"
|
||||||
|
tool:text="cel1" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_quantity_line2"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
|
android:layout_marginEnd="22dp"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="@{sale.origin}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body2"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/linearLayoutItem"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/item_article_quantity_line1"
|
||||||
|
tool:text="información de la linea 2" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_quantity_picked"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
|
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||||
|
android:text="@{Integer.toString(sale.reservedQuantity)}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body3"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/txtdeNew"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2"
|
||||||
|
tool:text="0" />
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/txtdeNew"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||||
|
android:text="@string/de"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body3"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/item_article_quantity"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_cel2_Old"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="cel2"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body3"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/item_article_quantity_line2"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2"
|
||||||
|
tool:text="cel2" />
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_quantity"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingLeft="@dimen/layout_collection_quantity"
|
||||||
|
android:paddingTop="@dimen/layout_margin_minest"
|
||||||
|
android:paddingBottom="@dimen/default_layout_margin"
|
||||||
|
android:text="@{Integer.toString(sale.saleQuantity)}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body3"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/item_article_quantity_line2"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2"
|
||||||
|
tool:text="100" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_quantity_line3"
|
||||||
|
android:layout_width="10dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
|
android:layout_marginEnd="22dp"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="@{sale.color}"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body2"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/linearLayoutItem"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/item_article_quantity_line2"
|
||||||
|
tool:text="información de la linea 3" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_second"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||||
|
android:layout_marginEnd="2dp"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="second"
|
||||||
|
android:textColor="@color/verdnatura_brown_grey"
|
||||||
|
android:textSize="@dimen/body2"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/item_article_quantity_line3"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/item_article_quantity_line2"
|
||||||
|
tool:text="información de la linea 3" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/item_article_cel3"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="2/2"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
android:textSize="@dimen/body2"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/item_second"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/item_second"
|
||||||
|
tool:text="cel3" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/linearLayoutColor"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/item_ticketColor"
|
||||||
|
android:layout_width="@dimen/semaforo_width"
|
||||||
|
android:layout_height="@dimen/ticketColor_height"
|
||||||
|
android:layout_marginBottom="1dp"
|
||||||
|
android:background="@drawable/border" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="50dp"
|
||||||
|
android:layout_height="50dp"
|
||||||
|
android:layout_weight="1"></LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/layout_error"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:visibility="gone">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/txt_error"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/verdnatura_red"
|
||||||
|
android:textColor="@color/verdnatura_white"
|
||||||
|
tool:text="Cantidad original 100" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:background="@color/verdnatura_white"></LinearLayout>
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/item_article_placements"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/verdnatura_background_item_picker"
|
||||||
|
android:clipToPadding="false"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||||
|
tools:listitem="@layout/item_placement_row"
|
||||||
|
tools:orientation="horizontal" />
|
||||||
|
</LinearLayout>
|
||||||
|
</layout>
|
Loading…
Reference in New Issue