|
|
@@ -659,20 +659,21 @@ object BleBusinessManager {
|
|
|
val keyNfc = ModBusController.getKeyByMac(bleDevice.mac)?.rfid
|
|
|
workTicketGet?.data?.forEach { data ->
|
|
|
val updateList = mutableListOf<LockPointUpdateReq>()
|
|
|
- data.dataList?.filter { it.closed == 1 }?.forEach { dataListDTO ->
|
|
|
- data.taskCode?.toLong()?.let {
|
|
|
- SPUtils.returnKey(it)
|
|
|
+ data.dataList?.filter { it.closed == 1 && it.status == it.target }
|
|
|
+ ?.forEach { dataListDTO ->
|
|
|
+ data.taskCode?.toLong()?.let {
|
|
|
+ SPUtils.returnKey(it)
|
|
|
+ }
|
|
|
+ val updateVO = LockPointUpdateReq(
|
|
|
+ data.taskCode?.toLong(),
|
|
|
+ dataListDTO.infoRfidNo,
|
|
|
+ dataListDTO.equipRfidNo,
|
|
|
+ keyNfc!!,
|
|
|
+ dataListDTO.target,
|
|
|
+ dataListDTO.status
|
|
|
+ )
|
|
|
+ updateList.add(updateVO)
|
|
|
}
|
|
|
- val updateVO = LockPointUpdateReq(
|
|
|
- data.taskCode?.toLong(),
|
|
|
- dataListDTO.infoRfidNo,
|
|
|
- dataListDTO.equipRfidNo,
|
|
|
- keyNfc!!,
|
|
|
- dataListDTO.target,
|
|
|
- dataListDTO.status
|
|
|
- )
|
|
|
- updateList.add(updateVO)
|
|
|
- }
|
|
|
|
|
|
LoadingEvent.sendLoadingEvent()
|
|
|
val ticketId = data.taskCode?.toLong()
|