From 0531f5e0c463ed0a7c4d3e3f34de4dba0fc52c52 Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Mon, 15 Dec 2025 14:25:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20opt=20=E5=87=BA=E5=BA=93=E4=BA=A4?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module_base/bean/GjcUldUseBean.kt          |  4 ++++
 .../gjc/viewModel/IntExpArriveViewModel.kt     |  1 -
 .../viewModel/IntExpOutHandoverViewModel.kt    |  2 --
 .../gjc/viewModel/IntExpTallyViewModel.kt      |  1 -
 .../layout/activity_int_exp_out_handover.xml   |  9 ---------
 .../res/layout/item_int_exp_out_handover.xml   | 18 +++++++++---------
 6 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt
index 7a2ced7..f609a51 100644
--- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt
@@ -26,6 +26,10 @@ class GjcUldUseBean {
     var fdest: String = ""              // 目的港
     var fClose: String = ""             // 航班关闭时间
 
+    // 格式化后的航班日期(只保留年月日)
+    val fdateFormatted: String
+        get() = if (fdate.contains(" ")) fdate.split(" ")[0] else fdate
+
     var wtId: String = ""               // 过磅人ID
     var wtUsername: String = ""         // 过磅人
     var wtDate: String = ""             // 过磅时间
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
index 7d8d1dc..35a1b82 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
@@ -18,7 +18,6 @@ import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
-import dev.utils.app.info.KeyValue
 import kotlinx.coroutines.launch
 
 /**
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpOutHandoverViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpOutHandoverViewModel.kt
index db38d65..e3b9e52 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpOutHandoverViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpOutHandoverViewModel.kt
@@ -32,7 +32,6 @@ class IntExpOutHandoverViewModel : BasePageViewModel() {
 
     // ========== 统计信息 ==========
     val totalCount = MutableLiveData("0")       // 合计票数
-    val totalPc = MutableLiveData("0")          // 总件数
     val totalWeight = MutableLiveData("0")      // 总重量
 
     // ========== 全选状态 ==========
@@ -135,7 +134,6 @@ class IntExpOutHandoverViewModel : BasePageViewModel() {
             onSuccess = { result ->
                 val data = result.data
                 totalCount.value = (data?.wbNumber ?: 0).toString()
-                totalPc.value = (data?.totalPc ?: 0).toString()
                 totalWeight.value = (data?.totalWeight ?: 0.0).toString()
             }
         }
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt
index 93516f0..770cf31 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt
@@ -19,7 +19,6 @@ import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
-import dev.utils.app.info.KeyValue
 import kotlinx.coroutines.launch
 
 /**
diff --git a/module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml b/module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml
index 9b93349..d5384a5 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml
@@ -160,15 +160,6 @@
                     android:textSize="18sp"
                     android:textStyle="bold" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="20dp"
-                    android:text='@{"总件数："+viewModel.totalPc}'
-                    android:textColor="@color/bottom_tool_tips_text_color"
-                    android:textSize="18sp"
-                    android:textStyle="bold" />
-
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/module_gjc/src/main/res/layout/item_int_exp_out_handover.xml b/module_gjc/src/main/res/layout/item_int_exp_out_handover.xml
index ce3458b..4267ca7 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_out_handover.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_out_handover.xml
@@ -52,7 +52,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.5"
+                    android:layout_weight="1.2"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -103,14 +103,14 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="0.8"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{3}"
+                        completeSpace="@{4}"
                         android:text="总重："
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />
@@ -160,7 +160,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{3}"
+                        completeSpace="@{5}"
                         android:text="货重："
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />
@@ -188,7 +188,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.5"
+                    android:layout_weight="1.2"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -203,7 +203,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{bean.fdate}"
+                        android:text="@{bean.fdateFormatted}"
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />
 
@@ -220,7 +220,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{4}"
+                        completeSpace="@{5}"
                         android:text="航班号："
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />
@@ -238,7 +238,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="0.8"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -270,7 +270,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        completeSpace="@{4}"
+                        completeSpace="@{5}"
                         android:text="交接人："
                         android:textColor="@color/text_normal"
                         android:textSize="16sp" />