diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcAssembleWeightEditActivity.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcAssembleWeightEditActivity.kt index 423070d..667f424 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcAssembleWeightEditActivity.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcAssembleWeightEditActivity.kt @@ -30,7 +30,7 @@ class GjcAssembleWeightEditActivity : override fun viewModelClass() = GjcAssembleWeightEditViewModel::class.java override fun initOnCreate(savedInstanceState: Bundle?) { - setBackArrow("国际出港修改组装重量") + setBackArrow("国际出港重量回填") binding.viewModel = viewModel 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 1f4e290..9df932d 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 @@ -38,6 +38,7 @@ class GjcAssembleWeightEditViewModel : BaseViewModel() { val totalPc = MutableLiveData("") // 总件数 val totalWeight = MutableLiveData("") // 总重量 val cargoWeight = MutableLiveData("") // 货重 + val consumeWeight = MutableLiveData("") // 耗材重量 /////////////////////////////////////////////////////////////////////////// // 底部统计字段 @@ -74,6 +75,7 @@ class GjcAssembleWeightEditViewModel : BaseViewModel() { totalPc.value = it.pc.toString() totalWeight.value = it.totalWeight.toString() cargoWeight.value = it.cargoWeight.toString() + consumeWeight.value = it.consumeWeight.toString() // 保存参数用于API调用 useId = it.useId diff --git a/module_gjc/src/main/res/layout/activity_gjc_assemble_weight_edit.xml b/module_gjc/src/main/res/layout/activity_gjc_assemble_weight_edit.xml index 987e009..4297510 100644 --- a/module_gjc/src/main/res/layout/activity_gjc_assemble_weight_edit.xml +++ b/module_gjc/src/main/res/layout/activity_gjc_assemble_weight_edit.xml @@ -139,6 +139,29 @@ android:textSize="16sp" /> + + + + + + + +