feat: 国际出港重量回填页改名并新增耗材重量
- 页面标题由「国际出港修改组装重量」改为「国际出港重量回填」 - ULD 信息卡片在货重之后新增耗材重量,取组装分页接口返回的 consumeWeight 字段,数据随列表页传入的 Bean 一并带过来 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -30,7 +30,7 @@ class GjcAssembleWeightEditActivity :
|
|||||||
override fun viewModelClass() = GjcAssembleWeightEditViewModel::class.java
|
override fun viewModelClass() = GjcAssembleWeightEditViewModel::class.java
|
||||||
|
|
||||||
override fun initOnCreate(savedInstanceState: Bundle?) {
|
override fun initOnCreate(savedInstanceState: Bundle?) {
|
||||||
setBackArrow("国际出港修改组装重量")
|
setBackArrow("国际出港重量回填")
|
||||||
|
|
||||||
binding.viewModel = viewModel
|
binding.viewModel = viewModel
|
||||||
|
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ class GjcAssembleWeightEditViewModel : BaseViewModel() {
|
|||||||
val totalPc = MutableLiveData("") // 总件数
|
val totalPc = MutableLiveData("") // 总件数
|
||||||
val totalWeight = MutableLiveData("") // 总重量
|
val totalWeight = MutableLiveData("") // 总重量
|
||||||
val cargoWeight = MutableLiveData("") // 货重
|
val cargoWeight = MutableLiveData("") // 货重
|
||||||
|
val consumeWeight = MutableLiveData("") // 耗材重量
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// 底部统计字段
|
// 底部统计字段
|
||||||
@@ -74,6 +75,7 @@ class GjcAssembleWeightEditViewModel : BaseViewModel() {
|
|||||||
totalPc.value = it.pc.toString()
|
totalPc.value = it.pc.toString()
|
||||||
totalWeight.value = it.totalWeight.toString()
|
totalWeight.value = it.totalWeight.toString()
|
||||||
cargoWeight.value = it.cargoWeight.toString()
|
cargoWeight.value = it.cargoWeight.toString()
|
||||||
|
consumeWeight.value = it.consumeWeight.toString()
|
||||||
|
|
||||||
// 保存参数用于API调用
|
// 保存参数用于API调用
|
||||||
useId = it.useId
|
useId = it.useId
|
||||||
|
|||||||
@@ -139,6 +139,29 @@
|
|||||||
android:textSize="16sp" />
|
android:textSize="16sp" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- 耗材重量 -->
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="耗材重量:"
|
||||||
|
android:textColor="@color/text_gray"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@{viewModel.consumeWeight}"
|
||||||
|
android:textColor="@color/text_normal"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user