Browse Source

物资检查计划表页补充底部检查状态显示字段,添加一键检查功能

Frankensteinly 8 months ago
parent
commit
aa2b597a93

+ 12 - 0
app/src/main/java/com/grkj/iscs_mc/model/vo/inspection/InspectionCheckTableDataRespVO.kt

@@ -4,6 +4,8 @@ class InspectionCheckTableDataRespVO(
     val list: List<IsMaterialsCheckRecord>?,
 
     val standards: List<CheckStandardVO>?,
+
+    val checkProgressVO: CheckProgressVO?
 ) {
     data class IsMaterialsCheckRecord(
         val recordId: Long?,
@@ -50,4 +52,14 @@ class InspectionCheckTableDataRespVO(
 
         val checkStandard: String?
     )
+
+    class CheckProgressVO(
+        val checkNum: Int?,
+
+        val normalNum: Int?,
+
+        val timeOutNum: Int?,
+
+        val badNum: Int?
+    )
 }

+ 1 - 1
app/src/main/java/com/grkj/iscs_mc/view/dialog/InspectionDialog.kt

@@ -24,8 +24,8 @@ class InspectionDialog(val ctx: Context) : BaseDialog<DialogInspectionBinding>(c
         mBtnList = mutableListOf(mBinding?.rlNormal, mBinding?.rlExpired, mBinding?.rlDamaged)
 
         mBinding?.btnConfirm?.setOnClickListener {
-            dismiss()
             confirmListener?.invoke(mSelected)
+            dismiss()
         }
         mBinding?.btnCancel?.setOnClickListener {
             dismiss()

+ 27 - 0
app/src/main/java/com/grkj/iscs_mc/view/fragment/MaterialInspectionTableFragment.kt

@@ -8,6 +8,7 @@ import com.grkj.iscs_mc.extentions.navigateUp
 import com.grkj.iscs_mc.extentions.setSelected
 import com.grkj.iscs_mc.model.vo.inspection.InspectionCheckTableDataRespVO
 import com.grkj.iscs_mc.view.base.BaseMvpFragment
+import com.grkj.iscs_mc.view.dialog.InspectionDialog
 import com.grkj.iscs_mc.view.iview.IMaterialInspectionTableView
 import com.grkj.iscs_mc.view.presenter.MaterialInspectionTablePresenter
 import com.zhy.adapter.recyclerview.CommonAdapter
@@ -72,6 +73,10 @@ class MaterialInspectionTableFragment :
             }
         }
 
+        mBinding?.cbAuto?.setOnClickListener {
+            autoCheck()
+        }
+
         mBinding?.cbSave?.setOnClickListener {
             presenter?.insertCheckRecord(mRecordList)
         }
@@ -89,7 +94,29 @@ class MaterialInspectionTableFragment :
                 mStandardList.addAll(it)
                 mBinding?.rvStandard?.adapter?.notifyDataSetChanged()
             }
+
+            mBinding?.tvStatus?.text = getString(
+                R.string.inspection_status,
+                it?.checkProgressVO?.checkNum,
+                it?.checkProgressVO?.normalNum,
+                it?.checkProgressVO?.timeOutNum,
+                it?.checkProgressVO?.badNum
+            )
+        }
+    }
+
+    /**
+     * 一键检查
+     */
+    private fun autoCheck() {
+        val dialog = InspectionDialog(requireContext())
+        dialog.setConfirmListener { status ->
+            mRecordList.forEach {
+                it.status = status.toString()
+            }
+            mBinding?.rvMaterial?.adapter?.notifyDataSetChanged()
         }
+        dialog.show()
     }
 
     override fun initPresenter(): MaterialInspectionTablePresenter {