Browse Source

refactor(更新) :
- 还钥匙时如果钥匙rfid丢失则记录为默认文本

周文健 5 months ago
parent
commit
ed7e87352e
1 changed files with 3 additions and 2 deletions
  1. 3 2
      app/src/main/java/com/grkj/iscs/BusinessManager.kt

+ 3 - 2
app/src/main/java/com/grkj/iscs/BusinessManager.kt

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