From 8e2f584f3acb12eaa1bcb7c7fc8295d71bfc877b Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Mon, 26 Jan 2026 16:22:27 +0800 Subject: [PATCH] feat: fix bugs --- app/build.gradle | 4 ++-- .../java/com/lukouguoji/module_base/LoginActivity.kt | 2 +- .../java/com/lukouguoji/module_base/bean/GjcMaWb.kt | 1 + .../com/lukouguoji/module_base/bean/GjcUldUseBean.kt | 1 + .../com/lukouguoji/module_base/bean/GjcWarehouse.kt | 10 ++++++---- .../gjc/viewModel/GjcAssembleWeightEditViewModel.kt | 2 +- .../gjc/viewModel/GjcBoxWeighingAddViewModel.kt | 4 +++- .../gjc/viewModel/GjcBoxWeighingViewModel.kt | 6 ++++-- .../gjc/viewModel/GjcWeighingStartViewModel.kt | 6 ++++-- .../src/main/res/layout/activity_gjc_box_weighing.xml | 9 ++++----- .../res/layout/activity_gjc_box_weighing_details.xml | 2 +- .../main/res/layout/item_gjc_assemble_weight_edit.xml | 4 ++-- .../src/main/res/layout/item_int_exp_assemble_sub.xml | 4 ++-- 13 files changed, 32 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f3c75fb..11f419d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,8 +26,8 @@ android { applicationId "com.lukouguoji.aerologic" minSdkVersion 24 targetSdkVersion 30 - versionCode 186 - versionName "1.8.6" + versionCode 85 + versionName "1.8.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt b/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt index 0d6b880..bb22afa 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt @@ -41,7 +41,7 @@ import me.jessyan.autosize.internal.CustomAdapt * ========== 开发调试开关 ========== * TODO: 正式发布前务必设置为 false */ -private const val DEV_AUTO_LOGIN = true // 自动登录开关 +private const val DEV_AUTO_LOGIN = false // 自动登录开关 @Route(path = ARouterConstants.ACTIVITY_URL_LOGIN) class LoginActivity : BaseActivity(), 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 a5b605d..cafe3c0 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 @@ -74,6 +74,7 @@ data class GjcMaWb( var carId: String? = null, // 平板车号 var carNumber: String? = null, // 车牌号 var passageWay: String? = null, // 通道号 + var passageWayId: String? = null, // ==================== 状态信息 ==================== var checkIn: String? = null, // 收运状态。0：待收运，1：已收运，2：收运中 diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt index 275f813..1110a4f 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt @@ -53,6 +53,7 @@ class GjcUldUseBean : Serializable { var dgrCode: String = "" // IMP代码 var height: String = "" // 高度 var passageway: String = "" // 通道号 + var passagewayId: String = "" var passagewayName: String = "" // 通道号(中文) var plClose: String = "" // 探板/收口 var plCloseSize: String = "" // 探板尺寸(CM) diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcWarehouse.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcWarehouse.kt index cfb41c7..7c09144 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcWarehouse.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcWarehouse.kt @@ -1,10 +1,12 @@ package com.lukouguoji.module_base.bean +import java.io.Serializable + /** * 国际出港-运单明细Bean * 对应API: IntExpAssemble/queryAssembled */ -class GjcWarehouse { +class GjcWarehouse : Serializable { var whId: Long = 0 // ID var no: String = "" // 运单号（11位） var prefix: String = "" // 运单前缀 @@ -44,10 +46,10 @@ class GjcWarehouse { /** * 重量字符串（用于双向绑定EditText） */ - var weightStr: String - get() = if (weight == 0.0) "" else weight.toString() + var checkInWeightStr: String + get() = if (checkInWeight == 0.0) "" else checkInWeight.toString() set(value) { - weight = value.toDoubleOrNull() ?: 0.0 + checkInWeight = value.toDoubleOrNull() ?: 0.0 } /** diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleWeightEditViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleWeightEditViewModel.kt index 5e743e9..5351cb0 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleWeightEditViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleWeightEditViewModel.kt @@ -198,7 +198,7 @@ class GjcAssembleWeightEditViewModel : BaseViewModel() { NetApply.api.updateIntExpAssemble(records.toRequestBody()) }) { onSuccess = { result -> - if (result.data == true) { + if (result.verifySuccess()) { showToast("保存成功") // 发送刷新事件通知列表页 viewModelScope.launch { diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt index a2ce121..c9d2f3f 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt @@ -312,7 +312,8 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() { bean.uld = uldNo.value ?: "" bean.fno = flightNo.value ?: "" bean.fdate = flightDate.value ?: "" - bean.passageway = channel.value ?: "" + bean.passageway = passagewayList.value?.firstOrNull{ it.value == channel.value }?.key ?: "" + bean.passagewayId = channel.value ?: "" // 验证必填字段 if (bean.carId.verifyNullOrEmpty("请输入架子车号")) return @@ -329,6 +330,7 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() { val baseParams = mutableMapOf( "carId" to bean.carId, "passageway" to bean.passageway, + "passagewayId" to bean.passagewayId, "uld" to bean.uld, "dgrCode" to bean.dgrCode, "boardType" to bean.boardType, diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt index 3c844d5..04635ab 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt @@ -13,7 +13,7 @@ import com.lukouguoji.module_base.ktx.launchLoadingCollect import com.lukouguoji.module_base.ktx.toRequestBody import com.lukouguoji.module_base.model.ScanModel import dev.utils.common.DateUtils -import com.lukouguoji.module_base.ktx.formatDate +import com.lukouguoji.module_base.ktx.formatDate /** * 国际出港板箱过磅 ViewModel @@ -33,7 +33,8 @@ class GjcBoxWeighingViewModel : BasePageViewModel() { // 统计数据 val totalCount = MutableLiveData("0") // 合计票数 - val totalPc = MutableLiveData("0") // 总件数 + val totalPc = MutableLiveData("0") + val cargoWeight = MutableLiveData("0")// 总件数 val totalWeight = MutableLiveData("0") // 总重量 /////////////////////////////////////////////////////////////////////////// @@ -116,6 +117,7 @@ class GjcBoxWeighingViewModel : BasePageViewModel() { val data = result.data totalCount.value = (data?.wbNumber ?: 0).toString() totalPc.value = (data?.totalPc ?: 0).toString() + cargoWeight.value = (data?.cargoWeight ?: 0).toString() totalWeight.value = (data?.totalWeight ?: 0.0).toString() } } diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt index 71fb813..3a1e784 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt @@ -374,7 +374,8 @@ class GjcWeighingStartViewModel : BaseViewModel() { arriveVolume = this@GjcWeighingStartViewModel.arriveVolume.value?.toDoubleOrNull() ?: arriveVolume // 添加通道号 - passageWay = this@GjcWeighingStartViewModel.channel.value + passageWay = this@GjcWeighingStartViewModel.channelList.value?.firstOrNull{ it.value == channel.value }?.key ?: "" + passageWayId = this@GjcWeighingStartViewModel.channel.value remark = pageRemark.value } @@ -472,7 +473,8 @@ class GjcWeighingStartViewModel : BaseViewModel() { "carId" to bean.carId, "remark" to pageRemark.value, "checkIn" to "1", // 收运状态设置为已收运 - "passageWay" to channel.value // 通道号参数 + "passageWayId" to channel.value, // 通道号参数 + "passageWay" to (channelList.value?.firstOrNull{ it.value == channel.value }?.key ?: "") ).toRequestBody(removeEmptyOrNull = true) launchLoadingCollect({ diff --git a/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml b/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml index a6c1c2e..c3632ef 100644 --- a/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml +++ b/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml @@ -148,21 +148,20 @@ + tools:text="合计：" /> + tools:text="总货重：100" /> diff --git a/module_gjc/src/main/res/layout/item_gjc_assemble_weight_edit.xml b/module_gjc/src/main/res/layout/item_gjc_assemble_weight_edit.xml index c2280aa..c1b7389 100644 --- a/module_gjc/src/main/res/layout/item_gjc_assemble_weight_edit.xml +++ b/module_gjc/src/main/res/layout/item_gjc_assemble_weight_edit.xml @@ -46,7 +46,7 @@ title="@{`件数`}" titleLength="@{2}" type="@{DataLayoutType.INPUT}" - value="@{String.valueOf(bean.pc)}" /> + value="@{String.valueOf(bean.checkInPc)}" /> + value="@={bean.checkInWeightStr}" /> diff --git a/module_gjc/src/main/res/layout/item_int_exp_assemble_sub.xml b/module_gjc/src/main/res/layout/item_int_exp_assemble_sub.xml index 8e04e9b..3960b56 100644 --- a/module_gjc/src/main/res/layout/item_int_exp_assemble_sub.xml +++ b/module_gjc/src/main/res/layout/item_int_exp_assemble_sub.xml @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:layout_weight="0.8" android:gravity="center" - android:text="@{String.valueOf(bean.pc)}" + android:text="@{String.valueOf(bean.checkInPc)}" android:textColor="@color/text_normal" android:textSize="14sp" /> @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_weight="0.8" android:gravity="center" - android:text="@{String.valueOf((int)bean.weight)}" + android:text="@{String.valueOf((int)bean.checkInWeight)}" android:textColor="@color/text_normal" android:textSize="14sp" />