From f4606b7ba52a36b6043496ee61d30f88dd89df84 Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Sun, 4 Jan 2026 10:19:19 +0800 Subject: [PATCH] feat: fix --- .../java/com/lukouguoji/module_base/LoginActivity.kt | 2 +- .../java/com/lukouguoji/module_base/bean/UldInfoBean.kt | 2 +- .../gjc/viewModel/IntExpAssembleStartViewModel.kt | 2 +- .../lukouguoji/gjc/viewModel/IntExpAssembleViewModel.kt | 9 +++++---- 4 files changed, 8 insertions(+), 7 deletions(-) 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/UldInfoBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt index f25cc0b..bb9a1ff 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt @@ -12,5 +12,5 @@ class UldInfoBean { var totalPieces: String = "" // 总件数 var totalWeight: String = "" // 总重量 var status: String = "" // 状态(旧字段，保留兼容) - var useId: Long = 0 // ULD使用ID（来自getUld接口） + var useId: Long? = null // ULD使用ID（来自getUld接口） } diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt index 1396ee5..b4f2f3b 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt @@ -445,7 +445,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() { else -> "" }, "loadArea" to loadArea, - "useId" to uldInfo.value?.useId // 添加useId（来自getUld接口） + "useId" to if (uldInfo.value?.useId == 0L) null else uldInfo.value?.useId // 添加useId（来自getUld接口） ) // 4. 构建wbInfo（运单信息） diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleViewModel.kt index 4655fd0..ee5c261 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleViewModel.kt @@ -30,12 +30,13 @@ class IntExpAssembleViewModel : BasePageViewModel() { val flightDate = MutableLiveData("") // 航班日期 val flightNo = MutableLiveData("") // 航班号 val uldNo = MutableLiveData("") // ULD编号 - val reweighStatus = MutableLiveData("全部") // 复磅状态 + + val reweighStatus = MutableLiveData("") // 复磅状态 val reweighStatusList = MutableLiveData( // 复磅状态选项 listOf( - KeyValue("全部", "全部"), - KeyValue("未复磅", "未复磅"), - KeyValue("已复磅", "已复磅") + KeyValue("全部", ""), + KeyValue("未复磅", "0"), + KeyValue("已复磅", "1") ) ) val assembler = MutableLiveData("") // 组装人