添加获取作业票和关联数据接口

app/src/main/java/com/grkj/iscs/model/UrlConsts.kt

@@ -96,4 +96,9 @@ object UrlConsts {
      * 挂锁上锁时更新数据，更新挂锁和哪个隔离点进行了绑定
      */
     const val LOCK_POINT_UPDATE = "/iscs/hardware-api/updateTicketLockPoint"
+
+    /**
+     * 获取作业票和关联数据
+     */
+    const val TICKET_EQUIP_DETAIL = "/iscs/hardware-api/selectTicketDetailById"
 }

app/src/main/java/com/grkj/iscs/model/vo/lock/LockTakeUpdateReqVO.kt

@@ -3,5 +3,5 @@ package com.grkj.iscs.model.vo.lock
 data class LockTakeUpdateReqVO(
     val ticketId: Long?,
     val lockNfc: String?,
-    val fromHardwareId: Long?
+    val fromSerialNumber: String?
 )

app/src/main/java/com/grkj/iscs/model/vo/ticket/TicketEquipDetailRespVO.kt

@@ -0,0 +1,57 @@
+package com.grkj.iscs.model.vo.ticket
+
+data class TicketEquipDetailRespVO(
+    val ticketId: Long?,
+    val ticketCode: String?,
+    val ticketName: String?,
+    val workshopId: Long?,
+    val workareaId: Long?,
+    val sopId: Long?,
+    val ticketType: String?,
+    val ticketContent: String?,
+    val ticketStatus: String?,
+    val ticketStartTime: String?,
+    val ticketEndTime: String?,
+    val delFlag: String?,
+    val ticketKeyVOList: List<JobTicketKeyVO>?,
+    val ticketLockVOList: List<JobTicketLockVO>?,
+    val ticketLocksetVOList: List<JobTicketLocksetVO>?
+) {
+    data class JobTicketKeyVO(
+        val recordId: Long?,
+        val ticketId: Long?,
+        val keyId: Long?,
+        val fromHardwareId: Long?,
+        val toHardwareId: Long?,
+        val collectTime: String?,
+        val giveBackTime: String?,
+        val keyStatus: String?,
+        val delFlag: String?,
+        val ticketType: Int?
+    )
+
+    data class JobTicketLockVO(
+        val recordId: Long?,
+        val ticketId: Long?,
+        val lockId: Long?,
+        val fromHardwareId: Long?,
+        val toHardwareId: Long?,
+        val isolationPointId: Long?,
+        val lockStatus: String?,
+        val delFlag: String?
+    )
+
+    data class JobTicketLocksetVO(
+        val recordId: Long?,
+        val jobTicketId: Long?,
+        val pointId: Long?,
+        val locksetId: Long?,
+        val fromHardwareId: Long?,
+        val toHardwareId: Long?,
+        val locksetTypeId: Long?,
+        val locksetStatus: String?,
+        val collectTime: String?,
+        val giveBackTime: String?,
+        val delFlag: String?
+    )
+}

app/src/main/java/com/grkj/iscs/util/NetApi.kt

@@ -11,6 +11,7 @@ import com.grkj.iscs.model.vo.lock.LockTakeUpdateReqVO
 import com.grkj.iscs.model.vo.sop.SopInfoRespVO
 import com.grkj.iscs.model.vo.sop.SopPageRespVO
 import com.grkj.iscs.model.vo.ticket.TicketDetailRespVO
+import com.grkj.iscs.model.vo.ticket.TicketEquipDetailRespVO
 import com.grkj.iscs.model.vo.ticket.TicketPageRespVO
 import com.grkj.iscs.model.vo.ticket.TicketTypeRespVO
 import com.grkj.iscs.model.vo.user.UserListRespVO
@@ -288,13 +289,13 @@ object NetApi {
     /**
      * 归还挂锁时更新数据
      */
-    fun updateLockReturn(lockNfc: String, toHardwareId: Long, callBack: (Boolean?) -> Unit) {
+    fun updateLockReturn(lockNfc: String, toSerialNumber: String, callBack: (Boolean?) -> Unit) {
         NetHttpManager.getInstance().doRequestNet(
             UrlConsts.LOCK_RETURN_UPDATE,
             false,
             mapOf(
                 "lockNfc" to lockNfc,
-                "toHardwareId" to toHardwareId
+                "toSerialNumber" to toSerialNumber
             ),
             { res, _, _ ->
                 res?.let {
@@ -343,4 +344,20 @@ object NetApi {
             }, isGet = false, isAuth = true
         )
     }
+
+    /**
+     * 获取作业票和关联数据
+     */
+    fun getTicketEquipDetail(ticketId: Long, callBack: (TicketEquipDetailRespVO?) -> Unit) {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.TICKET_EQUIP_DETAIL,
+            false,
+            mapOf("ticketId" to ticketId),
+            { res, _, _ ->
+                res?.let {
+                    callBack.invoke(getRefBean(it))
+                }
+            }, isGet = true, isAuth = true
+        )
+    }
 }