From f6e5b37eaab860e11acea3c32d53915378a9fbd8 Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Fri, 11 Sep 2026 15:53:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E8=BF=9B=E6=B8=AF?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=89=B9=E7=A0=81=E7=AD=9B=E9=80=89=E7=94=B1?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E6=94=B9=E4=B8=BA=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=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.1 <noreply@anthropic.com>
---
 .../gjj/activity/IntImpPickUpDLVActivity.kt   |  3 ++-
 .../gjj/viewModel/IntImpPickUpDLVViewModel.kt | 26 +++++++++++--------
 .../layout/activity_int_imp_pick_up_dlv.xml   |  7 +++--
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpDLVActivity.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpDLVActivity.kt
index c8fe4e8..dd97ed4 100644
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpDLVActivity.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpDLVActivity.kt
@@ -38,8 +38,9 @@ class IntImpPickUpDLVActivity :
             viewModel.refresh()
         }
 
-        // 初始化代理人列表
+        // 初始化代理人、特码下拉列表
         viewModel.initAgentList()
+        viewModel.initSpecialCodeList()
 
         // 初始加载数据
         viewModel.refresh()
diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt
index c1f6d7b..17175b7 100644
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt
@@ -20,6 +20,7 @@ import com.lukouguoji.module_base.ktx.formatDate
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ConfirmDialogModel
 import com.lukouguoji.module_base.model.ScanModel
+import com.lukouguoji.module_base.util.DictUtils
 import dev.utils.app.info.KeyValue
 import dev.utils.common.DateUtils
 import kotlinx.coroutines.launch
@@ -38,6 +39,7 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() {
 
     // ========== 下拉列表数据源 ==========
     val agentList = MutableLiveData(listOf(KeyValue("全部", "")))
+    val spCodeList = MutableLiveData<List<KeyValue>>(emptyList())
 
     // ========== 统计信息 ==========
     val totalCount = MutableLiveData("0")        // 合计票数
@@ -75,6 +77,19 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() {
         }
     }
 
+    /**
+     * 初始化特码列表（与国际进港查询筛选栏一致：国际、不区分进出港）
+     */
+    fun initSpecialCodeList() {
+        DictUtils.getSpecialCodeList(
+            flag = 1,
+            ieFlag = "",
+            parentcode = ""
+        ) {
+            spCodeList.value = it
+        }
+    }
+
     /**
      * 搜索按钮点击
      */
@@ -89,13 +104,6 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() {
         ScanModel.startScan(getTopActivity(), Constant.RequestCode.WAYBILL)
     }
 
-    /**
-     * 扫码特码
-     */
-    fun scanSpCode() {
-        ScanModel.startScan(getTopActivity(), Constant.RequestCode.gnj_chu_ku_list)
-    }
-
     /**
      * 全选按钮点击
      */
@@ -181,10 +189,6 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() {
                     wbNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
                     refresh()
                 }
-                Constant.RequestCode.gnj_chu_ku_list -> {
-                    spCode.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
-                    refresh()
-                }
             }
         }
     }
diff --git a/module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml b/module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml
index b50335f..71bf416 100644
--- a/module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml
+++ b/module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml
@@ -78,10 +78,9 @@
 
             <!-- 特码 -->
             <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
-                hint='@{"请输入特码"}'
-                icon="@{@drawable/img_scan}"
-                setOnIconClickListener="@{(v)-> viewModel.scanSpCode()}"
-                type="@{SearchLayoutType.INPUT}"
+                hint='@{"请选择特码"}'
+                list="@{viewModel.spCodeList}"
+                type="@{SearchLayoutType.SPINNER}"
                 value="@={viewModel.spCode}"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"