修改获取归还钥匙时的挂锁数据

ktg-iscs/src/main/java/com/ktg/iscs/mapper/IsJobTicketLockMapper.java

@@ -68,4 +68,7 @@ public interface IsJobTicketLockMapper extends BaseMapperX<IsJobTicketLock>
     List<JobTicketLockVO> getTicketLockByTicketId(@Param(value = "ticketId") Long ticketId);
 
     IsJobTicketLock getLockJobByBfc(@Param(value = "nfc") String nfc, @Param(value = "ticketId") Long ticketId);
+
+    List<IsJobTicketLock> getLockJob(@Param(value = "lockId") Long lockId);
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/IIsJobTicketLockService.java

@@ -72,4 +72,11 @@ public interface IIsJobTicketLockService extends IService<IsJobTicketLock>
      * @return
      */
     IsJobTicketLock getLockJobByBfc(String nfc, Long ticketId);
+
+    /**
+     * 查一下哪个作业票用了这个挂锁，而且还没有完成
+     * @param lockId
+     * @return
+     */
+    List<IsJobTicketLock> getLockJob(Long lockId);
 }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/HardwareApiServiceImpl.java

@@ -3,7 +3,6 @@ package com.ktg.iscs.service.impl;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ktg.common.core.redis.RedisCache;
-import com.ktg.common.query.MPJLambdaWrapperX;
 import com.ktg.common.utils.SecurityUtils;
 import com.ktg.common.utils.StringUtils;
 import com.ktg.common.utils.bean.BeanUtils;
@@ -425,12 +424,13 @@ public class HardwareApiServiceImpl implements HardwareApiService {
             /*List<IsJobTicketLock> jobTicketLockList = iIsJobTicketLockService.list(Wrappers.<IsJobTicketLock>lambdaQuery()
                     .eq(IsJobTicketLock::getLockId, lock.getLockId())
                     .ne(IsJobTicketLock::getLockStatus, LockStatusEnum.RETURN_LOCK.status));*/
-            List<IsJobTicketLock> jobTicketLockList = iIsJobTicketLockService.list(new MPJLambdaWrapperX<IsJobTicketLock>()
+            /*List<IsJobTicketLock> jobTicketLockList = iIsJobTicketLockService.list(new MPJLambdaWrapperX<IsJobTicketLock>()
                     .eq(IsJobTicketLock::getLockId, lock.getLockId())
                     .ne(IsJobTicketLock::getLockStatus, LockStatusEnum.RETURN_LOCK.status)
                     .leftJoin(IsJobTicket.class, IsJobTicket::getTicketId, IsJobTicketLock::getTicketId)
                     .ne(IsJobTicket::getTicketStatus, "5")
-                    .ne(IsJobTicket::getTicketStatus, "6"));
+                    .ne(IsJobTicket::getTicketStatus, "6"));*/
+            List<IsJobTicketLock> jobTicketLockList = iIsJobTicketLockService.getLockJob(lock.getLockId());
             if (jobTicketLockList.isEmpty()) {
                 log.error("当前挂锁未找到关联的作业票, nfc: {}, name : {}", dto.getLockNfc(), lock.getLockName());
                 return null;

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsJobTicketLockServiceImpl.java

@@ -115,4 +115,9 @@ public class IsJobTicketLockServiceImpl extends ServiceImpl<IsJobTicketLockMappe
     public IsJobTicketLock getLockJobByBfc(String nfc, Long ticketId) {
         return isJobTicketLockMapper.getLockJobByBfc(nfc, ticketId);
     }
+
+    @Override
+    public List<IsJobTicketLock> getLockJob(Long lockId) {
+        return isJobTicketLockMapper.getLockJob(lockId);
+    }
 }

ktg-iscs/src/main/resources/mapper/IsJobTicketLockMapper.xml

@@ -125,4 +125,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by tl.record_id desc
         limit 1
     </select>
+    <select id="getLockJob" resultType="com.ktg.iscs.domain.IsJobTicketLock">
+        SELECT
+        t.*
+        FROM
+        is_job_ticket_lock t left join is_job_ticket t1 on t1.ticket_id = t.ticket_id
+        <where>
+            t.lock_status != "5"
+            and t1.ticket_status != "5"
+            and t1.ticket_status != "6"
+            <if test="lockId != null">
+                AND t.lock_id = #{lockId}
+            </if>
+        </where>
+    </select>
 </mapper>