diff --git a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt index c117c21..d89b2e0 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt @@ -983,7 +983,11 @@ interface Api { * 接口路径: /IntImpStorage/updateClear */ @POST("IntImpStorage/updateClear") - suspend fun clearIntImpStorage(@Query("clearNormal") clearNormal: String, @Body data: RequestBody): BaseResultBean + suspend fun clearIntImpStorage( + @Query("clearNormal") clearNormal: String, + @Query("clearRemark") clearRemark: String?, + @Body data: RequestBody + ): BaseResultBean /** * 国际进港库位操作-修改库位 diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpStorageUseActivity.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpStorageUseActivity.kt index 43c7c77..85e23cf 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpStorageUseActivity.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpStorageUseActivity.kt @@ -78,7 +78,8 @@ class IntImpStorageUseActivity : IntImpMoveClearDialogModel { dialog -> val clearNormal = dialog.clearNormal.value ?: "" - viewModel.performClear(clearNormal, maWbListForClear) + val clearRemark = dialog.clearRemark.value ?: "" + viewModel.performClear(clearNormal, clearRemark, maWbListForClear) }.show(this) } diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/dialog/IntImpMoveClearDialogModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/dialog/IntImpMoveClearDialogModel.kt index a5e5528..4b344ba 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/dialog/IntImpMoveClearDialogModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/dialog/IntImpMoveClearDialogModel.kt @@ -18,6 +18,9 @@ class IntImpMoveClearDialogModel( // 清仓正常(存储的是 code:"0" 或 "1") val clearNormal = MutableLiveData("") + // 清仓备注(选填) + val clearRemark = MutableLiveData("") + // 清仓正常选项列表 val clearNormalList = MutableLiveData>().apply { value = listOf( diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpStorageUseViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpStorageUseViewModel.kt index 702680e..4a74fd1 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpStorageUseViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpStorageUseViewModel.kt @@ -117,16 +117,22 @@ class IntImpStorageUseViewModel : BasePageViewModel() { /** * 执行清仓操作 + * @param clearNormal 清仓正常("0"或"1") + * @param clearRemark 清仓备注(选填) + * @param maWbListForClear 包含选中子列表项的主列表数据 */ - fun performClear(clearNormal: String, maWbListForClear: List) { + fun performClear(clearNormal: String, clearRemark: String, maWbListForClear: List) { if (maWbListForClear.isEmpty()) { showToast("请至少选择一个库位") return } + // 备注同时通过 query 参数和主单字段传递,兼容服务端两种取值方式 + val remark = clearRemark.ifEmpty { null } + maWbListForClear.forEach { it.clearRemark = remark } val body = maWbListForClear.toRequestBody() - launchLoadingCollect({ NetApply.api.clearIntImpStorage(clearNormal, body) }) { + launchLoadingCollect({ NetApply.api.clearIntImpStorage(clearNormal, remark, body) }) { onSuccess = { showToast("清仓成功") viewModelScope.launch { diff --git a/module_gjj/src/main/res/layout/dialog_int_imp_move_clear.xml b/module_gjj/src/main/res/layout/dialog_int_imp_move_clear.xml index 52dc564..d8aba12 100644 --- a/module_gjj/src/main/res/layout/dialog_int_imp_move_clear.xml +++ b/module_gjj/src/main/res/layout/dialog_int_imp_move_clear.xml @@ -61,6 +61,32 @@ + + + + + + + + + diff --git a/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml b/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml index c8d8aa4..5c83a04 100644 --- a/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml +++ b/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml @@ -303,6 +303,29 @@ + + + + + + + + +