|
|
@@ -113,6 +113,7 @@ object BusinessManager {
|
|
|
}
|
|
|
|
|
|
// 设备待取列表(需要报给后台的列表,等实际取完再上报)
|
|
|
+ @JvmStatic
|
|
|
val mDeviceTakeList = mutableListOf<DeviceTakeUpdateBO>()
|
|
|
|
|
|
// 是否是测试人员登录的
|
|
|
@@ -1427,7 +1428,7 @@ object BusinessManager {
|
|
|
switchReadyMode(bleDevice)
|
|
|
} else {
|
|
|
// 上报隔离点状态
|
|
|
- val keyNfc = ModBusController.getKeyByMac(bleDevice.mac)?.rfid
|
|
|
+ val keyNfc = ModBusController.getKeyByMac(bleDevice.mac)?.rfid?:"key rfid lost"
|
|
|
workTicketGetBO?.data?.forEach { data ->
|
|
|
val updateList = mutableListOf<LockPointUpdateReqVO>()
|
|
|
data.dataList?.forEach { dataListDTO ->
|
|
|
@@ -1438,7 +1439,7 @@ object BusinessManager {
|
|
|
data.taskCode?.toLong(),
|
|
|
dataListDTO.infoRfidNo,
|
|
|
dataListDTO.equipRfidNo,
|
|
|
- keyNfc!!,
|
|
|
+ keyNfc,
|
|
|
dataListDTO.target,
|
|
|
dataListDTO.status
|
|
|
)
|