From 2f3ae2a814184769d9e07049eba6f35118d9f244 Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Thu, 27 Aug 2026 17:08:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E8=BF=9B=E6=B8=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E6=96=B0=E5=A2=9E=E8=88=AA?= =?UTF-8?q?=E7=8F=AD=E8=88=AA=E6=AC=A1=E5=B9=B6=E8=B0=83=E6=95=B4=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 底部统计栏在总重量后新增航班航次显示 - 航班号从筛选面板移至页面上方搜索区，出库状态移入筛选面板 - 筛选红点提示与重置逻辑同步调整字段归属 Co-Authored-By: Claude Opus 4.6 --- .../module_base/bean/ManifestTotalDto.kt | 3 ++- .../gjj/activity/IntImpQueryActivity.kt | 4 ++-- .../gjj/viewModel/IntImpQueryViewModel.kt | 12 ++++++----- .../res/layout/activity_int_imp_query.xml | 20 ++++++++++++++----- .../layout/layout_int_imp_query_filter.xml | 12 +++++------ 5 files changed, 32 insertions(+), 19 deletions(-) diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/ManifestTotalDto.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/ManifestTotalDto.kt index c54ec76..2ed5a4a 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/ManifestTotalDto.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/ManifestTotalDto.kt @@ -8,5 +8,6 @@ data class ManifestTotalDto( var wbNumber: Int = 0, // 运单票数/总票数 var totalPc: Long = 0, // 总件数 var totalWeight: Double = 0.0, // 总重量 - var cargoWeight: Double = 0.0 // 总货重 + var cargoWeight: Double = 0.0, // 总货重 + var flightNumber: Int = 0 // 航班航次 ) diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryActivity.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryActivity.kt index f10c084..77c8ef1 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryActivity.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryActivity.kt @@ -55,8 +55,8 @@ class IntImpQueryActivity : if (visible) showFilterPanel() else hideFilterPanel() } - // 航班号：大写字母+数字 - binding.filterPanel.filterFlightNo.et.setUpperCaseAlphanumericFilter() + // 航班号（顶部搜索区）：大写字母+数字 + binding.flightNoSearch.et.setUpperCaseAlphanumericFilter() // 始发港：仅大写字母 binding.filterPanel.filterOrigin.et.setUpperCaseLetterFilter() diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt index c23da61..58fe54f 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt @@ -33,7 +33,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener { val flightDateStart = MutableLiveData(DateUtils.getCurrentTime().formatDate()) val flightDateEnd = MutableLiveData("") val agentId = MutableLiveData("") - val outStatus = MutableLiveData("") + val flightNo = MutableLiveData("") val waybillNo = MutableLiveData("") // ==================== 下拉列表 ==================== @@ -55,6 +55,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener { val totalCount = MutableLiveData("0") val totalPc = MutableLiveData("0") val totalWeight = MutableLiveData("0") + val totalFlightNumber = MutableLiveData("0") // ==================== 特码下拉 ==================== val spCodeList = MutableLiveData>(emptyList()) @@ -66,7 +67,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener { // ==================== 筛选条件 ==================== val spCode = MutableLiveData("") - val flightNo = MutableLiveData("") + val outStatus = MutableLiveData("") val origin = MutableLiveData("") val awbType = MutableLiveData("") val businessType = MutableLiveData("") @@ -75,11 +76,11 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener { // 是否有筛选条件（任意一个非空则为 true） val hasFilter: MediatorLiveData = MediatorLiveData().apply { val update = { _: Any? -> - value = listOf(spCode, flightNo, origin, awbType, businessType, goodsCn) + value = listOf(spCode, outStatus, origin, awbType, businessType, goodsCn) .any { !it.value.isNullOrEmpty() } } addSource(spCode, update) - addSource(flightNo, update) + addSource(outStatus, update) addSource(origin, update) addSource(awbType, update) addSource(businessType, update) @@ -108,7 +109,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener { fun resetFilter() { spCode.value = "" - flightNo.value = "" + outStatus.value = "" origin.value = "" awbType.value = "" businessType.value = "" @@ -176,6 +177,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener { totalCount.value = (data?.wbNumber ?: 0).toString() totalPc.value = (data?.totalPc ?: 0).toString() totalWeight.value = (data?.totalWeight ?: 0.0).toString() + totalFlightNumber.value = (data?.flightNumber ?: 0).toString() } } } diff --git a/module_gjj/src/main/res/layout/activity_int_imp_query.xml b/module_gjj/src/main/res/layout/activity_int_imp_query.xml index ab0223b..ff7105f 100644 --- a/module_gjj/src/main/res/layout/activity_int_imp_query.xml +++ b/module_gjj/src/main/res/layout/activity_int_imp_query.xml @@ -72,15 +72,15 @@ type="@{SearchLayoutType.SPINNER}" value="@={viewModel.agentId}" /> - + + hint='@{"请输入航班号"}' + type="@{SearchLayoutType.INPUT}" + value="@={viewModel.flightNo}" /> + + diff --git a/module_gjj/src/main/res/layout/layout_int_imp_query_filter.xml b/module_gjj/src/main/res/layout/layout_int_imp_query_filter.xml index a1dafed..5882398 100644 --- a/module_gjj/src/main/res/layout/layout_int_imp_query_filter.xml +++ b/module_gjj/src/main/res/layout/layout_int_imp_query_filter.xml @@ -68,17 +68,17 @@ type="@{DataLayoutType.SPINNER}" value='@={viewModel.spCode}' /> - + + type="@{DataLayoutType.SPINNER}" + value='@={viewModel.outStatus}' />