From 2949f5980022c610c782b57befcd5ad18052df96 Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Tue, 19 May 2026 14:49:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9D=BF=E7=AE=B1=E8=BF=87=E7=A3=85?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89=E9=A1=B9=E7=9B=AE=E7=9A=84?=
 =?UTF-8?q?=E7=AB=99=E6=94=B9=E4=B8=BA=E8=BF=87=E7=A3=85=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .claude/settings.local.json                        |  3 ++-
 .../gjc/viewModel/GjcBoxWeighingViewModel.kt       | 14 +++++++++++---
 .../main/res/layout/activity_gjc_box_weighing.xml  |  9 +++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index e31dcf2..8e01db9 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -138,7 +138,8 @@
       "Bash(sed -i '' '/@Deprecated\\(\"旧版国内出港收运开始，使用 GncShouYunUnListActivity 替代\"\\)/d' /Users/kid/Development/Fusion/Projects/aerologic-app/module_gnc/src/main/java/com/lukouguoji/gnc/activity/GoutStartCotActivity.kt)",
       "Bash(cp \"/Users/kid/Downloads/Desktop/进港舱单.png\" /Users/kid/Development/Fusion/Projects/aerologic-app/module_gjj/src/main/res/mipmap-mdpi/gjj_jin_gang_cang_dan_icon.png)",
       "Bash(cp \"/Users/kid/Downloads/Desktop/原始舱单.png\" /Users/kid/Development/Fusion/Projects/aerologic-app/module_gjj/src/main/res/mipmap-mdpi/gjj_yuan_shi_cang_dan_icon.png)",
-      "Bash(cp \"/Users/kid/Downloads/Desktop/提取记录.png\" /Users/kid/Development/Fusion/Projects/aerologic-app/module_gjj/src/main/res/mipmap-mdpi/gjj_ti_qu_ji_lu_icon.png)"
+      "Bash(cp \"/Users/kid/Downloads/Desktop/提取记录.png\" /Users/kid/Development/Fusion/Projects/aerologic-app/module_gjj/src/main/res/mipmap-mdpi/gjj_ti_qu_ji_lu_icon.png)",
+      "mcp__api-doc__get_project_overview"
     ],
     "deny": [],
     "ask": []
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt
index af1cb08..b3ae37e 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt
@@ -17,6 +17,7 @@ import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.BluetoothDialogModel
 import com.lukouguoji.module_base.model.ScanModel
 import com.lukouguoji.module_base.util.PrinterUtils
+import dev.utils.app.info.KeyValue
 import dev.utils.common.DateUtils
 import com.lukouguoji.module_base.ktx.formatDate
 
@@ -28,7 +29,14 @@ class GjcBoxWeighingViewModel : BasePageViewModel() {
     // 搜索条件
     val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())           // 航班日期
     val flightNo = MutableLiveData("")             // 航班号
-    val dest = MutableLiveData("")                 // 目的站
+    val wtStatus = MutableLiveData("")             // 过磅状态（""=全部 / "0"=未过磅 / "1"=已过磅）
+    val wtStatusList = MutableLiveData(            // 过磅状态选项
+        listOf(
+            KeyValue("全部", ""),
+            KeyValue("未过磅", "0"),
+            KeyValue("已过磅", "1")
+        )
+    )
     val carId = MutableLiveData("")                // 架子车号
     val uld = MutableLiveData("")                  // ULD编号
 
@@ -111,7 +119,7 @@ class GjcBoxWeighingViewModel : BasePageViewModel() {
             "pageSize" to pageModel.limit,
             "fdate" to flightDate.value!!.ifEmpty { null },
             "fno" to flightNo.value!!.ifEmpty { null },
-            "fdest" to dest.value!!.ifEmpty { null },
+            "wtStatus" to wtStatus.value!!.ifEmpty { null },
             "carId" to carId.value!!.ifEmpty { null },
             "uld" to uld.value!!.ifEmpty { null },
         ).toRequestBody()
@@ -120,7 +128,7 @@ class GjcBoxWeighingViewModel : BasePageViewModel() {
         val totalParams = mapOf(
             "fdate" to flightDate.value!!.ifEmpty { null },
             "fno" to flightNo.value!!.ifEmpty { null },
-            "fdest" to dest.value!!.ifEmpty { null },
+            "wtStatus" to wtStatus.value!!.ifEmpty { null },
             "carId" to carId.value!!.ifEmpty { null },
             "uld" to uld.value!!.ifEmpty { null },
         ).toRequestBody()
diff --git a/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml b/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml
index d364ae4..614c1b1 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml
@@ -49,14 +49,15 @@
                 value="@={viewModel.flightNo}"
                 setUpperCaseAlphanumeric="@{true}" />
 
-            <!-- 目的站 -->
+            <!-- 过磅状态 -->
             <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                hint='@{"请输入目的站"}'
-                type="@{SearchLayoutType.INPUT}"
-                value="@={viewModel.dest}" />
+                hint='@{"请选择过磅状态"}'
+                list="@{viewModel.wtStatusList}"
+                type="@{SearchLayoutType.SPINNER}"
+                value="@={viewModel.wtStatus}" />
 
             <!-- 架子车号 -->
             <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout