From 86f77353c07fd3b10d3df69165a4a384a0001e95 Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Wed, 2 Sep 2026 10:44:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E5=87=BA=E6=B8=AF?=
 =?UTF-8?q?=E6=9D=BF=E7=AE=B1=E8=BF=87=E7=A3=85=E9=80=9A=E9=81=93=E5=8F=B7?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=B2=BF=E7=94=A8=E4=B8=8A=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

称重提交成功后本地记住通道号，后续新增称重自动默认选中；
重置时不再清空通道号，编辑模式仍按记录自带通道号回填。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../gjc/viewModel/GjcBoxWeighingAddViewModel.kt | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt
index 4a074e7..29bcb18 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt
@@ -20,6 +20,7 @@ import com.lukouguoji.module_base.ktx.noNull
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.ktx.verifyNullOrEmpty
+import com.lukouguoji.module_base.db.perference.SharedPreferenceUtil
 import com.lukouguoji.module_base.model.BluetoothDialogModel
 import com.lukouguoji.module_base.model.ScanModel
 import com.lukouguoji.module_base.util.Common
@@ -34,6 +35,11 @@ import java.util.Date
  */
 class GjcBoxWeighingAddViewModel : BaseViewModel() {
 
+    companion object {
+        // 记录上一次称重完成时使用的通道号，后续称重默认选中
+        private const val KEY_LAST_PASSAGEWAY_ID = "gjc_box_weighing_last_passageway_id"
+    }
+
     // 数据Bean
     val dataBean = MutableLiveData(GjcUldUseBean())
 
@@ -117,7 +123,9 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() {
             loadPassagewayList(editBean.passagewayId)
             loadPlCloseList(editBean.plClose)
         } else {
-            loadPassagewayList(null)
+            // 新增模式：默认选中上一次称重使用的通道号
+            val lastPassagewayId = SharedPreferenceUtil.getString(KEY_LAST_PASSAGEWAY_ID)
+            loadPassagewayList(lastPassagewayId.ifEmpty { null })
             loadPlCloseList(null)
         }
     }
@@ -338,7 +346,7 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() {
         netWeight.value = "0"
         cargoWeight.value = "0"
         consumeWeight.value = "0"
-        channel.value = ""
+        // 通道号不清空：保留当前选择，与 Spinner 显示保持一致，后续称重沿用上一次的通道号
         printTag.value = false
 
         // 重置独立字段
@@ -441,6 +449,11 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() {
                 if (result.verifySuccess()) {
                     showToast("完成复磅")
 
+                    // 记住本次使用的通道号，后续称重默认选中
+                    if (bean.passagewayId.isNotEmpty()) {
+                        SharedPreferenceUtil.addString(KEY_LAST_PASSAGEWAY_ID, bean.passagewayId)
+                    }
+
                     // 如果勾选了打印挂签，则执行打印
                     if (printTag.value == true) {
                         executePrint()