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")) : ``}' />