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

refs #4414 marcar_lineas_QR_previa

This commit is contained in:
Sergio De la torre 2023-03-23 08:51:38 +01:00
parent b62f27a1f5
commit 19bfd3b24b
1 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,12 +268,28 @@ class CollectionFragment(
} }
private fun markPrevia(saleGroupScanned: String) { private fun markPrevia(saleGroupScanned: String):Boolean {
sales.forEachIndexed { pos, s ->
if (!s.saleGroupFk.isNullOrEmpty() && s.saleGroupFk == saleGroupScanned) { for (indice in sales.indices) {
markLine(pos, type) if (!sales[indice].saleGroupFk.isNullOrEmpty() && sales[indice].saleGroupFk == saleGroupScanned) {
when (type) {
CONTROLADOR -> markLine(indice, type)
SACADOR -> {
viewModel.saleTracking_add(
saleGroupScanned.toInt()
)
return true
}
}
if (mpok != null) {
mpok!!.start()
}
} }
} }
return false
} }
private fun showPrevia() { private fun showPrevia() {
@ -363,14 +379,22 @@ class CollectionFragment(
event != null && event.action == ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER event != null && event.action == ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER
if (itemScanIsQr(binding.scanInput.text.toString())) { if (itemScanIsQr(binding.scanInput.text.toString())) {
var myQr = itemScanned(JSONObject(binding.scanInput.text.toString())) var myQr = itemScanned(JSONObject(binding.scanInput.text.toString()))
when (myQr.table) { when (myQr.table) {
"saleGroup" -> { "saleGroup" -> {
if (type == CONTROLADOR) {
markPrevia(myQr.id.toString()) markPrevia(myQr.id.toString())
} else {
binding.scanInput.setText(myQr.id.toString())
findSale(binding.scanInput.text.toString())
}
} }
"buy" -> binding.scanInput.setText(myQr.more) "buy" -> binding.scanInput.setText(myQr.more)
} }
} else { } else {
findSale(binding.scanInput.text.toString()) findSale(binding.scanInput.text.toString())
} }
@ -1236,8 +1260,9 @@ class CollectionFragment(
} }
//SEARCH AND MARK //SEARCH AND MARK
private fun findSale(txtscan: String) { private fun findSale(txtscan: String) {
goBack = false
var index = 0 var index = 0
var isBreak = false var isBreak = false
var isOk = false var isOk = false
@ -1245,21 +1270,9 @@ class CollectionFragment(
goBack2 = false goBack2 = false
if (type == SACADOR) { if (type == SACADOR) {
isOk=markPrevia(txtscan)
for (saleVO in sales) { for (saleVO in sales) {
//sergio: pinta si encuentra ticket o el saleGroupFk if (isOk) break
if (saleVO.saleGroupFk == txtscan) {
// if (saleVO.ticketFk == txtscan ) {
isOk = true
viewModel.saleTracking_add(
txtscan.toInt()
)
if ((isOk) && mpok != null) {
mpok!!.start()
}
break
}
if (saleVO.isPrepared != "1" && saleVO.isPreviousPrepared != "1") { if (saleVO.isPrepared != "1" && saleVO.isPreviousPrepared != "1") {
//1- Por itemFk //1- Por itemFk