refactor(更新)

- 异常作业处理提示错误问题处理

app/src/main/java/com/grkj/iscs/features/main/fragment/exception_manage/ExceptionJobFragment.kt

@@ -156,7 +156,7 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                                 viewModel.handleException().observe(this) {
                                     if (it.first) {
                                         TipDialog.showInfo(
-                                            getString(R.string.confirm_create_lock_job),
+                                            getString(R.string.confirm_create_unlock_job),
                                             onConfirmClick = {
                                                 viewModel.createUnlockJob().observe(this) {
                                                     if (it) {

app/src/main/res/values-en/strings.xml

@@ -455,5 +455,6 @@
     <string name="detect_face_tip">Detected face, about to shoot</string>
     <string name="has_job_in_progress">There are ongoing assignments</string>
     <string name="loading_device">Loading hardware .....</string>
+    <string name="confirm_create_unlock_job">Confirm whether to create a unlock job</string>
 
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -455,5 +455,6 @@
     <string name="detect_face_tip">检测到人脸，即将拍摄</string>
     <string name="has_job_in_progress">存在正在进行中的作业</string>
     <string name="loading_device">正在加载硬件......</string>
+    <string name="confirm_create_unlock_job">是否创建解锁作业</string>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -458,5 +458,6 @@
     <string name="detect_face_tip">检测到人脸，即将拍摄</string>
     <string name="has_job_in_progress">存在正在进行中的作业</string>
     <string name="loading_device">正在加载硬件......</string>
+    <string name="confirm_create_unlock_job">是否创建解锁作业</string>
 
 </resources>

data/src/main/java/com/grkj/data/repository/impl/standard/JobTicketRepository.kt

@@ -35,6 +35,7 @@ import com.sik.sikcore.data.BeanUtils
 import com.sik.sikcore.date.TimeUtils
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.math.log
 
 /**
  * 作业票实现
@@ -596,17 +597,18 @@ class JobTicketRepository @Inject constructor(
             .filter { it.stepStatus == "1" }
             .map { it.workflowStepId }
             .toSet()
-
+        logger.info("当前已经完成的步骤:${doneStepIds}")
         // 5. 判断“上锁”/“解锁”哪一步已执行过
         val hasDoneLock = stepDefs.any { it.enableLock && doneStepIds.contains(it.stepId) }
         val hasDoneUnlock = stepDefs.any { it.enableUnlock && doneStepIds.contains(it.stepId) }
 
+        logger.info("是否已经完成上锁:${hasDoneLock}")
+        logger.info("是否已经完成解锁:${hasDoneUnlock}")
         // 6. 根据完成情况决定下一步
         return when {
-            !hasDoneLock && !hasDoneUnlock -> NextJobPrompt.NO_NEW_JOB // 上锁+解锁都没作业，就不做
-            !hasDoneLock -> NextJobPrompt.CREATE_LOCK_JOB    // 还没上锁，就先上锁
-            !hasDoneUnlock -> NextJobPrompt.CREATE_UNLOCK_JOB// 上锁做了，但没解锁，就去解锁
-            else -> NextJobPrompt.NO_NEW_JOB                  // 上锁+解锁都做过了，或已扫尾
+            hasDoneLock && !hasDoneUnlock -> NextJobPrompt.CREATE_UNLOCK_JOB   // 做了上锁，补解锁
+            !hasDoneLock && hasDoneUnlock -> NextJobPrompt.CREATE_LOCK_JOB     // 做了解锁，补上锁
+            else -> NextJobPrompt.NO_NEW_JOB                                  // 其它情况：不补单
         }
     }