From b8fbc304f1e22d48ad4af780311f15142d3ff613 Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Thu, 18 Dec 2025 16:34:06 +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

---
 .../gjc/viewModel/IntExpAssembleStartViewModel.kt  | 14 ++++++++++++--
 .../res/layout/activity_int_exp_assemble_start.xml |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

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 ecfba79..4bdb882 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
@@ -76,6 +76,11 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
      */
     private var editMode: Pair<String, String>? = null  // Pair<ULD编号, 运单号>
 
+    /**
+     * ULD编号锁定状态
+     */
+    val isUldNoLocked = MutableLiveData(false)
+
 
     /**
      * 加载组装位置列表
@@ -150,9 +155,10 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
                 previousAssembleCount = ""
                 previousAssembleWeight = ""
 
-                // 如果在编辑模式，退出编辑模式
+                // 如果在编辑模式，退出编辑模式并解锁 ULD
                 if (editMode != null) {
                     editMode = null
+                    isUldNoLocked.value = false
                 }
             } else {
                 // 同一个运单：保留组装件数和组装重量
@@ -701,7 +707,10 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
             operator = previousOperator  // 保留之前选择的组装人
         }
 
-        // 3. 标记编辑模式（存储原始 ULD 编号和运单号）
+        // 3. 锁定 ULD 编号
+        isUldNoLocked.value = true
+
+        // 4. 标记编辑模式（存储原始 ULD 编号和运单号）
         editMode = Pair(item.parentUldNo, waybill.waybillNo)
 
         // 5. 查询 ULD 信息（如果需要）
@@ -813,6 +822,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
         waybillInfo.value = WaybillInfoBean().apply {
             operator = previousOperator  // 恢复组装人
         }
+        isUldNoLocked.value = false
         editMode = null
     }
 }
diff --git a/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml b/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml
index 4d1f8ea..8ae876b 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml
@@ -249,6 +249,7 @@
 
                         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                             android:id="@+id/uldNoInput"
+                            enable="@{!viewModel.isUldNoLocked}"
                             required="@{false}"
                             setRefreshCallBack="@{viewModel::onUldNoInputComplete}"
                             title='@{"ULD编号："}'