diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpStorageUseActivity.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpStorageUseActivity.kt index 34d286a..82cada8 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpStorageUseActivity.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpStorageUseActivity.kt @@ -79,7 +79,8 @@ class IntExpStorageUseActivity : IntExpMoveClearDialogModel { 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_gjc/src/main/java/com/lukouguoji/gjc/dialog/IntExpMoveClearDialogModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/dialog/IntExpMoveClearDialogModel.kt index 8af9afa..0ef23c7 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/dialog/IntExpMoveClearDialogModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/dialog/IntExpMoveClearDialogModel.kt @@ -18,6 +18,9 @@ class IntExpMoveClearDialogModel( // 清仓正常(存储的是 code:"0" 或 "1") val clearNormal = MutableLiveData("") + // 清仓备注(选填) + val clearRemark = MutableLiveData("") + // 清仓正常选项列表 val clearNormalList = MutableLiveData>().apply { value = listOf( diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt index 4af85b6..d1e0036 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt @@ -140,9 +140,10 @@ class IntExpStorageUseViewModel : 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 @@ -151,6 +152,7 @@ class IntExpStorageUseViewModel : BasePageViewModel() { // 构建请求参数:完整的主子列表结构 val params = mapOf( "clearNormal" to clearNormal, + "clearRemark" to clearRemark.ifEmpty { null }, "maWbList" to maWbListForClear ).toRequestBody() diff --git a/module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml b/module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml index 88206ec..f53169b 100644 --- a/module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml +++ b/module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml @@ -61,6 +61,32 @@ + + + + + + + + +