添加提交物资检查记录接口；物资检查页补充弹框显示

app/src/main/AndroidManifest.xml

@@ -6,6 +6,9 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
     <application
         android:name=".MyApplication"
         android:allowBackup="true"

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

@@ -244,4 +244,14 @@ object UrlConsts {
      * 在某个柜子上我的最近一次物资检查计划
      */
     const val LATEST_INSPECTION_PLAN = "/iscs/hardware/material-api/getLastCheckPlanByCabinetCode"
+
+    /**
+     * 物资检查表
+     */
+    const val CHECK_TABLE_DATA = "/iscs/hardware/material-api/getCheckMaterialsByCabinetCode"
+
+    /**
+     * 提交物资检查记录
+     */
+    const val INSERT_CHECK_RECORD = "/iscs/hardware/material-api/insertCheckRecord"
 }

app/src/main/java/com/grkj/iscs_mc/model/vo/inspection/InsertCheckRecordReqVO.kt

@@ -0,0 +1,15 @@
+package com.grkj.iscs_mc.model.vo.inspection
+
+data class InsertCheckRecordReqVO(
+    val planId: Long?,
+
+    val cabinetId: Long?,
+
+    val materialsId: Long?,
+
+    val status: String?,
+
+    val reason: String?,
+
+    val measure: String?
+)

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

@@ -6,6 +6,7 @@ import com.grkj.iscs_mc.model.UrlConsts
 import com.grkj.iscs_mc.model.vo.card.CardInfoRespVO
 import com.grkj.iscs_mc.model.vo.dept.DeptListRespVO
 import com.grkj.iscs_mc.model.vo.home.HomePageDataRespVO
+import com.grkj.iscs_mc.model.vo.inspection.InsertCheckRecordReqVO
 import com.grkj.iscs_mc.model.vo.inspection.LatestInspectionPlanRespVO
 import com.grkj.iscs_mc.model.vo.key.KeyInfoRespVO
 import com.grkj.iscs_mc.model.vo.lock.LockInfoRespVO
@@ -862,4 +863,28 @@ object NetApi {
             }, isGet = true, isAuth = true
         )
     }
+
+    fun getCheckTableData() {
+
+    }
+
+    /**
+     * 提交物资检查记录
+     */
+    fun insertCheckRecord(list: MutableList<InsertCheckRecordReqVO>, callBack: (Boolean) -> Unit) {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.INSERT_CHECK_RECORD,
+            false,
+            mapOf(
+                "list" to list
+            ),
+            { res, _, _ ->
+                res?.let {
+                    callBack.invoke(true)
+                } ?: run {
+                    callBack.invoke(false)
+                }
+            }, isGet = false, isAuth = true
+        )
+    }
 }

app/src/main/java/com/grkj/iscs_mc/view/fragment/MaterialInspectionPlanFragment.kt

@@ -9,6 +9,7 @@ import com.grkj.iscs_mc.extentions.navigateUp
 import com.grkj.iscs_mc.model.vo.inspection.LatestInspectionPlanRespVO
 import com.grkj.iscs_mc.util.ImgUtil
 import com.grkj.iscs_mc.view.base.BaseMvpFragment
+import com.grkj.iscs_mc.view.dialog.TipDialog
 import com.grkj.iscs_mc.view.iview.IMaterialInspectionPlanView
 import com.grkj.iscs_mc.view.presenter.MaterialInspectionPlanPresenter
 import com.zhy.adapter.recyclerview.CommonAdapter
@@ -48,9 +49,11 @@ class MaterialInspectionPlanFragment :
         presenter?.getLatestInspectionPlan {
             mBinding?.tvTitle?.text = "${getString(R.string.plan_date)}：${it?.planDate}  " +
                     "${getString(R.string.plan_status)}：" +
-                    "${if (it?.status == "1") getString(R.string.finished) 
-                    else if (it?.status == "2") getString(R.string.processing) 
-                    else getString(R.string.not_start)}"
+                    when (it?.status) {
+                        "1" -> getString(R.string.finished)
+                        "2" -> getString(R.string.processing)
+                        else -> getString(R.string.not_start)
+                    }
 
             it?.list?.let {
                 mCheckList.addAll(it)
@@ -72,7 +75,7 @@ class MaterialInspectionPlanFragment :
         }
 
         mBinding?.cbStart?.setOnClickListener {
-
+            startInspection()
         }
 
         mBinding?.cbContinue?.setOnClickListener {
@@ -92,6 +95,15 @@ class MaterialInspectionPlanFragment :
 //        navigateTo(MaterialInspectionPlanFragmentDirections.actionInspectionPlanFragmentToInspectionTableFragment())
     }
 
+    private fun startInspection() {
+        val dialog = TipDialog(requireContext())
+        dialog.setTip(getString(R.string.inspection_start_tip))
+        dialog.setConfirmListener {
+
+        }
+        dialog.show()
+    }
+
     override fun initPresenter(): MaterialInspectionPlanPresenter {
         return MaterialInspectionPlanPresenter()
     }

app/src/main/java/com/grkj/iscs_mc/view/fragment/MaterialInspectionTableFragment.kt

@@ -50,6 +50,10 @@ class MaterialInspectionTableFragment :
 
             }
         }
+
+        mBinding?.cbSave?.setOnClickListener {
+//            presenter?.insertCheckRecord()
+        }
     }
 
     override fun initPresenter(): MaterialInspectionTablePresenter {

app/src/main/java/com/grkj/iscs_mc/view/presenter/MaterialInspectionTablePresenter.kt

@@ -1,7 +1,15 @@
 package com.grkj.iscs_mc.view.presenter
 
+import com.grkj.iscs_mc.model.vo.inspection.InsertCheckRecordReqVO
+import com.grkj.iscs_mc.util.NetApi
 import com.grkj.iscs_mc.view.base.BasePresenter
 import com.grkj.iscs_mc.view.iview.IMaterialInspectionTableView
 
 class MaterialInspectionTablePresenter : BasePresenter<IMaterialInspectionTableView>() {
+
+    fun insertCheckRecord(list: MutableList<InsertCheckRecordReqVO>) {
+        NetApi.insertCheckRecord(list) {
+
+        }
+    }
 }

app/src/main/res/values/strings.xml

@@ -100,4 +100,6 @@
 
     <string name="to_be_returned">待还</string>
     <string name="home_status_bar_title">物资数量(可借/总数)：</string>
+
+    <string name="inspection_start_tip">确定要开始检查物资吗？</string>
 </resources>