优化作业完成还钥匙过程

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/hardwareapi/HardwareApiServiceImpl.java

@@ -238,6 +238,7 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         // 1.4获取上锁时的数据
         JobTicketKeyDO jobTicketKey = iIsJobTicketKeyService.getOne(Wrappers.<JobTicketKeyDO>lambdaUpdate()
                 .eq(JobTicketKeyDO::getTicketId, dto.getTicketId())
+                .eq(JobTicketKeyDO::getKeyId, startKey.getId())
                 .ne(JobTicketKeyDO::getKeyStatus, "2")
                 .eq(JobTicketKeyDO::getTicketType, "0"));
         // 2.根据作业票判断到了哪一阶段了，如果未归还的上锁数据不为空并且上锁数据中这两个数据有空的，那肯定是上锁阶段还没有完成
@@ -268,6 +269,7 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         } else {
             JobTicketKeyDO jobTicketKey1 = iIsJobTicketKeyService.getOne(Wrappers.<JobTicketKeyDO>lambdaUpdate()
                     .eq(JobTicketKeyDO::getTicketId, dto.getTicketId())
+                    .eq(JobTicketKeyDO::getKeyId, startKey.getId())
                     .ne(JobTicketKeyDO::getKeyStatus, "2")
                     .eq(JobTicketKeyDO::getTicketType, "1"));
             // 3.2解锁阶段还钥匙