From d26f1647361217a8707a4b30214806278823737b Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Thu, 5 Feb 2026 17:23:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=80=E5=A7=8B=E7=BB=84=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lukouguoji/module_base/bean/AssemblePositionBean.kt  | 1 +
 .../lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt | 5 +++++
 module_gjc/src/main/res/layout/item_gjc_weighing_record.xml  | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/AssemblePositionBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/AssemblePositionBean.kt
index 200bd58..79850fe 100644
--- a/module_base/src/main/java/com/lukouguoji/module_base/bean/AssemblePositionBean.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/AssemblePositionBean.kt
@@ -4,6 +4,7 @@ package com.lukouguoji.module_base.bean
  * 组装位置Bean
  */
 class AssemblePositionBean {
+    var positionCode: String = ""   // 位置编码/ID
     var positionName: String = ""   // 位置名称
     var isSelected: Boolean = false // 是否选中
 }
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt
index 81710ca..0417d6d 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt
@@ -145,6 +145,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
             onSuccess = { result ->
                 val list = result.data?.mapIndexed { index, dictBean ->
                     AssemblePositionBean().apply {
+                        positionCode = dictBean.code  // 保存位置编码/ID
                         positionName = dictBean.name
                         isSelected = (index == 0)  // 默认选中第一项
                     }
@@ -569,6 +570,8 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
             return
         }
 
+        val loadAreaId = selectedPosition.value?.positionCode?.trim() ?: ""
+
         // 2. 构建useInfo（ULD信息）
         val useInfo = mapOf(
             "uld" to uldNo,
@@ -579,6 +582,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
                 else -> ""
             },
             "loadArea" to loadArea,
+            "loadAreaId" to loadAreaId.ifEmpty { null },  // 组装位置ID
             "useId" to if (uldInfo.value?.useId == 0L) null else uldInfo.value?.useId  // 添加useId（来自getUld接口）
         )
 
@@ -644,6 +648,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
             "consumeWeight" to materialWeight.toDoubleOrNull(),
             "ldId" to operatorValue,
             "loadArea" to loadArea,
+            "loadAreaId" to loadAreaId.ifEmpty { null },  // 组装位置ID
             "useInfo" to useInfo,
             "wbInfo" to wbInfo,
             "userId" to SharedPreferenceUtil.getString(Constant.Share.account)
diff --git a/module_gjc/src/main/res/layout/item_gjc_weighing_record.xml b/module_gjc/src/main/res/layout/item_gjc_weighing_record.xml
index 51cd0e8..eeb1171 100644
--- a/module_gjc/src/main/res/layout/item_gjc_weighing_record.xml
+++ b/module_gjc/src/main/res/layout/item_gjc_weighing_record.xml
@@ -170,7 +170,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text='@{bean.agentName}'
+                        android:text='@{bean.agentCode}'
                         tools:text="顺丰" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>