|
|
@@ -582,7 +582,7 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
|
|
|
// 查询挂锁信息
|
|
|
LockDO lockDO = iscsLockService.getOne(Wrappers.<LockDO>lambdaQuery().eq(LockDO::getLockNfc, vo.getLockNfc()));
|
|
|
System.out.println("lockDO------------" + lockDO);
|
|
|
- Assert.notNull(lockDO, "无法识别挂锁" + vo.getLockNfc());
|
|
|
+ Assert.notNull(lockDO, "未知挂锁" + vo.getLockNfc());
|
|
|
// 查询该挂锁是不是有已解锁未归还的任务
|
|
|
List<WorkflowWorkTicketLockDO> list1 = lockService.list(Wrappers.<WorkflowWorkTicketLockDO>lambdaUpdate()
|
|
|
.eq(WorkflowWorkTicketLockDO::getLockNfc, vo.getLockNfc())
|
|
|
@@ -595,7 +595,7 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
|
|
|
backDataVO.setNodeName("无任务");
|
|
|
backDataVO.setOrderNo(null);
|
|
|
backDataVO.setInitiatorName(null);
|
|
|
- backDataVO.setHardwareName(lockDO != null ? lockDO.getLockName() : "无法识别的挂锁");
|
|
|
+ backDataVO.setHardwareName(lockDO != null ? lockDO.getLockName() : "未知挂锁");
|
|
|
backDataVO.setBackDesc("归还成功");
|
|
|
backDataVO.setBackStatus("1");
|
|
|
backDataVO.setOperationTime(LocalDateTime.now());
|