优化模拟接口

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

@@ -120,7 +120,8 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         JobTicketKeyDO jobTicketKey = iIsJobTicketKeyService.getOne(Wrappers.<JobTicketKeyDO>lambdaUpdate()
                 .eq(JobTicketKeyDO::getTicketId, dto.getTicketId())
                 .ne(JobTicketKeyDO::getKeyStatus, "2")
-                .eq(JobTicketKeyDO::getTicketType, "0"));
+                .eq(JobTicketKeyDO::getTicketType, "0")
+                .last("limit 1"));
         // 2.根据作业票判断到了哪一阶段了，如果未归还的上锁数据不为空并且上锁数据中这两个数据有空的，那肯定是上锁阶段还没有完成
         if (jobTicketKey!=null && (jobTicketKey.getCollectTime() == null || jobTicketKey.getGiveBackTime() == null)) {
             // 3.上锁阶段取钥匙
@@ -141,7 +142,8 @@ public class HardwareApiServiceImpl implements HardwareApiService {
             JobTicketKeyDO jobTicketKey1 = iIsJobTicketKeyService.getOne(Wrappers.<JobTicketKeyDO>lambdaUpdate()
                     .eq(JobTicketKeyDO::getTicketId, dto.getTicketId())
                     .ne(JobTicketKeyDO::getKeyStatus, "2")
-                    .eq(JobTicketKeyDO::getTicketType, "1"));
+                    .eq(JobTicketKeyDO::getTicketType, "1")
+                    .last("limit 1"));
             // 3.1解锁阶段取钥匙
             iIsJobTicketKeyService.update(Wrappers.<JobTicketKeyDO>lambdaUpdate()
                     .eq(JobTicketKeyDO::getId, jobTicketKey1.getId())

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/jobticket/JobTicketServiceImpl.java

@@ -328,8 +328,15 @@ public class JobTicketServiceImpl extends ServiceImpl<JobTicketMapper, JobTicket
             JobTicketKeyDO jobTicketKeyDO = new JobTicketKeyDO();
             jobTicketKeyDO.setTicketId(ticketId);
             jobTicketKeyDO.setKeyStatus("0");
+            jobTicketKeyDO.setTicketType(0);
             jobTicketKeyDOS.add(jobTicketKeyDO);
 
+            JobTicketKeyDO jobTicketKeyDO1 = new JobTicketKeyDO();
+            jobTicketKeyDO1.setTicketId(ticketId);
+            jobTicketKeyDO1.setKeyStatus("0");
+            jobTicketKeyDO1.setTicketType(1);
+            jobTicketKeyDOS.add(jobTicketKeyDO1);
+
             JobTicketGroupDO jobTicketGroupDO = new JobTicketGroupDO();
             jobTicketGroupDO.setTicketId(ticketId);
             jobTicketGroupDO.setGroupName(sopGroupDO.getGroupName());

yudao-module-iscs/src/main/resources/mapper/IsolationPointMapper.xml

@@ -91,11 +91,11 @@
         order by p.id desc
     </select>
     <select id="getOneByNfc"
-            resultType="cn.iocoder.yudao.module.iscs.controller.admin.isolationpoint.vo.IsolationPointRespVO">\
+            resultType="cn.iocoder.yudao.module.iscs.controller.admin.isolationpoint.vo.IsolationPointRespVO">
         select p.*,
                r.rfid as point_nfc
-        from is_isolation_point p
-                 LEFT JOIN is_rfid_token r on r.rfid_id = p.rfid_id
+        from isc_isolation_point p
+                 LEFT JOIN isc_rfid_token r on r.id = p.rfid_id
         where r.rfid = #{nfc}
     </select>
 </mapper>

yudao-module-iscs/src/main/resources/mapper/JobTicketMapper.xml

@@ -22,7 +22,7 @@
         LEFT JOIN isc_machinery m ON m.id = j.machinery_id
         LEFT JOIN isc_job_ticket_points p ON p.ticket_id = j.id
         <if test="vo.userId != null and vo.userId.trim != ''">
-            LEFT JOIN is_job_ticket_user u ON u.ticket_id = j.id
+            LEFT JOIN isc_job_ticket_user u ON u.ticket_id = j.id
         </if>
         <where>
             j.deleted = 0