diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcExportLoad.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcExportLoad.kt index 45bb7cc..df4fcc3 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcExportLoad.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcExportLoad.kt @@ -47,17 +47,4 @@ class GjcExportLoad { fun getFullWaybillNo(): String { return if (prefix.isNotEmpty()) "$prefix$no" else no } - - /** - * 获取装载状态显示文字 - */ - fun getLoadStatusText(): String { - return when (loadStatus) { - "01" -> "已申报" - "02" -> "申报中" - "03" -> "申报失败" - "04" -> "已删除" - else -> loadStatus - } - } } diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcMaWb.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcMaWb.kt index b57eb8b..6dd6945 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcMaWb.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcMaWb.kt @@ -105,7 +105,6 @@ data class GjcMaWb( var activeId: Long? = null, // 有效值 // ==================== 关联列表(非数据库字段,用于展示) ==================== - @Transient var haWbList: List? = null, // 分单列表 @Transient var storageUseList: List? = null, // 库位使用列表 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpLoadActivity.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpLoadActivity.kt index 1780fe2..7c16be6 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpLoadActivity.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpLoadActivity.kt @@ -59,11 +59,6 @@ class IntExpLoadActivity : viewModel.waybillNo.value = codedContent viewModel.searchClick() } - // 扫码分单号 - Constant.RequestCode.CODE -> { - viewModel.houseWaybillNo.value = codedContent - viewModel.searchClick() - } } } } diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt index c69e0a7..ddc3b9e 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt @@ -33,7 +33,6 @@ class IntExpLoadViewModel : BasePageViewModel() { val flightDate = MutableLiveData(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val waybillNo = MutableLiveData("") // 运单号 - val houseWaybillNo = MutableLiveData("") // 分单号 // ========== 统计信息 ========== val totalCount = MutableLiveData("0") // 合计票数 @@ -84,13 +83,6 @@ class IntExpLoadViewModel : BasePageViewModel() { ScanModel.startScan(getTopActivity(), Constant.RequestCode.WAYBILL) } - /** - * 扫码分单号 - */ - fun scanHouseWaybill() { - ScanModel.startScan(getTopActivity(), Constant.RequestCode.CODE) - } - /** * 状态重置 (批量操作) */ @@ -198,7 +190,6 @@ class IntExpLoadViewModel : BasePageViewModel() { fdate = flightDate.value?.ifEmpty { null }, fno = flightNo.value?.ifEmpty { null }, no = waybillNo.value?.ifEmpty { null }, - hno = houseWaybillNo.value?.ifEmpty { null }, pageNum = pageModel.page, pageSize = pageModel.limit ) @@ -210,8 +201,7 @@ class IntExpLoadViewModel : BasePageViewModel() { val totalParams = GjcCheckInPage( fdate = flightDate.value?.ifEmpty { null }, fno = flightNo.value?.ifEmpty { null }, - no = waybillNo.value?.ifEmpty { null }, - hno = houseWaybillNo.value?.ifEmpty { null } + no = waybillNo.value?.ifEmpty { null } ).toRequestBody() // 获取列表 (带Loading) diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt index 16a77cb..e1d601e 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt @@ -42,6 +42,14 @@ class IntExpTallyViewModel : BasePageViewModel() { // ========== 全选状态 ========== val isAllChecked = MutableLiveData(false) + // ========== 全局展开状态 ========== + /** + * 全局展开状态 + * - true: 全部展开 + * - false: 全部收起 + */ + val isAllExpanded = MutableLiveData(false) + init { // 监听全选状态,自动更新所有列表项 isAllChecked.observeForever { checked -> @@ -76,6 +84,28 @@ class IntExpTallyViewModel : BasePageViewModel() { pageModel.rv?.commonAdapter()?.notifyDataSetChanged() } + /** + * 切换全局展开/收起状态 + */ + fun toggleAllExpand() { + val list = pageModel.rv?.commonAdapter()?.items as? List ?: return + + // 切换全局状态 + val shouldExpand = !isAllExpanded.value!! + isAllExpanded.value = shouldExpand + + // 更新所有列表项的 showMore 状态 + list.forEach { bean -> + // 只有当有子列表时才设置展开状态 + if (!bean.haWbList.isNullOrEmpty()) { + bean.showMore.set(shouldExpand) + } + } + + // 刷新列表UI + pageModel.rv?.commonAdapter()?.notifyDataSetChanged() + } + /** * 扫码运单号 */ @@ -213,7 +243,11 @@ class IntExpTallyViewModel : BasePageViewModel() { // 获取列表 (带Loading) launchLoadingCollect({ NetApply.api.getIntExpTallyList(listParams) }) { - onSuccess = { pageModel.handleListBean(it) } + onSuccess = { + pageModel.handleListBean(it) + // 数据加载完成后,重置全局展开状态为收起 + isAllExpanded.value = false + } } // 获取统计信息 (后台请求,不阻塞列表) diff --git a/module_gjc/src/main/res/layout/activity_int_exp_load.xml b/module_gjc/src/main/res/layout/activity_int_exp_load.xml index 3e50046..21f6e99 100644 --- a/module_gjc/src/main/res/layout/activity_int_exp_load.xml +++ b/module_gjc/src/main/res/layout/activity_int_exp_load.xml @@ -61,17 +61,6 @@ type="@{SearchLayoutType.INPUT}" value="@={viewModel.waybillNo}" /> - - - + + @@ -88,6 +90,17 @@ android:padding="2dp" android:src="@drawable/img_search" /> + + + diff --git a/module_gjc/src/main/res/layout/item_int_exp_load.xml b/module_gjc/src/main/res/layout/item_int_exp_load.xml index 7624eb5..d6c9ac3 100644 --- a/module_gjc/src/main/res/layout/item_int_exp_load.xml +++ b/module_gjc/src/main/res/layout/item_int_exp_load.xml @@ -93,8 +93,8 @@ diff --git a/module_gjc/src/main/res/layout/item_int_exp_tally.xml b/module_gjc/src/main/res/layout/item_int_exp_tally.xml index 67918c7..ca48189 100644 --- a/module_gjc/src/main/res/layout/item_int_exp_tally.xml +++ b/module_gjc/src/main/res/layout/item_int_exp_tally.xml @@ -74,7 +74,15 @@ - +