更新挂锁使用进度

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkHandleServiceImpl.java

@@ -214,6 +214,11 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
                                 .set(WorkflowWorkPointDO::getLockNfc, vo.getLockNfc())
                                 .set(WorkflowWorkPointDO::getLockTime, now)
                                 .set(WorkflowWorkPointDO::getStatus, "1"));
+
+                        lockService.update(Wrappers.<WorkflowWorkTicketLockDO>lambdaUpdate()
+                                .eq(WorkflowWorkTicketLockDO::getNodeId, vo.getNodeId())
+                                .eq(WorkflowWorkTicketLockDO::getLockNfc, vo.getLockNfc())
+                                .set(WorkflowWorkTicketLockDO::getLockStatus, "2"));
                     }
                     // 检测上锁完成，更改上锁人状态
                     List<WorkflowWorkPointDO> unclockPoints = pointService.list(Wrappers.<WorkflowWorkPointDO>lambdaQuery()
@@ -437,6 +442,10 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
                                 .eq(WorkflowWorkPointDO::getPointNfc, vo.getPointNfc())
                                 .set(WorkflowWorkPointDO::getUnlockTime, now)
                                 .set(WorkflowWorkPointDO::getStatus, "2"));
+                        lockService.update(Wrappers.<WorkflowWorkTicketLockDO>lambdaUpdate()
+                                .eq(WorkflowWorkTicketLockDO::getNodeId, fatherNodeId)
+                                .eq(WorkflowWorkTicketLockDO::getLockNfc, vo.getLockNfc())
+                                .set(WorkflowWorkTicketLockDO::getLockStatus, "4"));
                     }
 
                     // 检测解除共锁(未解除不可解锁，前面pointUnlockCheck判断了现在不用判断了)和点位解锁是否完成
@@ -547,9 +556,9 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
                     // 查询挂锁信息
                     LockDO lockDO = iscsLockService.getOne(Wrappers.<LockDO>lambdaQuery().eq(LockDO::getLockNfc, vo.getLockNfc()));
                     // 查询该挂锁是不是有已解锁未归还的任务
-                    List<WorkflowWorkTicketLockDO> list1 = lockService.list((Wrappers.<WorkflowWorkTicketLockDO>lambdaUpdate()
+                    List<WorkflowWorkTicketLockDO> list1 = lockService.list(Wrappers.<WorkflowWorkTicketLockDO>lambdaUpdate()
                             .eq(WorkflowWorkTicketLockDO::getLockNfc, vo.getLockNfc())
-                            .eq(WorkflowWorkTicketLockDO::getLockStatus, "4")));
+                            .eq(WorkflowWorkTicketLockDO::getLockStatus, "4"));
                     if (lockDO == null || list1.isEmpty()) {
                         // 如果没有任务，则直接返回
                         BackDataVO backDataVO = new BackDataVO();