Sfoglia il codice sorgente

接入通过RFID获取物资信息接口

Frankensteinly 8 mesi fa
parent
commit
f159eecc1d

+ 5 - 0
app/src/main/java/com/grkj/iscs_mc/model/UrlConsts.kt

@@ -209,4 +209,9 @@ object UrlConsts {
      * 通过RFID列表获取批量物资信息
      */
     const val MATERIAL_DETAIL_LIST_BY_RFID = "/iscs/hardware/material-api/selectMaterialsByRfidList"
+
+    /**
+     * 通过RFID获取物资信息
+     */
+    const val MATERIAL_DETAIL_BY_RFID = "/iscs/hardware/material-api/selectMaterialByRfid"
 }

+ 1 - 1
app/src/main/java/com/grkj/iscs_mc/model/vo/material/MaterialDetailListRespVO.kt → app/src/main/java/com/grkj/iscs_mc/model/vo/material/MaterialDetailRespVO.kt

@@ -1,6 +1,6 @@
 package com.grkj.iscs_mc.model.vo.material
 
-data class MaterialDetailListRespVO(
+data class MaterialDetailRespVO(
     val materialsId: Long?,
 
     val materialsCode: String?,

+ 20 - 2
app/src/main/java/com/grkj/iscs_mc/util/NetApi.kt

@@ -10,7 +10,7 @@ import com.grkj.iscs_mc.model.vo.key.KeyInfoRespVO
 import com.grkj.iscs_mc.model.vo.lock.LockInfoRespVO
 import com.grkj.iscs_mc.model.vo.machinery.MachineryDetailRespVO
 import com.grkj.iscs_mc.model.vo.machinery.MachineryPageRespVO
-import com.grkj.iscs_mc.model.vo.material.MaterialDetailListRespVO
+import com.grkj.iscs_mc.model.vo.material.MaterialDetailRespVO
 import com.grkj.iscs_mc.model.vo.sop.SopInfoRespVO
 import com.grkj.iscs_mc.model.vo.sop.SopPageRespVO
 import com.grkj.iscs_mc.model.vo.ticket.LockPointUpdateReqVO
@@ -711,7 +711,7 @@ object NetApi {
     /**
      * 通过RFID列表获取批量物资信息
      */
-    fun getMaterialDetailListByRfid(list: MutableList<String>, callBack: (MutableList<MaterialDetailListRespVO>?) -> Unit) {
+    fun getMaterialDetailListByRfid(list: MutableList<String>, callBack: (MutableList<MaterialDetailRespVO>?) -> Unit) {
         NetHttpManager.getInstance().doRequestNet(
             UrlConsts.MATERIAL_DETAIL_LIST_BY_RFID,
             false,
@@ -725,4 +725,22 @@ object NetApi {
             }, isGet = false, isAuth = true
         )
     }
+
+    /**
+     * 通过RFID获取物资信息
+     */
+    fun getMaterialDetailByRfid(rfid: String, callBack: (MaterialDetailRespVO?) -> Unit) {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.MATERIAL_DETAIL_BY_RFID,
+            false,
+            mapOf(
+                "rfid" to rfid
+            ),
+            { res, _, _ ->
+                res?.let {
+                    callBack.invoke(getRefBean(it))
+                }
+            }, isGet = true, isAuth = true
+        )
+    }
 }

+ 14 - 3
app/src/main/java/com/grkj/iscs_mc/view/presenter/MaterialFetchReturnPresenter.kt

@@ -1,6 +1,6 @@
 package com.grkj.iscs_mc.view.presenter
 
-import com.grkj.iscs_mc.model.vo.material.MaterialDetailListRespVO
+import com.grkj.iscs_mc.model.vo.material.MaterialDetailRespVO
 import com.grkj.iscs_mc.model.vo.material.MaterialListRespVO
 import com.grkj.iscs_mc.util.Executor
 import com.grkj.iscs_mc.util.NetApi
@@ -16,9 +16,12 @@ class MaterialFetchReturnPresenter : BasePresenter<IMaterialFetchReturnView>() {
                 ?.map { it.materialsRfid!! }
                 ?.toMutableList()
             rfidList?.let { itList ->
-                getMaterialListByRfid(itList) {
+                getMaterialDetailListByRfid(itList) {
 
                 }
+//                getMaterialDetailByRfid(itList[0]) {
+//
+//                }
             }
             Executor.runOnMain {
                 callBack(it)
@@ -26,11 +29,19 @@ class MaterialFetchReturnPresenter : BasePresenter<IMaterialFetchReturnView>() {
         }
     }
 
-    private fun getMaterialListByRfid(rfidList: MutableList<String>, callBack: (MutableList<MaterialDetailListRespVO>?) -> Unit) {
+    private fun getMaterialDetailListByRfid(rfidList: MutableList<String>, callBack: (MutableList<MaterialDetailRespVO>?) -> Unit) {
         NetApi.getMaterialDetailListByRfid(rfidList) {
             Executor.runOnMain {
                 callBack(it)
             }
         }
     }
+
+    private fun getMaterialDetailByRfid(rfid: String, callBack: (MaterialDetailRespVO?) -> Unit) {
+        NetApi.getMaterialDetailByRfid(rfid) {
+            Executor.runOnMain {
+                callBack(it)
+            }
+        }
+    }
 }