Jelajahi Sumber

接入最终提交物资检查记录接口并适配界面

Frankensteinly 8 bulan lalu
induk
melakukan
4e601d8c4f

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

@@ -298,4 +298,9 @@ object UrlConsts {
      * TODO 待定是否接入
      */
     const val MANUAL_REPLACEMENT_ENTITY = "/iscs/hardware/material-api/updateMaterialsReplace"
+
+    /**
+     * 最终提交物资检查记录
+     */
+    const val INSERT_SUBMIT_PLAN = "/iscs/hardware/material-api/insertSubmitPlan"
 }

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

@@ -1025,4 +1025,24 @@ object NetApi {
             }, isGet = false, isAuth = true
         )
     }
+
+    /**
+     * 最终提交物资检查记录
+     */
+    fun submitInspection(cabinetCode: String, planId: Long, callBack: (Boolean) -> Unit) {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.INSERT_SUBMIT_PLAN,
+            false,
+            mapOf(
+                "planId" to planId,
+                "cabinetCode" to cabinetCode
+            ), { res, _, _ ->
+                res?.let {
+                    callBack.invoke(true)
+                } ?: run {
+                    callBack.invoke(false)
+                }
+            }, isGet = false, isAuth = true
+        )
+    }
 }

+ 6 - 1
app/src/main/java/com/grkj/iscs_mc/view/fragment/MaterialInspectionPlanFragment.kt

@@ -6,6 +6,7 @@ import com.grkj.iscs_mc.R
 import com.grkj.iscs_mc.databinding.FragmentMaterialInspectionPlanBinding
 import com.grkj.iscs_mc.extentions.navigateTo
 import com.grkj.iscs_mc.extentions.navigateUp
+import com.grkj.iscs_mc.extentions.serialNo
 import com.grkj.iscs_mc.model.vo.inspection.LatestInspectionPlanRespVO
 import com.grkj.iscs_mc.util.ImgUtil
 import com.grkj.iscs_mc.view.base.BaseMvpFragment
@@ -121,7 +122,11 @@ class MaterialInspectionPlanFragment :
         val dialog = TipDialog(requireContext())
         dialog.setTip(getString(R.string.inspection_submit_confirm_tip))
         dialog.setConfirmListener {
-            // TODO 提交检查结果
+            mPlanId?.let {
+                presenter?.submitInspection(requireContext().serialNo(), it) {
+                    if (it) navigateUp()
+                }
+            }
         }
         dialog.show()
     }

+ 8 - 0
app/src/main/java/com/grkj/iscs_mc/view/presenter/MaterialInspectionPlanPresenter.kt

@@ -16,4 +16,12 @@ class MaterialInspectionPlanPresenter : BasePresenter<IMaterialInspectionPlanVie
             }
         }
     }
+
+    fun submitInspection(cabinetCode: String, planId: Long, callBack: (Boolean) -> Unit) {
+        NetApi.submitInspection(cabinetCode, planId) {
+            Executor.runOnMain {
+                callBack(it)
+            }
+        }
+    }
 }

+ 2 - 0
app/src/main/res/layout/fragment_exception_report.xml

@@ -48,6 +48,7 @@
             android:layout_height="wrap_content"
             android:layout_marginVertical="@dimen/common_spacing"
             app:edit_width="200dp"
+            app:edittext_hint="@string/exception_report_type_hint"
             app:mode="select"
             app:name="@string/exception_report_type"
             app:required="true"
@@ -59,6 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_marginVertical="@dimen/common_spacing"
             app:edit_width="200dp"
+            app:edittext_hint="@string/exception_report_level_hint"
             app:mode="select"
             app:name="@string/exception_report_level"
             app:required="true"

+ 2 - 0
app/src/main/res/values/strings.xml

@@ -125,6 +125,8 @@
     <string name="manual_replacement_submit_confirm_tip">确定要手动更换记录吗?</string>
     
     <string name="exception_report_type">异常类型:</string>
+    <string name="exception_report_type_hint">请选择异常类型</string>
     <string name="exception_report_level">严重等级:</string>
+    <string name="exception_report_level_hint">请选择严重等级</string>
     <string name="exception_report_description">异常描述:</string>
 </resources>