feat: 国际出港 出港计重 分托

This commit is contained in:
2025-12-08 15:48:32 +08:00
parent 9149d1ad35
commit 37ffc539c9
4 changed files with 61 additions and 7 deletions

View File

@@ -230,11 +230,57 @@ class GjcWeighingStartViewModel : BaseViewModel() {
}
/**
* 分计重按钮点击
* 分计重按钮点击
*/
fun sortingWeighingClick() {
showToast("分拣计重功能开发中")
// TODO: 实现分拣计重功能
val bean = maWbBean.value ?: return
// 1. 验证必填字段
if (bean.no.verifyNullOrEmpty("请输入运单号")) return
if (bean.fno.verifyNullOrEmpty("请输入航班号")) return
if (channel.value.verifyNullOrEmpty("请选择通道号")) return
// 2. 收集当前表单数据,更新到 bean
bean.apply {
// 更新运抵数据(如果用户已编辑)
arrivePc = this@GjcWeighingStartViewModel.arrivePc.value?.toLongOrNull() ?: arrivePc
arriveWeight = this@GjcWeighingStartViewModel.arriveWeight.value?.toDoubleOrNull() ?: arriveWeight
arriveVolume = this@GjcWeighingStartViewModel.arriveVolume.value?.toDoubleOrNull() ?: arriveVolume
}
// 3. 构建请求数据GjcMaWb转RequestBody
val params = bean.toRequestBody(removeEmptyOrNull = true)
// 4. 调用接口
launchLoadingCollect({
NetApply.api.splitCheckIn(params)
}) {
onSuccess = { result ->
if (result.verifySuccess()) {
showToast("分托计重成功")
// 发送刷新事件
viewModelScope.launch {
FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
}
// 刷新实时计重数据第5行的只读字段
loadRealTimeRecord()
// 清空表单字段,等待下一次计重
arrivePc.value = ""
arriveWeight.value = ""
arriveVolume.value = ""
maWbBean.value = maWbBean.value?.apply {
carId = null
remark = null
}
carWeight.value = "0"
} else {
showToast(result.msg.noNull("分托计重失败"))
}
}
}
}
/**
@@ -246,6 +292,7 @@ class GjcWeighingStartViewModel : BaseViewModel() {
// 验证必填字段
if (bean.no.verifyNullOrEmpty("请输入运单号")) return
if (bean.fno.verifyNullOrEmpty("请输入航班号")) return
if (channel.value.verifyNullOrEmpty("请选择通道号")) return
// 从编辑字段获取数值
val pc = realTimePc.value?.toLongOrNull() ?: bean.pc

View File

@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:background="@drawable/bg_white_radius_8"
android:orientation="vertical"
android:padding="15dp">
android:padding="8dp">
<!-- 第一部分前2行表单左侧2列+ 地磅称重(右侧) -->
<LinearLayout
@@ -62,7 +62,7 @@
title='@{"运单号"}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value='@={viewModel.maWbBean.no}'
value='@={viewModel.maWbBean.wbNo}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />