|
|
@@ -352,14 +352,8 @@ object BleBusinessManager {
|
|
|
}
|
|
|
RepositoryManager.jobTicketRepo.getStepDetail(itBO.ticketId) {
|
|
|
logger.info("步骤数据:${it}")
|
|
|
- val workflowSteps =
|
|
|
- RepositoryManager.workflowRepository.getStepsByMode(
|
|
|
- jobTicketData.modeId
|
|
|
- )
|
|
|
- var step = it?.firstOrNull { it.stepStatus == "0" }?.stepIndex
|
|
|
- val currentStep =
|
|
|
- workflowSteps.find { it.stepIndex == step?.toInt() }
|
|
|
- logger.info("当前步骤:${currentStep}")
|
|
|
+ val step = it?.firstOrNull { it.stepStatus == "0" }
|
|
|
+ logger.info("当前步骤:${step}")
|
|
|
RepositoryManager.jobTicketRepo.getTicketDetail(itBO.ticketId) { ticketDetail ->
|
|
|
logger.info("步骤详情:${ticketDetail}")
|
|
|
val role =
|
|
|
@@ -374,7 +368,7 @@ object BleBusinessManager {
|
|
|
}
|
|
|
return@getTicketDetail
|
|
|
}
|
|
|
- if (currentStep?.enableLock == true) { // 上锁工作票
|
|
|
+ if (step?.enableLock == true) { // 上锁工作票
|
|
|
sendTicketBusiness(
|
|
|
true,
|
|
|
currentModeEvent.bleBean.bleDevice.mac,
|
|
|
@@ -386,7 +380,7 @@ object BleBusinessManager {
|
|
|
?.map { it.lockNfc }?.toMutableList(),
|
|
|
true
|
|
|
)
|
|
|
- } else if (currentStep?.enableUnlock == true) { // 解锁工作票
|
|
|
+ } else if (step?.enableUnlock == true) { // 解锁工作票
|
|
|
sendTicketBusiness(
|
|
|
false,
|
|
|
currentModeEvent.bleBean.bleDevice.mac,
|
|
|
@@ -806,11 +800,7 @@ object BleBusinessManager {
|
|
|
if (jobTicketData == null) {
|
|
|
return@getStepDetail
|
|
|
}
|
|
|
- val workflowSteps =
|
|
|
- RepositoryManager.workflowRepository.getStepsByMode(jobTicketData.modeId)
|
|
|
- var step = it?.firstOrNull { it.stepStatus == "0" }?.stepIndex
|
|
|
- val currentStep =
|
|
|
- workflowSteps.find { it.stepIndex == step?.toInt() }
|
|
|
+ val step = it?.firstOrNull { it.stepStatus == "0" }
|
|
|
RepositoryManager.jobTicketRepo.getTicketDetail(ticketId) { ticketDetail ->
|
|
|
if (ticketDetail == null) {
|
|
|
return@getTicketDetail
|
|
|
@@ -824,7 +814,7 @@ object BleBusinessManager {
|
|
|
PopTip.build().tip(R.string.you_are_not_locker_tip)
|
|
|
return@getTicketDetail
|
|
|
}
|
|
|
- if (currentStep?.enableLock == true) { // 上锁工作票
|
|
|
+ if (step?.enableLock == true) { // 上锁工作票
|
|
|
sendTicketBusiness(
|
|
|
true,
|
|
|
mac,
|
|
|
@@ -833,7 +823,7 @@ object BleBusinessManager {
|
|
|
?.map { it.lockNfc }?.toMutableList(),
|
|
|
true
|
|
|
)
|
|
|
- } else if (currentStep?.enableUnlock == true) { // 解锁工作票
|
|
|
+ } else if (step?.enableUnlock == true) { // 解锁工作票
|
|
|
sendTicketBusiness(
|
|
|
false, mac, ticketDetail, null, true
|
|
|
)
|