From edb1f576b70bac6f0e18e3ea221583859289b4e4 Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Mon, 16 Mar 2026 10:59:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E8=BF=9B=E6=B8=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E8=BF=90=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9F=A5=E8=AF=A2=E5=8F=8A=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../gjj/viewModel/IntImpQueryViewModel.kt     |  4 +-
 .../res/layout/activity_int_imp_query.xml     |  8 ++-
 .../main/res/layout/item_int_imp_query.xml    | 68 +++++++++----------
 3 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt
index 859d096..17d526e 100644
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt
@@ -85,8 +85,8 @@ class IntImpQueryViewModel : BasePageViewModel() {
 
     override fun getData() {
         val listParams = mapOf(
-            "pageNum" to pageModel.page,
-            "pageSize" to pageModel.limit,
+            "page" to pageModel.page,
+            "limit" to pageModel.limit,
             "beginDate" to flightDateStart.value!!.ifEmpty { null },
             "endDate" to flightDateEnd.value!!.ifEmpty { null },
             "agentCode" to agentId.value!!.ifEmpty { null },
diff --git a/module_gjj/src/main/res/layout/activity_int_imp_query.xml b/module_gjj/src/main/res/layout/activity_int_imp_query.xml
index d269a6a..7e9fb59 100644
--- a/module_gjj/src/main/res/layout/activity_int_imp_query.xml
+++ b/module_gjj/src/main/res/layout/activity_int_imp_query.xml
@@ -78,7 +78,13 @@
                 icon="@{@drawable/img_scan}"
                 setOnIconClickListener="@{()-> viewModel.waybillScanClick()}"
                 type="@{SearchLayoutType.INPUT}"
-                value="@={viewModel.waybillNo}" />
+                value="@={viewModel.waybillNo}"
+                autoQueryEnabled="@{true}"
+                autoQueryUrl="@{`/IntImpSearch/queryWbNoList`}"
+                autoQueryParamKey="@{`wbNo`}"
+                autoQueryMinLength="@{4}"
+                autoQueryMaxLength="@{8}"
+                autoQueryTitle="@{`选择运单号`}" />
 
             <!-- 搜索和筛选按钮 -->
             <LinearLayout
diff --git a/module_gjj/src/main/res/layout/item_int_imp_query.xml b/module_gjj/src/main/res/layout/item_int_imp_query.xml
index b6fdad2..97516a8 100644
--- a/module_gjj/src/main/res/layout/item_int_imp_query.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_query.xml
@@ -32,7 +32,7 @@
             android:layout_weight="1"
             android:orientation="vertical">
 
-            <!-- 第一行：运单号、件数、重量、代理人、入库时间 -->
+            <!-- 第一行：运单号、件数、重量、代理人、航班信息 -->
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -41,7 +41,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.1"
+                    android:layout_weight="0.8"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -63,7 +63,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
+                    android:layout_weight="0.6"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -84,20 +84,20 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1"
                     android:gravity="center_vertical">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         completeSpace="@{5}"
-                        android:text="运单类型：" />
+                        android:text="重量：" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text='@{bean.awbName}'
-                        tools:text="国际进港" />
+                        android:text='@{String.valueOf(bean.awbWeight)}'
+                        tools:text="200" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -105,13 +105,13 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.0"
+                    android:layout_weight="1"
                     android:gravity="center_vertical">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{4}"
+                        completeSpace="@{5}"
                         android:text="代理人：" />
 
                     <TextView
@@ -122,61 +122,61 @@
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
-                <!-- 入库时间 -->
+                <!-- 航班信息 -->
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1.0"
                     android:gravity="center_vertical">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         completeSpace="@{5}"
-                        android:text="入库时间：" />
+                        android:text="航班信息：" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text='@{bean.inDate}'
-                        tools:text="2024-05-13 17:10:22" />
+                        android:text='@{bean.flight}'
+                        tools:text="20240216/MU2026" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
-            <!-- 第二行：航班、件数（入库）、重量（运单）、航程、出库时间 -->
+            <!-- 第二行：航程、特码、运单类型、入库时间、出库时间 -->
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp">
 
-                <!-- 航班 -->
+                <!-- 航程 -->
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.1"
+                    android:layout_weight="0.8"
                     android:gravity="center_vertical">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         completeSpace="@{4}"
-                        android:text="航班：" />
+                        android:text="航程：" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{bean.flight}"
-                        tools:text="20240513/MU2026" />
+                        android:text="@{bean.range}"
+                        tools:text="LAX-HFE" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
-                <!-- 入库件数 -->
+                <!-- 特码 -->
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
+                    android:layout_weight="0.6"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -193,45 +193,45 @@
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
-                <!-- 运单重量 -->
+                <!-- 运单类型 -->
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1"
                     android:gravity="center_vertical">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         completeSpace="@{5}"
-                        android:text="业务类型：" />
+                        android:text="运单类型：" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text='@{bean.businessName}'
-                        tools:text="普货" />
+                        android:text='@{bean.awbName}'
+                        tools:text="国际进港" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
-                <!-- 航程 -->
+                <!-- 入库时间 -->
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.0"
+                    android:layout_weight="1"
                     android:gravity="center_vertical">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{4}"
-                        android:text="目的地：" />
+                        completeSpace="@{5}"
+                        android:text="入库时间：" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{bean.dest}"
-                        tools:text="HFE" />
+                        android:text='@{bean.inDate}'
+                        tools:text="2024-05-13 17:10:22" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -239,7 +239,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1.0"
                     android:gravity="center_vertical">
 
                     <TextView