diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt index 2030c83..b2004f2 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt @@ -414,9 +414,13 @@ class IntExpAssembleStartViewModel : BaseViewModel() { /** * 加载板型选项列表 * @param carrier 承运人二字码(ULD 编号后两位);进入页面时不传取全量,ULD 信息查询成功后按承运人重新加载并覆盖数据源 + * @param autoSelectFirst 查询结果不为空时是否自动选中第一项回填到板型输入框;仅 ULD 触发的按承运人查询传 true,进入页面的全量查询不自动选择 */ - fun loadBoardTypeList(carrier: String? = null) { - DictUtils.getBoardTypeList(carrier) { boardTypeList.value = it } + fun loadBoardTypeList(carrier: String? = null, autoSelectFirst: Boolean = false) { + DictUtils.getBoardTypeList(carrier) { + boardTypeList.value = it + if (autoSelectFirst && it.isNotEmpty()) onBoardTypeSelected(0) + } } /** @@ -472,7 +476,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() { // 按 ULD 编号后两位(承运人二字码)重新加载板型选项,覆盖下拉数据源 val carrier = uldNo.trim().takeLast(2) - if (carrier.length == 2) loadBoardTypeList(carrier) + if (carrier.length == 2) loadBoardTypeList(carrier, autoSelectFirst = true) // 【新增】从ULD信息提取航班信息 if (uldBean.fno.isNotEmpty() && uldBean.fdate.isNotEmpty()) {