From 94508f8c40eeaa5ebdda2d074e5bece6828907e2 Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Sun, 20 Sep 2026 15:03:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E5=87=BA=E6=B8=AF?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=BB=84=E8=A3=85=20ULD=20=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E6=9D=BF=E5=9E=8B=E6=9F=A5=E8=AF=A2=E5=90=8E=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E9=A6=96=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5.1 --- .../gjc/viewModel/IntExpAssembleStartViewModel.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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()) {