From 4451b790def470317921156808c7d352c71e1c4b Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Wed, 15 Apr 2026 13:42:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E8=BF=9B=E6=B8=AF?= =?UTF-8?q?=E8=A3=85=E6=9C=BA=E5=8D=95=E7=BC=96=E8=BE=91=E9=A1=B5=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E5=8F=B7=E5=8F=96=20locationTally=EF=BC=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=AF=A6=E6=83=85=E8=BF=90=E5=8D=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=96=20awbPc/awbWeight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 --- .../gjj/viewModel/IntImpLoadingListEditViewModel.kt | 3 +-- .../src/main/res/layout/fragment_int_imp_query_waybill.xml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpLoadingListEditViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpLoadingListEditViewModel.kt index 6ba9f4e..fbb9521 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpLoadingListEditViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpLoadingListEditViewModel.kt @@ -36,7 +36,7 @@ class IntImpLoadingListEditViewModel : BaseViewModel() { val bean = Gson().fromJson(jsonData, GjjManifest::class.java) dataBean.value = bean // 初始化可编辑字段 - location.value = bean.location + location.value = bean.locationTally totalPcStr.value = bean.totalPc.toString() pcStr.value = bean.pc.toString() weightStr.value = bean.weight.toString() @@ -58,7 +58,6 @@ class IntImpLoadingListEditViewModel : BaseViewModel() { val bean = dataBean.value ?: return // 同步可编辑字段回 bean - bean.location = location.value ?: "" bean.totalPc = totalPcStr.value?.toLongOrNull() ?: 0 bean.pc = pcStr.value?.toLongOrNull() ?: 0 bean.weight = weightStr.value?.toDoubleOrNull() ?: 0.0 diff --git a/module_gjj/src/main/res/layout/fragment_int_imp_query_waybill.xml b/module_gjj/src/main/res/layout/fragment_int_imp_query_waybill.xml index 6eed908..7f5dabd 100644 --- a/module_gjj/src/main/res/layout/fragment_int_imp_query_waybill.xml +++ b/module_gjj/src/main/res/layout/fragment_int_imp_query_waybill.xml @@ -83,7 +83,7 @@ title='@{"运单件数"}' titleLength="@{5}" type="@{DataLayoutType.INPUT}" - value='@{viewModel.maWbData.get("pc") != null ? String.valueOf((int)Math.round(((Double)viewModel.maWbData.get("pc")))) : ``}' /> + value='@{viewModel.maWbData.get("awbPc") != null ? String.valueOf((int)Math.round(((Double)viewModel.maWbData.get("awbPc")))) : ``}' /> + value='@{viewModel.maWbData.get("awbWeight") != null ? String.valueOf(viewModel.maWbData.get("awbWeight")) : ``}' />