feat: 国际出港理货报告

2025-12-30 12:34:03 +08:00
parent ca35757864
commit 04c3c08952
12 changed files with 849 additions and 1 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -400,6 +400,13 @@
            android:exported="false"
            android:screenOrientation="userLandscape" />

+        <!-- 国际进港-理货报告 -->
+        <activity
+            android:name="com.lukouguoji.gjj.activity.IntImpTallyActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="false"
+            android:screenOrientation="userLandscape" />
+
        <service android:name="com.huitao.printer.service.PrinterService" />
        <service android:name="com.lukouguoji.gnc.bluetooth.service.AncillaryService" />
        <service android:name="com.lukouguoji.gnc.bluetooth.service.MyService" />
--- a/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt
+++ b/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt
@@ -442,6 +442,13 @@ class HomeFragment : Fragment() {
                        ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_INT_IMP_MANIFEST)
                            .navigation()
                    }
+
+                    // 理货报告
+                    Constant.AuthName.IntImpTally -> {
+                        ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_INT_IMP_TALLY)
+                            .navigation()
+                    }
+
                    /**
                     * 航班查询
                     */
@@ -786,6 +793,13 @@ class HomeFragment : Fragment() {
                        "进港舱单"
                    )
                )
+                list.add(
+                    RightMenu(
+                        Constant.AuthName.IntImpTally,
+                        R.mipmap.img_bwjx,
+                        "理货报告"
+                    )
+                )
            }

            Constant.AuthName.Flight -> {
--- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjImportTally.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjImportTally.kt
@@ -1,5 +1,8 @@
 package com.lukouguoji.module_base.bean

+import androidx.databinding.ObservableBoolean
+import java.io.Serializable
+
 /**
 * 国际进港理货数据
 */
@@ -72,4 +75,17 @@ data class GjjImportTally(
    var volume: Double = 0.0,
    // 重量(kg)
    var weight: Double = 0.0
-)
+) : Serializable {
+    // 选中状态（用于多选功能）- 不参与序列化
+    @Transient
+    val checked: ObservableBoolean = ObservableBoolean(false)
+
+    // 兼容现有API的isSelected属性
+    var isSelected: Boolean
+        get() = checked.get()
+        set(value) = checked.set(value)
+
+    // 获取完整运单号
+    fun getWaybillNo() = "$prefix$no"
+}
+
--- a/module_base/src/main/java/com/lukouguoji/module_base/common/Constant.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/common/Constant.kt
@@ -268,6 +268,7 @@ interface Constant {
            const val IntImpMsgParseActivity = "AppIntImpMsgParse" //电报解析（电报生成）
            const val IntArrAirManifest = "AppIntArrAirManifest" //原始舱单
            const val IntImpManifest = "AppIntImpManifest" //进港舱单
+            const val IntImpTally = "AppIntImpTally" //理货报告
            const val GjjManifestListActivity = "AppIntExpManifest" //舱单
            const val GjjTallyListActivity = "AppIntExpTally" //理货
            const val GjjGoodsListActivity = "AppIntExpGjjGoods" //货物交接
--- a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt
@@ -48,6 +48,7 @@ import com.lukouguoji.module_base.bean.GjjGoodsBean
 import com.lukouguoji.module_base.bean.GjjGoodsDetailsBean
 import com.lukouguoji.module_base.bean.GjjGoodsTypeBean
 import com.lukouguoji.module_base.bean.GjjHandoverRecordBean
+import com.lukouguoji.module_base.bean.GjjImportTally
 import com.lukouguoji.module_base.bean.GjjManifest
 import com.lukouguoji.module_base.bean.GjjManifestBean
 import com.lukouguoji.module_base.bean.GjjPackTypeBean
@@ -1598,4 +1599,16 @@ interface Api {
     */
    @POST("IntImpManifest/pageQueryAirTotal")
    suspend fun getIntImpLoadingTotal(@Body data: RequestBody): BaseResultBean<ManifestTotalDto>
+
+    /**
+     * 国际进港理货报告-分页查询
+     */
+    @POST("IntImpTally/pageQuery")
+    suspend fun getIntImpTallyList(@Body data: RequestBody): PageInfo<GjjImportTally>
+
+    /**
+     * 国际进港理货报告-分页合计
+     */
+    @POST("IntImpTally/pageQueryTotal")
+    suspend fun getIntImpTallyTotal(@Body data: RequestBody): BaseResultBean<ManifestTotalDto>
 }
--- 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
@@ -173,6 +173,7 @@ object ARouterConstants {
    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_LOADING_LIST = "/gjj/IntImpLoadingListActivity"   //国际进港 装机单（分拣理货）
+    const val ACTIVITY_URL_INT_IMP_TALLY = "/gjj/IntImpTallyActivity"   //国际进港 理货报告

    /////////////////  航班查询模块
    /**
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpTallyActivity.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpTallyActivity.kt
@@ -0,0 +1,67 @@
+package com.lukouguoji.gjj.activity
+
+import android.app.Activity
+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.ActivityIntImpTallyBinding
+import com.lukouguoji.gjj.viewModel.IntImpTallyViewModel
+import com.lukouguoji.module_base.base.BaseBindingActivity
+import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.common.ConstantEvent
+import com.lukouguoji.module_base.impl.FlowBus
+import com.lukouguoji.module_base.impl.observe
+import com.lukouguoji.module_base.ktx.addOnItemClickListener
+import com.lukouguoji.module_base.router.ARouterConstants
+
+/**
+ * 国际进港-理货报告页面
+ */
+@Route(path = ARouterConstants.ACTIVITY_URL_INT_IMP_TALLY)
+class IntImpTallyActivity :
+    BaseBindingActivity<ActivityIntImpTallyBinding, IntImpTallyViewModel>() {
+
+    override fun layoutId() = R.layout.activity_int_imp_tally
+    override fun viewModelClass() = IntImpTallyViewModel::class.java
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        setBackArrow("国际进港理货报告")
+        binding.viewModel = viewModel
+
+        // 观察全选状态，更新图标透明度
+        viewModel.isAllChecked.observe(this) { isAllChecked ->
+            binding.checkIcon.alpha = if (isAllChecked) 1.0f else 0.5f
+        }
+
+        // 绑定分页
+        viewModel.pageModel.bindSmartRefreshLayout(binding.srl, binding.rv, viewModel, this)
+
+        // 设置item点击监听
+        binding.rv.addOnItemClickListener(viewModel)
+
+        // 监听刷新事件
+        FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).observe(this) {
+            viewModel.refresh()
+        }
+
+        // 初始加载数据
+        viewModel.refresh()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        // 处理运单号扫码
+        if (requestCode == Constant.RequestCode.WAYBILL && resultCode == Activity.RESULT_OK) {
+            viewModel.waybillNo.value = data?.getStringExtra(Constant.Result.CODED_CONTENT)
+            viewModel.searchClick()
+        }
+
+        // 处理分单号扫码
+        if (requestCode == Constant.RequestCode.HNO && resultCode == Activity.RESULT_OK) {
+            viewModel.hno.value = data?.getStringExtra(Constant.Result.CODED_CONTENT)
+            viewModel.searchClick()
+        }
+    }
+}
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpTallyViewHolder.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpTallyViewHolder.kt
@@ -0,0 +1,26 @@
+package com.lukouguoji.gjj.holder
+
+import android.view.View
+import com.lukouguoji.gjj.databinding.ItemIntImpTallyBinding
+import com.lukouguoji.module_base.base.BaseViewHolder
+import com.lukouguoji.module_base.bean.GjjImportTally
+
+/**
+ * 国际进港理货报告 ViewHolder
+ */
+class IntImpTallyViewHolder(view: View) :
+    BaseViewHolder<GjjImportTally, ItemIntImpTallyBinding>(view) {
+
+    override fun onBind(item: Any?, position: Int) {
+        val bean = getItemBean(item) ?: return
+        binding.bean = bean
+        binding.position = position
+        binding.executePendingBindings()
+
+        // 选中图标点击 - 切换选择状态
+        binding.ivIcon.setOnClickListener {
+            bean.checked.set(!bean.checked.get())
+            binding.executePendingBindings()
+        }
+    }
+}
--- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpTallyViewModel.kt
+++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpTallyViewModel.kt
@@ -0,0 +1,189 @@
+package com.lukouguoji.gjj.viewModel
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.lukouguoji.gjj.R
+import com.lukouguoji.gjj.holder.IntImpTallyViewHolder
+import com.lukouguoji.module_base.base.BasePageViewModel
+import com.lukouguoji.module_base.bean.GjjImportTally
+import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.common.ConstantEvent
+import com.lukouguoji.module_base.http.net.NetApply
+import com.lukouguoji.module_base.impl.FlowBus
+import com.lukouguoji.module_base.ktx.commonAdapter
+import com.lukouguoji.module_base.ktx.launchCollect
+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 kotlinx.coroutines.launch
+
+/**
+ * 国际进港理货报告 ViewModel
+ */
+class IntImpTallyViewModel : BasePageViewModel() {
+
+    // ========== 搜索条件 ==========
+    val flightDate = MutableLiveData("")        // 航班日期
+    val flightNo = MutableLiveData("")          // 航班号
+    val waybillNo = MutableLiveData("")         // 运单号
+    val hno = MutableLiveData("")               // 分单号
+
+    // ========== 统计信息 ==========
+    val totalCount = MutableLiveData("0")       // 合计票数
+    val totalPc = MutableLiveData("0")          // 总件数
+    val totalWeight = MutableLiveData("0")      // 总重量
+
+    // ========== 全选状态 ==========
+    val isAllChecked = MutableLiveData(false)
+
+    init {
+        // 监听全选状态，自动更新所有列表项
+        isAllChecked.observeForever { checked ->
+            val list = pageModel.rv?.commonAdapter()?.items as? List<GjjImportTally> ?: return@observeForever
+            list.forEach { it.checked.set(checked) }
+            pageModel.rv?.commonAdapter()?.notifyDataSetChanged()
+        }
+    }
+
+    // ========== 适配器配置 ==========
+    val itemViewHolder = IntImpTallyViewHolder::class.java
+    val itemLayoutId = R.layout.item_int_imp_tally
+
+    /**
+     * 搜索按钮点击
+     */
+    fun searchClick() {
+        refresh()
+    }
+
+    /**
+     * 全选按钮点击（切换全选状态）
+     */
+    fun checkAllClick() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjImportTally> ?: return
+
+        // 切换全选状态
+        val shouldCheckAll = !isAllChecked.value!!
+        list.forEach { it.checked.set(shouldCheckAll) }
+        isAllChecked.value = shouldCheckAll
+
+        pageModel.rv?.commonAdapter()?.notifyDataSetChanged()
+    }
+
+    /**
+     * 扫码运单号
+     */
+    fun scanWaybill() {
+        ScanModel.startScan(getTopActivity(), Constant.RequestCode.WAYBILL)
+    }
+
+    /**
+     * 扫码分单号
+     */
+    fun scanHno() {
+        ScanModel.startScan(getTopActivity(), Constant.RequestCode.HNO)
+    }
+
+    /**
+     * 人工放行（暂不实现）
+     */
+    fun manualReleaseClick() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjImportTally> ?: return
+        val selectedItems = list.filter { it.isSelected }
+
+        if (selectedItems.isEmpty()) {
+            showToast("请选择要放行的记录")
+            return
+        }
+
+        showToast("人工放行功能开发中")
+    }
+
+    /**
+     * 状态重置（暂不实现）
+     */
+    fun statusResetClick() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjImportTally> ?: return
+        val selectedItems = list.filter { it.isSelected }
+
+        if (selectedItems.isEmpty()) {
+            showToast("请选择要重置的记录")
+            return
+        }
+
+        showToast("状态重置功能开发中")
+    }
+
+    /**
+     * 删除理货（暂不实现）
+     */
+    fun deleteTallyClick() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjImportTally> ?: return
+        val selectedItems = list.filter { it.isSelected }
+
+        if (selectedItems.isEmpty()) {
+            showToast("请选择要删除的记录")
+            return
+        }
+
+        showToast("删除理货功能开发中")
+    }
+
+    /**
+     * 理货申报（暂不实现）
+     */
+    fun tallyDeclareClick() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjImportTally> ?: return
+        val selectedItems = list.filter { it.isSelected }
+
+        if (selectedItems.isEmpty()) {
+            showToast("请选择要申报的记录")
+            return
+        }
+
+        showToast("理货申报功能开发中")
+    }
+
+    /**
+     * 获取数据（重写BasePageViewModel）
+     */
+    override fun getData() {
+        // 构建搜索条件
+        val filterParams = mapOf(
+            "fdate" to flightDate.value?.ifEmpty { null },
+            "fno" to flightNo.value?.ifEmpty { null },
+            "wbNo" to waybillNo.value?.ifEmpty { null },
+            "hno" to hno.value?.ifEmpty { null }
+        )
+
+        // 列表参数（含分页）
+        val listParams = (filterParams + mapOf(
+            "pageNum" to pageModel.page,
+            "pageSize" to pageModel.limit
+        )).toRequestBody()
+
+        // 统计参数（无分页）
+        val totalParams = filterParams.toRequestBody()
+
+        // 获取列表（带Loading）
+        launchLoadingCollect({
+            NetApply.api.getIntImpTallyList(listParams)
+        }) {
+            onSuccess = { pageInfo ->
+                // ⚠️ 核心：使用toBaseListBean()转换PageInfo为BaseListBean
+                pageModel.handleListBean(pageInfo.toBaseListBean())
+            }
+        }
+
+        // 获取统计信息（后台请求，不阻塞列表）
+        launchCollect({ NetApply.api.getIntImpTallyTotal(totalParams) }) {
+            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()
+            }
+        }
+    }
+}
--- a/module_gjj/src/main/res/layout/activity_int_imp_tally.xml
+++ b/module_gjj/src/main/res/layout/activity_int_imp_tally.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="com.lukouguoji.module_base.ui.weight.search.layout.SearchLayoutType" />
+
+        <variable
+            name="viewModel"
+            type="com.lukouguoji.gjj.viewModel.IntImpTallyViewModel" />
+    </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" />
+
+        <!-- 搜索区域 -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="10dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <!-- 航班日期 -->
+            <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                hint='@{"请选择航班日期"}'
+                icon="@{@drawable/img_date}"
+                type="@{SearchLayoutType.DATE}"
+                value="@={viewModel.flightDate}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <!-- 航班号 -->
+            <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                hint='@{"请输入航班号"}'
+                type="@{SearchLayoutType.INPUT}"
+                value="@={viewModel.flightNo}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <!-- 运单号 -->
+            <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                hint='@{"请输入运单号"}'
+                icon="@{@drawable/scan_code}"
+                setOnIconClickListener="@{(v)-> viewModel.scanWaybill()}"
+                type="@{SearchLayoutType.INPUT}"
+                value="@={viewModel.waybillNo}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <!-- 分单号 -->
+            <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                hint='@{"请输入分单号"}'
+                icon="@{@drawable/scan_code}"
+                setOnIconClickListener="@{(v)-> viewModel.scanHno()}"
+                type="@{SearchLayoutType.INPUT}"
+                value="@={viewModel.hno}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <!-- 搜索按钮 -->
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center_vertical|start"
+                android:orientation="horizontal"
+                android:paddingHorizontal="24dp">
+
+                <ImageView
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:onClick="@{()-> viewModel.searchClick()}"
+                    android:padding="2dp"
+                    android:src="@drawable/img_search" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <!-- 列表 -->
+        <com.scwang.smart.refresh.layout.SmartRefreshLayout
+            android:id="@+id/srl"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginHorizontal="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_weight="1">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv"
+                itemLayoutId="@{viewModel.itemLayoutId}"
+                viewHolder="@{viewModel.itemViewHolder}"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:overScrollMode="never"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:itemCount="3"
+                tools:listitem="@layout/item_int_imp_tally" />
+
+        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
+        <!-- 底部统计和操作按钮 -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:paddingHorizontal="15dp">
+
+            <!-- 全选按钮 -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="5dp"
+                android:gravity="center_vertical"
+                android:onClick="@{()-> viewModel.checkAllClick()}"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/checkIcon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="5dp"
+                    android:src="@drawable/img_check_all" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="全选"
+                    android:textColor="@color/color_66"
+                    android:textSize="18sp" />
+
+            </LinearLayout>
+
+            <!-- 统计信息 -->
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text='@{"合计："+viewModel.totalCount+"票"}'
+                    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"
+                    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"
+                    android:layout_marginLeft="20dp"
+                    android:text='@{"总重量："+viewModel.totalWeight}'
+                    android:textColor="@color/bottom_tool_tips_text_color"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+
+            <!-- 操作按钮 -->
+            <TextView
+                style="@style/tv_bottom_btn"
+                android:layout_marginEnd="15dp"
+                android:onClick="@{()-> viewModel.manualReleaseClick()}"
+                android:text="人工放行" />
+
+            <TextView
+                style="@style/tv_bottom_btn"
+                android:layout_marginEnd="15dp"
+                android:onClick="@{()-> viewModel.statusResetClick()}"
+                android:text="状态重置" />
+
+            <TextView
+                style="@style/tv_bottom_btn"
+                android:layout_marginEnd="15dp"
+                android:onClick="@{()-> viewModel.deleteTallyClick()}"
+                android:text="删除理货" />
+
+            <!-- 理货申报按钮 (红色) -->
+            <TextView
+                android:layout_width="100dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:background="@drawable/bg_red_btn_bottom"
+                android:gravity="center"
+                android:onClick="@{()-> viewModel.tallyDeclareClick()}"
+                android:text="理货申报"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</layout>
--- a/module_gjj/src/main/res/layout/item_int_imp_manifest.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_manifest.xml
@@ -330,6 +330,14 @@

        </LinearLayout>

+        <!-- 右侧箭头 -->
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:src="@drawable/img_pda_right" />
+
        <!-- 侧滑菜单区 -->
        <LinearLayout
            android:layout_width="wrap_content"
--- a/module_gjj/src/main/res/layout/item_int_imp_tally.xml
+++ b/module_gjj/src/main/res/layout/item_int_imp_tally.xml
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="bean"
+            type="com.lukouguoji.module_base.bean.GjjImportTally" />
+
+        <variable
+            name="position"
+            type="Integer" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:background="@drawable/bg_white_radius_8"
+        android:orientation="horizontal"
+        android:padding="15dp"
+        android:gravity="center_vertical">
+
+        <!-- 选中图标（飞机图标，根据选择状态切换图片） -->
+        <ImageView
+            android:id="@+id/iv_icon"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            loadImage="@{bean.checked.get() ? @drawable/img_plane_s : @drawable/img_plane}"
+            android:src="@drawable/img_plane" />
+
+        <!-- 理货信息区域 -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="15dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <!-- 第一行：运单号、状态、代理、件数、重量 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <!-- 运单号（主要信息，较大权重） -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{4}"
+                        android:text="运单号：" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.getWaybillNo()}"
+                        android:textColor="@color/colorPrimary" />
+
+                </LinearLayout>
+
+                <!-- 状态 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{4}"
+                        android:text="状态：" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.status}" />
+
+                </LinearLayout>
+
+                <!-- 代理 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{4}"
+                        android:text="代理：" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.agentCode}" />
+
+                </LinearLayout>
+
+                <!-- 件数 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{5}"
+                        android:text="件数：" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{String.valueOf(bean.pc)}" />
+
+                </LinearLayout>
+
+                <!-- 重量 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{4}"
+                        android:text="重量：" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{String.valueOf((int)bean.weight)}" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!-- 第二行：特码、始发站、目的站、运单类型、分单数 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <!-- 特码 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{4}"
+                        android:text="特码：" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.spCode}" />
+
+                </LinearLayout>
+
+                <!-- 始发站 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{4}"
+                        android:text="始发站：" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.origin}" />
+
+                </LinearLayout>
+
+                <!-- 目的站 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{4}"
+                        android:text="目的站：" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.dest}" />
+
+                </LinearLayout>
+
+                <!-- 运单类型 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{5}"
+                        android:text="运单类型：" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.awbTypeName}" />
+
+                </LinearLayout>
+
+                <!-- 分单数 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{4}"
+                        android:text="分单数：" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{String.valueOf(bean.haWbNum)}" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <!-- 右侧箭头 -->
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:src="@drawable/img_pda_right" />
+
+    </LinearLayout>
+
+</layout>