From b18f2cfe1fcc4fce1d6f3260a1c36ac6143a9915 Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Thu, 14 May 2026 19:47:08 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E8=BF=9B=E6=B8=AF=E8=AF=A6=E6=83=85=E9=A1=B5=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E4=B8=8E=E6=96=87=E6=A1=88?=
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>
---
 .../gjj/activity/IntImpQueryActivity.kt       |   2 +-
 ...ctivity_int_imp_pick_up_record_details.xml | 182 +++++++++---------
 .../layout/activity_int_imp_tally_details.xml |   2 +-
 .../res/layout/item_int_imp_pick_up_dlv.xml   |   8 +-
 .../res/layout/item_int_imp_storage_use.xml   |  41 ++--
 5 files changed, 119 insertions(+), 116 deletions(-)

diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryActivity.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryActivity.kt
index ecbc2bc..f10c084 100644
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryActivity.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryActivity.kt
@@ -32,7 +32,7 @@ class IntImpQueryActivity :
     override fun viewModelClass() = IntImpQueryViewModel::class.java
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("进港查询")
+        setBackArrow("国际进港查询")
 
         binding.viewModel = viewModel
 
diff --git a/module_gjj/src/main/res/layout/activity_int_imp_pick_up_record_details.xml b/module_gjj/src/main/res/layout/activity_int_imp_pick_up_record_details.xml
index 3b76623..1972a2a 100644
--- a/module_gjj/src/main/res/layout/activity_int_imp_pick_up_record_details.xml
+++ b/module_gjj/src/main/res/layout/activity_int_imp_pick_up_record_details.xml
@@ -41,34 +41,34 @@
                     android:orientation="horizontal">
 
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         enable="@{false}"
                         title='@{"运单号"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.wbNo}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{viewModel.dataBean.wbNo}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="1" />
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{false}"
                         title='@{"代理人"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.agentCode}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{viewModel.dataBean.agentCode}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="1" />
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{false}"
                         title='@{"特码"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.spCode}' />
+                        value='@{viewModel.dataBean.spCode}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
 
                 </LinearLayout>
 
@@ -80,34 +80,34 @@
                     android:orientation="horizontal">
 
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         enable="@{false}"
                         title='@{"提货编号"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.pkId}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{viewModel.dataBean.pkId}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="1" />
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{false}"
                         title='@{"件数"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.pc)}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{String.valueOf(viewModel.dataBean.pc)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="1" />
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{false}"
                         title='@{"重量"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.weight)}' />
+                        value='@{String.valueOf(viewModel.dataBean.weight)}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
 
                 </LinearLayout>
 
@@ -119,34 +119,35 @@
                     android:orientation="horizontal">
 
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         enable="@{false}"
                         title='@{"计费重量"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.cashWeight)}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{String.valueOf(viewModel.dataBean.cashWeight)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        enable="@{false}"
-                        title='@{"信息费"}'
-                        titleLength="@{7}"
-                        type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.tranCharge)}' />
+                        android:layout_weight="1" />
+
 
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         enable="@{false}"
                         title='@{"服务费"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.optCharge)}' />
+                        value='@{String.valueOf(viewModel.dataBean.optCharge)}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        enable="@{false}"
+                        title='@{"仓储费"}'
+                        titleLength="@{7}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{String.valueOf(viewModel.dataBean.whsCharge)}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
 
                 </LinearLayout>
 
@@ -158,34 +159,35 @@
                     android:orientation="horizontal">
 
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         enable="@{false}"
-                        title='@{"仓储费"}'
+                        title='@{"信息费"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.whsCharge)}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{String.valueOf(viewModel.dataBean.tranCharge)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="1" />
+
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{false}"
                         title='@{"文件处理费"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.drawBillCharge)}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{String.valueOf(viewModel.dataBean.drawBillCharge)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="1" />
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{false}"
                         title='@{"叉车费"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.svlCharge)}' />
+                        value='@{String.valueOf(viewModel.dataBean.svlCharge)}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
 
                 </LinearLayout>
 
@@ -197,34 +199,34 @@
                     android:orientation="horizontal">
 
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         enable="@{false}"
                         title='@{"理货费"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.tallyCharge)}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{String.valueOf(viewModel.dataBean.tallyCharge)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="1" />
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{false}"
                         title='@{"精密仪器处理费"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.pipFee)}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{String.valueOf(viewModel.dataBean.pipFee)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="1" />
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{false}"
                         title='@{"活体动物处理费"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.lapFee)}' />
+                        value='@{String.valueOf(viewModel.dataBean.lapFee)}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
 
                 </LinearLayout>
 
@@ -236,34 +238,34 @@
                     android:orientation="horizontal">
 
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         enable="@{false}"
                         title='@{"总费用"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.amount)}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{String.valueOf(viewModel.dataBean.amount)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="1" />
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{false}"
                         title='@{"提取时间"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.chargeTime}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{viewModel.dataBean.chargeTime}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="1" />
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{false}"
                         title='@{"办理人"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.chargeName}' />
+                        value='@{viewModel.dataBean.chargeName}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
 
                 </LinearLayout>
 
@@ -275,36 +277,36 @@
                     android:orientation="horizontal">
 
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         enable="@{false}"
                         title='@{"出库时间"}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.dlvTime}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{viewModel.dataBean.dlvTime}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:visibility="invisible"
+                        android:layout_weight="1" />
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{false}"
                         title='@{""}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{""}' />
-
-                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        value='@{""}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:visibility="invisible"
+                        android:visibility="invisible" />
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         enable="@{false}"
                         title='@{""}'
                         titleLength="@{7}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{""}' />
+                        value='@{""}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:visibility="invisible" />
 
                 </LinearLayout>
 
diff --git a/module_gjj/src/main/res/layout/activity_int_imp_tally_details.xml b/module_gjj/src/main/res/layout/activity_int_imp_tally_details.xml
index c732faf..17a15e2 100644
--- a/module_gjj/src/main/res/layout/activity_int_imp_tally_details.xml
+++ b/module_gjj/src/main/res/layout/activity_int_imp_tally_details.xml
@@ -145,7 +145,7 @@
 
                         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                             enable="@{false}"
-                            title='@{"品名(中)"}'
+                            title='@{"品名(英)"}'
                             titleLength="@{5}"
                             type="@{DataLayoutType.INPUT}"
                             value='@{viewModel.dataBean.goods}'
diff --git a/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml b/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml
index 237961f..b61ed53 100644
--- a/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml
@@ -50,7 +50,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.0"
+                    android:layout_weight="0.8"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -74,7 +74,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.6"
+                    android:layout_weight="1"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -170,7 +170,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.0"
+                    android:layout_weight="0.8"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -192,7 +192,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.6"
+                    android:layout_weight="1"
                     android:gravity="center_vertical">
 
                     <TextView
diff --git a/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml b/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml
index aa58580..133e51b 100644
--- a/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_storage_use.xml
@@ -42,10 +42,10 @@
                 <!-- 选中图标 -->
                 <ImageView
                     android:id="@+id/iv_icon"
+                    loadImage="@{bean.checked.get() ? @drawable/img_plane_s : @drawable/img_plane}"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_marginEnd="10dp"
-                    loadImage="@{bean.checked.get() ? @drawable/img_plane_s : @drawable/img_plane}"
                     android:src="@drawable/img_plane" />
 
                 <!-- 数据展示区域 -->
@@ -92,9 +92,9 @@
                             android:orientation="horizontal">
 
                             <TextView
+                                completeSpace="@{5}"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                completeSpace="@{5}"
                                 android:text="航班信息："
                                 android:textSize="15sp" />
 
@@ -114,9 +114,9 @@
                             android:orientation="horizontal">
 
                             <TextView
+                                completeSpace="@{5}"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                completeSpace="@{5}"
                                 android:text="航程："
                                 android:textSize="15sp" />
 
@@ -128,7 +128,7 @@
 
                         </LinearLayout>
 
-                        <!-- 品名(英) -->
+                        <!-- 件数 -->
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -136,18 +136,16 @@
                             android:orientation="horizontal">
 
                             <TextView
+                                completeSpace="@{5}"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                completeSpace="@{5}"
-                                android:text="品名(英)："
+                                android:text="件数："
                                 android:textSize="15sp" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:ellipsize="end"
-                                android:maxLines="1"
-                                android:text="@{bean.goods}"
+                                android:text="@{String.valueOf(bean.pc)}"
                                 android:textSize="15sp" />
 
                         </LinearLayout>
@@ -160,9 +158,9 @@
                             android:orientation="horizontal">
 
                             <TextView
+                                completeSpace="@{4}"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                completeSpace="@{4}"
                                 android:text="重量："
                                 android:textSize="15sp" />
 
@@ -191,9 +189,9 @@
                             android:orientation="horizontal">
 
                             <TextView
+                                completeSpace="@{4}"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                completeSpace="@{4}"
                                 android:text="代理人："
                                 android:textSize="15sp" />
 
@@ -205,7 +203,7 @@
 
                         </LinearLayout>
 
-                        <!-- 件数 -->
+                        <!-- 品名(英) -->
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -213,20 +211,23 @@
                             android:orientation="horizontal">
 
                             <TextView
+                                completeSpace="@{5}"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                completeSpace="@{5}"
-                                android:text="件数："
+                                android:text="品名(英)："
                                 android:textSize="15sp" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@{String.valueOf(bean.pc)}"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:text="@{bean.goods}"
                                 android:textSize="15sp" />
 
                         </LinearLayout>
 
+
                         <!-- 清仓正常否 -->
                         <LinearLayout
                             android:layout_width="0dp"
@@ -235,9 +236,9 @@
                             android:orientation="horizontal">
 
                             <TextView
+                                completeSpace="@{5}"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                completeSpace="@{5}"
                                 android:text="清仓正常："
                                 android:textSize="15sp" />
 
@@ -257,9 +258,9 @@
                             android:orientation="horizontal">
 
                             <TextView
+                                completeSpace="@{5}"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                completeSpace="@{5}"
                                 android:text="入库时间："
                                 android:textSize="15sp" />
 
@@ -279,9 +280,9 @@
                             android:orientation="horizontal">
 
                             <TextView
+                                completeSpace="@{4}"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                completeSpace="@{4}"
                                 android:text="库位数："
                                 android:textSize="15sp" />
 
@@ -302,12 +303,12 @@
             <!-- 展开/折叠按钮 -->
             <ImageView
                 android:id="@+id/iv_show"
+                visible="@{bean.storageUseList != null &amp;&amp; !bean.storageUseList.empty}"
                 android:layout_width="match_parent"
                 android:layout_height="18dp"
                 android:layout_marginBottom="5dp"
                 android:padding="4dp"
-                android:src="@mipmap/img_down"
-                visible="@{bean.storageUseList != null &amp;&amp; !bean.storageUseList.empty}" />
+                android:src="@mipmap/img_down" />
 
         </LinearLayout>