From 2d42ce9cc384821c7afff9c38a58670e39e9d2b8 Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Fri, 28 Aug 2026 16:46:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E5=87=BA=E6=B8=AF?=
 =?UTF-8?q?=E9=87=8D=E9=87=8F=E5=9B=9E=E5=A1=AB=E9=A1=B5=E6=94=B9=E5=90=8D?=
 =?UTF-8?q?=E5=B9=B6=E6=96=B0=E5=A2=9E=E8=80=97=E6=9D=90=E9=87=8D=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 页面标题由「国际出港修改组装重量」改为「国际出港重量回填」
- ULD 信息卡片在货重之后新增耗材重量，取组装分页接口返回的
  consumeWeight 字段，数据随列表页传入的 Bean 一并带过来

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../activity/GjcAssembleWeightEditActivity.kt |  2 +-
 .../GjcAssembleWeightEditViewModel.kt         |  2 ++
 .../activity_gjc_assemble_weight_edit.xml     | 23 +++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

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" />
                 </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>