feat roadMap #refs 7296
This commit is contained in:
parent
ee7bbf69a0
commit
050e7d1dab
|
|
@ -101,7 +101,7 @@ class PalletScanFragment(
|
|||
if (customDialogList.getValue().isNotEmpty()) {
|
||||
try {
|
||||
itemScaned = itemScanValue(
|
||||
customDialogList.getValue(), "expeditionPallet", "id"
|
||||
customDialogList.getValue(), arrayOf("expeditionPallet"), "id"
|
||||
).toString().toInt()
|
||||
|
||||
} catch (ex: Exception) {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ class PalletScanViewModel(val context: Context) : BaseViewModel(context) {
|
|||
}
|
||||
|
||||
fun expeditionPalletGet(vPalletId: Int) {
|
||||
salix.expeditionPalletGet("""{"fields": ["truckFk"], "where": {"id": $vPalletId}, "include": [{"relation": "expeditionTruck", "scope": {"fields": ["eta", "description"]}}]}""")
|
||||
salix.expeditionPalletGet("""{"fields": ["truckFk"], "where": {"id": $vPalletId}, "include": [{"relation": "roadmapStop", "scope": {"fields": ["eta", "description"]}}]}""")
|
||||
.enqueue(object : SalixCallback<List<ItemExpeditionTruckSalix>>(context) {
|
||||
|
||||
override fun onSuccess(response: Response<List<ItemExpeditionTruckSalix>>) {
|
||||
|
|
|
|||
|
|
@ -54,15 +54,19 @@ class StopMapPalletListAdapter(
|
|||
} else {
|
||||
binding.printNewRoutePallet.visibility = GONE
|
||||
}
|
||||
if (item.isScanned) {
|
||||
itemRowLayout.setBackgroundColor(
|
||||
ContextCompat.getColor(
|
||||
binding.root.context!!,
|
||||
R.color.salix_success_light
|
||||
|
||||
)
|
||||
itemRowLayout.setBackgroundColor(
|
||||
ContextCompat.getColor(
|
||||
binding.root.context!!,
|
||||
if (item.hasMatchStateCode) {
|
||||
R.color.verdnatura_black_5
|
||||
} else {
|
||||
R.color.salix_success_light
|
||||
}
|
||||
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
this.item = item
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ class RoadMapListViewModel(val context: Context) : BaseViewModel(context) {
|
|||
})
|
||||
}
|
||||
|
||||
|
||||
fun roadMapUpdate(roadmapFk: Int, params: Any) {
|
||||
salix.roadMapUpdate(
|
||||
id = roadmapFk,
|
||||
|
|
@ -98,6 +97,18 @@ class RoadMapListViewModel(val context: Context) : BaseViewModel(context) {
|
|||
})
|
||||
}
|
||||
|
||||
fun getPalletMatchState(truckFk: Int, state: String) {
|
||||
salix.getPalletMatchState(
|
||||
roadMapStopFk = truckFk,
|
||||
state = state
|
||||
).enqueue(object : SalixCallback<List<StopMapTruckPallet>>(context) {
|
||||
override fun onSuccess(response: Response<List<StopMapTruckPallet>>) {
|
||||
_stopMapTruckPalletList.value =
|
||||
response.body()?.let { StopMapTruckPalletList(it) }
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fun expeditionStateAddByPallet(
|
||||
vPalletFk: Int,
|
||||
vStateCode: String,
|
||||
|
|
|
|||
|
|
@ -61,7 +61,13 @@ class StopMapPalletListFragment(
|
|||
} else {
|
||||
getString(R.string.scanForUnloadTruck)
|
||||
}
|
||||
viewModel.getStopMapTruckPalletList(stopMap.id)
|
||||
viewModel.getPalletMatchState(
|
||||
stopMap.id, state = if (actionTruck == TruckAction.LOAD) {
|
||||
"TRUNK"
|
||||
} else {
|
||||
"STORED"
|
||||
}
|
||||
)
|
||||
super.init()
|
||||
}
|
||||
|
||||
|
|
@ -74,7 +80,7 @@ class StopMapPalletListFragment(
|
|||
try {
|
||||
|
||||
indexPalletScanned = originalList.indexOfFirst {
|
||||
it.Pallet == binding.scanInput.text.toString().toInt()
|
||||
it.pallet == binding.scanInput.text.toString().toInt()
|
||||
}
|
||||
// this.originalList.getOrNull(index)?.isScanned = true
|
||||
|
||||
|
|
@ -141,9 +147,11 @@ class StopMapPalletListFragment(
|
|||
}
|
||||
loadResponseState.observe(viewLifecycleOwner) { event ->
|
||||
event.getContentIfNotHandled().notNull {
|
||||
println("pallet scanned ")
|
||||
originalList.getOrNull(indexPalletScanned)?.isScanned = true
|
||||
adapter!!.setList(originalList.sortedWith(compareBy { it.Pallet }).sortedWith(compareBy { it.isScanned }))
|
||||
adapter!!.setList(
|
||||
originalList.sortedWith(compareBy { it.pallet })
|
||||
.sortedWith(compareBy { it.isScanned })
|
||||
)
|
||||
setSubtitlePallets(originalList)
|
||||
}
|
||||
}
|
||||
|
|
@ -153,13 +161,13 @@ class StopMapPalletListFragment(
|
|||
|
||||
private fun showRoadMapList(it: StopMapTruckPalletList) {
|
||||
val lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
||||
originalList = it.list.sortedBy { it.isScanned}.sortedBy { it.Pallet }
|
||||
originalList = it.list.sortedBy { it.pallet }.sortedBy { !it.hasMatchStateCode }
|
||||
adapter = StopMapPalletListAdapter(
|
||||
originalList, object : OnPrintClickListener {
|
||||
|
||||
override fun onPrintClickListener(item: StopMapTruckPallet, entryPoint: String) {
|
||||
ma.messageWithSound(
|
||||
"Imprimiendo rutas nuevas ${item.Pallet}", isError = false, isPlayed = true
|
||||
"Imprimiendo rutas nuevas ${item.pallet}", isError = false, isPlayed = true
|
||||
)
|
||||
}
|
||||
}, action = actionTruck
|
||||
|
|
@ -176,7 +184,7 @@ class StopMapPalletListFragment(
|
|||
binding.mainToolbar.toolbarSubtitle.text = if (list.isEmpty()) {
|
||||
"0/0"
|
||||
} else {
|
||||
getString(R.string.countTxt, list.filter { it.isScanned }.size, list.size)
|
||||
getString(R.string.countTxt, (list.filter { !it.hasMatchStateCode }).size, list.size)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -84,8 +84,9 @@ data class RoadStopMapTruckList(
|
|||
|
||||
data class StopMapTruckPallet(
|
||||
//var id :Int cuando esté acabado
|
||||
var Pallet: Int,
|
||||
var isScanned: Boolean = false
|
||||
var pallet: Int,
|
||||
var isScanned: Boolean = false,
|
||||
var hasMatchStateCode : Boolean = false
|
||||
)
|
||||
|
||||
data class StopMapTruckPalletList(
|
||||
|
|
|
|||
Loading…
Reference in New Issue