From a64b963d03c67582ecec962370dc3cc08dcaede7 Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Thu, 12 Mar 2026 17:49:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E8=BF=9B=E6=B8=AF?=
 =?UTF-8?q?=E8=88=B1=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
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>
---
 app/src/main/AndroidManifest.xml              |   7 +
 .../module_base/router/ARouterConstants.kt    |   1 +
 .../activity/IntImpManifestDetailsActivity.kt |  39 +++
 .../gjj/holder/IntImpManifestViewHolder.kt    |   3 +
 .../IntImpManifestDetailsViewModel.kt         |  26 ++
 .../gjj/viewModel/IntImpManifestViewModel.kt  |   8 +-
 .../activity_int_imp_manifest_details.xml     | 293 ++++++++++++++++++
 .../main/res/layout/item_int_imp_manifest.xml |   1 +
 8 files changed, 377 insertions(+), 1 deletion(-)
 create mode 100644 module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpManifestDetailsActivity.kt
 create mode 100644 module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestDetailsViewModel.kt
 create mode 100644 module_gjj/src/main/res/layout/activity_int_imp_manifest_details.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 98337de..955b3ce 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -425,6 +425,13 @@
             android:exported="false"
             android:screenOrientation="userLandscape" />
 
+        <!-- 国际进港-进港舱单详情 -->
+        <activity
+            android:name="com.lukouguoji.gjj.activity.IntImpManifestDetailsActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="false"
+            android:screenOrientation="userLandscape" />
+
         <!-- 国际进港-装机单（分拣理货） -->
         <activity
             android:name="com.lukouguoji.gjj.activity.IntImpLoadingListActivity"
diff --git a/module_base/src/main/java/com/lukouguoji/module_base/router/ARouterConstants.kt b/module_base/src/main/java/com/lukouguoji/module_base/router/ARouterConstants.kt
index 718d3c8..d2c53de 100644
--- a/module_base/src/main/java/com/lukouguoji/module_base/router/ARouterConstants.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/router/ARouterConstants.kt
@@ -175,6 +175,7 @@ object ARouterConstants {
     const val ACTIVITY_URL_INT_ARR_AIR_MANIFEST_DETAILS = "/gjj/IntArrAirManifestDetailsActivity"   //国际进港 原始舱单详情
     const val ACTIVITY_URL_INT_ARR_SUPPLEMENT_INFO = "/gjj/IntArrSupplementInfoActivity"   //国际进港 补充信息
     const val ACTIVITY_URL_INT_IMP_MANIFEST = "/gjj/IntImpManifestActivity"   //国际进港 进港舱单
+    const val ACTIVITY_URL_INT_IMP_MANIFEST_DETAILS = "/gjj/IntImpManifestDetailsActivity"   //国际进港 进港舱单详情
     const val ACTIVITY_URL_INT_IMP_LOADING_LIST = "/gjj/IntImpLoadingListActivity"   //国际进港 装机单（分拣理货）
     const val ACTIVITY_URL_INT_IMP_TALLY = "/gjj/IntImpTallyActivity"   //国际进港 理货报告
     const val ACTIVITY_URL_INT_IMP_PICK_UP_DLV = "/gjj/IntImpPickUpDLVActivity"   //国际进港 提取出库
diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpManifestDetailsActivity.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpManifestDetailsActivity.kt
new file mode 100644
index 0000000..14f3fd7
--- /dev/null
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpManifestDetailsActivity.kt
@@ -0,0 +1,39 @@
+package com.lukouguoji.gjj.activity
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.lukouguoji.gjj.R
+import com.lukouguoji.gjj.databinding.ActivityIntImpManifestDetailsBinding
+import com.lukouguoji.gjj.viewModel.IntImpManifestDetailsViewModel
+import com.lukouguoji.module_base.base.BaseBindingActivity
+import com.lukouguoji.module_base.bean.GjjManifest
+import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.router.ARouterConstants
+
+/**
+ * 国际进港舱单详情
+ */
+@Route(path = ARouterConstants.ACTIVITY_URL_INT_IMP_MANIFEST_DETAILS)
+class IntImpManifestDetailsActivity :
+    BaseBindingActivity<ActivityIntImpManifestDetailsBinding, IntImpManifestDetailsViewModel>() {
+
+    override fun layoutId() = R.layout.activity_int_imp_manifest_details
+    override fun viewModelClass() = IntImpManifestDetailsViewModel::class.java
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        setBackArrow("进港舱单详情")
+        binding.viewModel = viewModel
+        viewModel.initOnCreated(intent)
+    }
+
+    companion object {
+        @JvmStatic
+        fun start(context: Context, manifest: GjjManifest) {
+            val starter = Intent(context, IntImpManifestDetailsActivity::class.java)
+                .putExtra(Constant.Key.DATA, manifest)
+            context.startActivity(starter)
+        }
+    }
+}
diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt
index 95c73a5..1ae3949 100644
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpManifestViewHolder.kt
@@ -30,6 +30,9 @@ class IntImpManifestViewHolder(view: View) :
             binding.rvSub.adapter?.notifyDataSetChanged()
         }
 
+        // 整卡点击 - 跳转详情页
+        notifyItemClick(position, binding.llContent)
+
         // 编辑按钮点击
         binding.btnEdit.setOnClickListener {
             clickListener?.onItemClick(position, 101)  // 101=编辑
diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestDetailsViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestDetailsViewModel.kt
new file mode 100644
index 0000000..f01415e
--- /dev/null
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestDetailsViewModel.kt
@@ -0,0 +1,26 @@
+package com.lukouguoji.gjj.viewModel
+
+import android.content.Intent
+import androidx.lifecycle.MutableLiveData
+import com.lukouguoji.module_base.base.BaseViewModel
+import com.lukouguoji.module_base.bean.GjjManifest
+import com.lukouguoji.module_base.common.Constant
+
+/**
+ * 国际进港舱单详情 ViewModel
+ */
+class IntImpManifestDetailsViewModel : BaseViewModel() {
+
+    // 舱单数据
+    val dataBean = MutableLiveData(GjjManifest())
+
+    /**
+     * 初始化数据（从列表项携带的数据）
+     */
+    fun initOnCreated(intent: Intent) {
+        val manifest = intent.getSerializableExtra(Constant.Key.DATA) as? GjjManifest
+        if (manifest != null) {
+            dataBean.value = manifest
+        }
+    }
+}
diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt
index afc18c7..a30391d 100644
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt
@@ -258,7 +258,7 @@ class IntImpManifestViewModel : BasePageViewModel() {
     }
 
     /**
-     * Item点击处理（侧滑按钮）
+     * Item点击处理（侧滑按钮 + 列表项点击）
      */
     override fun onItemClick(position: Int, type: Int) {
         val bean = pageModel.rv?.commonAdapter()?.getItem(position) as? GjjManifest ?: return
@@ -280,6 +280,12 @@ class IntImpManifestViewModel : BasePageViewModel() {
                 // 展开 - 加载分单数据
                 loadHaWbList(bean)
             }
+            else -> {
+                // 列表项点击 - 跳转详情页
+                com.lukouguoji.gjj.activity.IntImpManifestDetailsActivity.start(
+                    getTopActivity(), bean
+                )
+            }
         }
     }
 
diff --git a/module_gjj/src/main/res/layout/activity_int_imp_manifest_details.xml b/module_gjj/src/main/res/layout/activity_int_imp_manifest_details.xml
new file mode 100644
index 0000000..9921cd6
--- /dev/null
+++ b/module_gjj/src/main/res/layout/activity_int_imp_manifest_details.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <import type="com.lukouguoji.module_base.ui.weight.data.layout.DataLayoutType" />
+
+        <variable
+            name="viewModel"
+            type="com.lukouguoji.gjj.viewModel.IntImpManifestDetailsViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_f2"
+        android:orientation="vertical">
+
+        <!-- 标题栏 -->
+        <include layout="@layout/title_tool_bar" />
+
+        <!-- 内容区域 -->
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:padding="10dp">
+
+            <!-- 白色圆角卡片 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_white_radius_8"
+                android:orientation="vertical"
+                android:padding="15dp">
+
+                <!-- 第1行：运单号、代理、特码 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        enable="@{false}"
+                        title='@{"运单号"}'
+                        titleLength="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{viewModel.dataBean.wbNo}'
+                        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="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{viewModel.dataBean.agentName}'
+                        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="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{viewModel.dataBean.spCode}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
+
+                </LinearLayout>
+
+                <!-- 第2行：始发港、目的港、运单类型 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal">
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        enable="@{false}"
+                        title='@{"始发港"}'
+                        titleLength="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{viewModel.dataBean.origin}'
+                        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="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{viewModel.dataBean.dest}'
+                        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="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{viewModel.dataBean.awbTypeName}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
+
+                </LinearLayout>
+
+                <!-- 第3行：总件数、实到件数、实到重量 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal">
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        enable="@{false}"
+                        title='@{"总件数"}'
+                        titleLength="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{String.valueOf(viewModel.dataBean.totalPc)}'
+                        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="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{String.valueOf(viewModel.dataBean.pc)}'
+                        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="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{String.valueOf(viewModel.dataBean.weight)}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
+
+                </LinearLayout>
+
+                <!-- 第4行：计费重量、品名(中)、品名(英) -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal">
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        enable="@{false}"
+                        title='@{"计费重量"}'
+                        titleLength="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{String.valueOf(viewModel.dataBean.cashWeight)}'
+                        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="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{viewModel.dataBean.goodsCn}'
+                        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="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{viewModel.dataBean.goods}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
+
+                </LinearLayout>
+
+                <!-- 第5行：包装类型、业务类型、UN编号 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal">
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        enable="@{false}"
+                        title='@{"包装类型"}'
+                        titleLength="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{viewModel.dataBean.packageType}'
+                        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="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{viewModel.dataBean.businessType}'
+                        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='@{"UN编号"}'
+                        titleLength="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{viewModel.dataBean.unNumber}'
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
+
+                </LinearLayout>
+
+                <!-- 第6行：备注（全宽） -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal">
+
+                    <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                        enable="@{false}"
+                        title='@{"备注"}'
+                        titleLength="@{5}"
+                        type="@{DataLayoutType.INPUT}"
+                        value='@{viewModel.dataBean.remark}'
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                </LinearLayout>
+
+                <!-- 第7行：交接图片（预留位置） -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        completeSpace="@{5}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:text="交接图片"
+                        android:textColor="@color/text_gray"
+                        android:textSize="14sp" />
+
+                    <LinearLayout
+                        android:id="@+id/ll_images"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="14dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:minHeight="80dp"
+                        android:orientation="horizontal">
+
+                        <!-- 交接图片区域预留，后续对接图片数据 -->
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="暂无图片"
+                            android:textColor="@color/text_gray"
+                            android:textSize="12sp" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+</layout>
diff --git a/module_gjj/src/main/res/layout/item_int_imp_manifest.xml b/module_gjj/src/main/res/layout/item_int_imp_manifest.xml
index 190e5d8..543c902 100644
--- a/module_gjj/src/main/res/layout/item_int_imp_manifest.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_manifest.xml
@@ -37,6 +37,7 @@
 
                 <!-- 主内容区 -->
                 <LinearLayout
+                    android:id="@+id/ll_content"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"