From 8c6565d354128ae5be8e1502d49c46946be06810 Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Sun, 21 Dec 2025 11:26:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20opt=20=E5=BC=80=E5=A7=8B=E8=A3=85?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt | 1 + .../lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt index 0d04d41..f25cc0b 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt @@ -12,4 +12,5 @@ class UldInfoBean { var totalPieces: String = "" // 总件数 var totalWeight: String = "" // 总重量 var status: String = "" // 状态(旧字段,保留兼容) + var useId: Long = 0 // ULD使用ID(来自getUld接口) } 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 b1ae29f..1396ee5 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 @@ -351,6 +351,8 @@ class IntExpAssembleStartViewModel : BaseViewModel() { if (materialWeight.isEmpty()) { materialWeight = uldBean.consumeWeight?.toString() ?: "" } + // 保存useId(用于装货/卸货接口) + useId = uldBean.useId } } } @@ -442,7 +444,8 @@ class IntExpAssembleStartViewModel : BaseViewModel() { "故障" -> "1" else -> "" }, - "loadArea" to loadArea + "loadArea" to loadArea, + "useId" to uldInfo.value?.useId // 添加useId(来自getUld接口) ) // 4. 构建wbInfo(运单信息)