|
|
@@ -113,11 +113,7 @@ class PresentationActivity :
|
|
|
ToastUtils.tip("移动柜的锁数量不够2个")
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
val lockIdxList = lockList.map { it.idx } as MutableList
|
|
|
- ModBusController.controlLockBuckle(true, dockList[0].addr.toInt() - 1, lockIdxList) { res ->
|
|
|
- LogUtil.i("confirm开锁卡扣 : ${res.toHexStrings()}")
|
|
|
- }
|
|
|
|
|
|
// 蓝牙钥匙
|
|
|
val keyList = ModBusController.getKeyByDockType(DeviceConst.DOCK_TYPE_PORTABLE)
|
|
|
@@ -130,8 +126,19 @@ class PresentationActivity :
|
|
|
ToastUtils.tip("没有找到钥匙的RFID")
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ // 创建工单
|
|
|
+ if (mBinding?.siPersonLock?.mSelectIdx == null) {
|
|
|
+ ToastUtils.tip("请选择上锁人")
|
|
|
+ return
|
|
|
+ }
|
|
|
BusinessManager.ticketJson = createWorkTicket(lockList)
|
|
|
println("haha : ${BusinessManager.ticketJson}")
|
|
|
+
|
|
|
+ // 操作设备
|
|
|
+ ModBusController.controlLockBuckle(true, dockList[0].addr.toInt() - 1, lockIdxList) { res ->
|
|
|
+ LogUtil.i("confirm开锁卡扣 : ${res.toHexStrings()}")
|
|
|
+ }
|
|
|
BusinessManager.sendTicketBusiness(rfid, this) { b, s ->
|
|
|
handleLoading(b, s)
|
|
|
}
|