From 8b0043d2f522f0967a4fbbe5f2e43dcb3477fac7 Mon Sep 17 00:00:00 2001 From: YANGJIANKUAN Date: Fri, 13 Mar 2026 15:52:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E8=BF=9B=E6=B8=AF?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=8F=8A=E4=BA=A4=E4=BA=92=E5=AE=8C=E5=96=84?= 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/IntImpPickUpDLVBean.kt | 12 ++ .../gjj/viewModel/IntImpPickUpDLVViewModel.kt | 24 ++-- .../layout/activity_int_imp_pick_up_dlv.xml | 12 +- .../res/layout/item_int_imp_pick_up_dlv.xml | 125 +++++++++--------- 4 files changed, 97 insertions(+), 76 deletions(-) diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/IntImpPickUpDLVBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/IntImpPickUpDLVBean.kt index 137ae92..e3e0dc4 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/IntImpPickUpDLVBean.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/IntImpPickUpDLVBean.kt @@ -54,6 +54,18 @@ class IntImpPickUpDLVBean : Serializable { var awbPc: Long = 0 // ========== UI扩展字段 ========== + /** + * 航班信息展示：优先使用 flight 字段，否则用 fdate(去杠)/fno 拼接 + * 格式示例：20240204/MU2023 + */ + val flightInfo: String + get() { + if (!flight.isNullOrEmpty()) return flight + val dateStr = fdate?.replace("-", "")?.take(8) ?: "" + val noStr = fno ?: "" + return if (dateStr.isNotEmpty() || noStr.isNotEmpty()) "$dateStr/$noStr" else "" + } + val checked: ObservableBoolean = ObservableBoolean(false) var isSelected: Boolean diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt index 21f0ceb..51be351 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt @@ -16,9 +16,12 @@ import com.lukouguoji.module_base.ktx.commonAdapter import com.lukouguoji.module_base.ktx.launchCollect import com.lukouguoji.module_base.ktx.launchLoadingCollect import com.lukouguoji.module_base.ktx.showToast +import com.lukouguoji.module_base.ktx.formatDate import com.lukouguoji.module_base.ktx.toRequestBody +import com.lukouguoji.module_base.model.ConfirmDialogModel import com.lukouguoji.module_base.model.ScanModel import dev.utils.app.info.KeyValue +import dev.utils.common.DateUtils import kotlinx.coroutines.launch /** @@ -27,7 +30,7 @@ import kotlinx.coroutines.launch class IntImpPickUpDLVViewModel : BasePageViewModel() { // ========== 搜索条件 ========== - val paymentDateStart = MutableLiveData("") // 缴费日期起 + val paymentDateStart = MutableLiveData(DateUtils.getCurrentTime().formatDate()) // 缴费日期起 val paymentDateEnd = MutableLiveData("") // 缴费日期止 val agentCode = MutableLiveData("") // 代理人 val wbNo = MutableLiveData("") // 运单号 @@ -116,15 +119,20 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() { return } - launchLoadingCollect({ NetApply.api.confirmIntImpPickUpDLV(selectedItems.toRequestBody()) }) { - onSuccess = { - showToast("确认出库成功") - viewModelScope.launch { - FlowBus.with(ConstantEvent.EVENT_REFRESH).emit("refresh") + ConfirmDialogModel( + message = "确定要将选中的${selectedItems.size}条记录确认出库吗？", + title = "确认出库" + ) { + launchLoadingCollect({ NetApply.api.confirmIntImpPickUpDLV(selectedItems.toRequestBody()) }) { + onSuccess = { + showToast("确认出库成功") + viewModelScope.launch { + FlowBus.with(ConstantEvent.EVENT_REFRESH).emit("refresh") + } + refresh() } - refresh() } - } + }.show() } /** diff --git a/module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml b/module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml index 004369b..c2d379e 100644 --- a/module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml +++ b/module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml @@ -61,6 +61,12 @@ @@ -168,7 +174,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="20dp" - android:text='@{"总件数:" + viewModel.totalPc}' + android:text='@{"总件数：" + viewModel.totalPc}' android:textColor="@color/bottom_tool_tips_text_color" android:textSize="18sp" android:textStyle="bold" /> @@ -177,7 +183,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="20dp" - android:text='@{"总重量:" + viewModel.totalWeight}' + android:text='@{"总重量：" + viewModel.totalWeight}' android:textColor="@color/bottom_tool_tips_text_color" android:textSize="18sp" android:textStyle="bold" /> diff --git a/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml b/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml index 567c9ae..a76c1e3 100644 --- a/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml +++ b/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml @@ -13,12 +13,13 @@ type="Integer" /> - @@ -28,7 +29,7 @@ android:id="@+id/iv_icon" android:layout_width="40dp" android:layout_height="40dp" - android:layout_marginEnd="10dp" + android:layout_gravity="center" loadImage="@{bean.checked.get() ? @drawable/img_plane_s : @drawable/img_plane}" android:src="@drawable/img_plane" /> @@ -36,22 +37,21 @@ - + android:layout_height="wrap_content"> - + android:layout_weight="1.0" + android:gravity="center_vertical"> + android:textSize="16sp" + android:textStyle="bold" /> - + - + android:layout_weight="0.6" + android:gravity="center_vertical"> - + - + android:layout_weight="1.0" + android:gravity="center_vertical"> - + - + android:gravity="center_vertical"> - + - + android:layout_weight="0.6" + android:gravity="center_vertical"> - + - + - + android:layout_marginTop="10dp"> - + android:layout_weight="1.0" + android:gravity="center_vertical"> - + - + android:layout_weight="0.6" + android:gravity="center_vertical"> - + - + android:layout_weight="1.0" + android:gravity="center_vertical"> - + - - + + android:layout_weight="1.4" + android:gravity="center_vertical"> - + - + - +