feat: 国际进港新增提取出库和进港查询功能页面

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

app/src/main/AndroidManifest.xml

@@ -440,6 +440,20 @@
             android:exported="false"
             android:screenOrientation="userLandscape" />
 
+        <!-- 国际进港-提取出库 -->
+        <activity
+            android:name="com.lukouguoji.gjj.activity.IntImpPickUpDLVActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="false"
+            android:screenOrientation="userLandscape" />
+
+        <!-- 国际进港-进港查询 -->
+        <activity
+            android:name="com.lukouguoji.gjj.activity.IntImpQueryActivity"
+            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" />

app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt

@@ -463,6 +463,18 @@ class HomeFragment : Fragment() {
                             .navigation()
                     }
 
+                    // 提取出库
+                    Constant.AuthName.IntImpPickUpDLV -> {
+                        ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_INT_IMP_PICK_UP_DLV)
+                            .navigation()
+                    }
+
+                    // 进港查询
+                    Constant.AuthName.GjjQueryListActivity -> {
+                        ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_GJJ_QUERY_LIST)
+                            .navigation()
+                    }
+
                     /**
                      * 航班查询
                      */
@@ -826,6 +838,20 @@ class HomeFragment : Fragment() {
                         "提取记录"
                     )
                 )
+                list.add(
+                    RightMenu(
+                        Constant.AuthName.IntImpPickUpDLV,
+                        R.mipmap.gnj_cang_ku_icon,
+                        "提取出库"
+                    )
+                )
+                list.add(
+                    RightMenu(
+                        Constant.AuthName.GjjQueryListActivity,
+                        R.mipmap.img_bwjx,
+                        "进港查询"
+                    )
+                )
             }
 
             Constant.AuthName.Flight -> {

module_base/src/main/java/com/lukouguoji/module_base/bean/IntImpPickUpDLVBean.kt

@@ -0,0 +1,62 @@
+package com.lukouguoji.module_base.bean
+
+import androidx.databinding.ObservableBoolean
+import java.io.Serializable
+
+/**
+ * 国际进港提取出库-列表数据Bean
+ * 对应API: IntImpPickUpDlv/pageQuery
+ */
+class IntImpPickUpDLVBean : Serializable {
+    var id: Long = 0                     // 主键ID
+    var wbNo: String = ""                // 运单号
+    var no: String = ""                  // 主单号
+    var prefix: String = ""              // 主单前缀
+    var hno: String = ""                 // 分单号
+    var agentCode: String = ""           // 代理人代码
+    var agentName: String = ""           // 代理人名称
+    var flight: String = ""              // 航班信息
+    var fno: String = ""                 // 航班号
+    var fdate: String = ""               // 航班日期
+    var pc: Long = 0                     // 件数
+    var weight: Double = 0.0             // 重量
+    var cashWeight: Double = 0.0         // 计费重量
+    var pkId: String = ""                // 提货编号（提货单号）
+    var location: String = ""            // 库位
+    var chargeTime: String = ""          // 缴费时间（提取时间）
+    var dlvTime: String = ""             // 出库时间
+    var goods: String = ""               // 品名
+    var spCode: String = ""              // 特码
+    var pickFlag: String = ""            // 提取出库标识
+    var chargeFlag: String = ""          // 提取标识
+    var serialNo: Long = 0               // 收费记录项目序号
+    var amount: Double = 0.0             // 总金额
+    var optCharge: Double = 0.0          // 服务费
+    var whsCharge: Double = 0.0          // 仓储费
+    var tranCharge: Double = 0.0         // 信息费
+    var drawBillCharge: Double = 0.0     // 抽单费
+    var efrCharge: Double = 0.0          // 冷藏费
+    var svlCharge: Double = 0.0          // 铲车费
+    var tallyCharge: Double = 0.0        // 理货费
+    var chargeId: String = ""            // 收费员
+    var chargeName: String = ""          // 收费员名称
+    var dlvId: String = ""
+    var dlvIdType: String = ""
+    var dlvName: String = ""
+    var dlvPhone: String = ""
+    var locFlag: String = ""
+    var origin: String = ""
+    var refId: String = ""
+    var receiptNo: String = ""
+    var chgMode: String = ""
+    var billReviewStatus: String = ""
+    var billAgentRemark: String = ""
+    var awbPc: Long = 0
+
+    // ========== UI扩展字段 ==========
+    val checked: ObservableBoolean = ObservableBoolean(false)
+
+    var isSelected: Boolean
+        get() = checked.get()
+        set(value) = checked.set(value)
+}

module_base/src/main/java/com/lukouguoji/module_base/bean/IntImpQueryBean.kt

@@ -0,0 +1,57 @@
+package com.lukouguoji.module_base.bean
+
+/**
+ * 国际进港查询-主运单数据模型
+ * 对应接口：/IntImpSearch/pageQuery 返回的列表项 (GjjSearchMaWb)
+ */
+data class IntImpQueryBean(
+    var maWbId: Long? = null,          // 主单主键ID
+    var wbNo: String? = null,          // 运单号
+    var prefix: String? = null,        // 运单号前缀
+    var no: String? = null,            // 运单号主体
+
+    // ==================== 货物信息 ====================
+    var awbPc: Long? = null,           // 运单件数
+    var awbWeight: Double? = null,     // 运单重量
+    var inPc: Long? = null,            // 入库件数
+    var inWeight: Double? = null,      // 入库重量
+    var cashWeight: Double? = null,    // 计费重量
+    var goods: String? = null,         // 品名（英）
+    var goodsCn: String? = null,       // 品名（中）
+    var packageType: String? = null,   // 包装类型
+    var unNumber: String? = null,      // UN编号
+
+    // ==================== 航班信息 ====================
+    var flight: String? = null,        // 航班: 日期/航班号
+    var fno: String? = null,           // 航班号
+    var fdate: String? = null,         // 航班日期
+    var range: String? = null,         // 航程 (如 LAX-HFE)
+    var dest: String? = null,          // 目的地
+    var origin: String? = null,        // 货源地
+    var by1: String? = null,           // 承运人
+
+    // ==================== 代理与运单类型 ====================
+    var agentCode: String? = null,     // 代理人code
+    var agentName: String? = null,     // 代理人名称
+    var awbType: String? = null,       // 运单类型code
+    var awbName: String? = null,       // 运单类型名称
+    var businessType: String? = null,  // 业务类型code
+    var businessName: String? = null,  // 业务类型名称
+
+    // ==================== 特码 ====================
+    var spCode: String? = null,        // 特码
+
+    // ==================== 时间信息 ====================
+    var inDate: String? = null,        // 入库时间
+    var dlvTime: String? = null,       // 出库时间
+
+    // ==================== 状态信息 ====================
+    var mftStatus: String? = null,     // 原始舱单状态
+    var tallyStatus: String? = null,   // 理货申报状态
+    var lockState: Int? = null,        // 锁定状态（0:未锁, 1:锁定）
+    var command: String? = null,       // 海关放行
+
+    // ==================== 其他 ====================
+    var remark: String? = null,        // 备注
+    var activeId: Long? = null         // 有效值
+)

module_base/src/main/java/com/lukouguoji/module_base/common/Constant.kt

@@ -271,6 +271,7 @@ interface Constant {
             const val IntImpManifest = "AppIntImpManifest" //进港舱单
             const val IntImpTally = "AppIntImpTally" //理货报告
             const val IntImpPickUpRecord = "AppIntImpPickUpRecord" //提取记录
+            const val IntImpPickUpDLV = "AppIntImpPickUpDLV" //提取出库
             const val GjjManifestListActivity = "AppIntExpManifest" //舱单
             const val GjjTallyListActivity = "AppIntExpTally" //理货
             const val GjjGoodsListActivity = "AppIntExpGjjGoods" //货物交接

module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt

@@ -50,7 +50,9 @@ 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.IntImpPickUpDLVBean
 import com.lukouguoji.module_base.bean.IntImpPickUpRecordBean
+import com.lukouguoji.module_base.bean.IntImpQueryBean
 import com.lukouguoji.module_base.bean.GjjManifest
 import com.lukouguoji.module_base.bean.GjjManifestBean
 import com.lukouguoji.module_base.bean.GjjPackTypeBean
@@ -969,6 +971,41 @@ interface Api {
     @POST("IntImpPickUpRecord/getDetails")
     suspend fun getIntImpPickUpRecordDetails(@Body data: RequestBody): BaseResultBean<IntImpPickUpRecordBean>
 
+    /**
+     * 国际进港提取出库-分页查询
+     * 接口路径: /IntImpPickUpDlv/pageQuery
+     */
+    @POST("IntImpPickUpDlv/pageQuery")
+    suspend fun getIntImpPickUpDLVList(@Body data: RequestBody): PageInfo<IntImpPickUpDLVBean>
+
+    /**
+     * 国际进港提取出库-分页合计
+     * 接口路径: /IntImpPickUpDlv/pageQueryTotal
+     */
+    @POST("IntImpPickUpDlv/pageQueryTotal")
+    suspend fun getIntImpPickUpDLVTotal(@Body data: RequestBody): BaseResultBean<ManifestTotalDto>
+
+    /**
+     * 国际进港提取出库-确认出库
+     * 接口路径: /IntImpPickUpDlv/pickUpOut
+     */
+    @POST("IntImpPickUpDlv/pickUpOut")
+    suspend fun confirmIntImpPickUpDLV(@Body data: RequestBody): BaseResultBean<String>
+
+    /**
+     * 国际进港查询-分页
+     * 接口路径: /IntImpSearch/pageQuery
+     */
+    @POST("IntImpSearch/pageQuery")
+    suspend fun getIntImpQueryList(@Body data: RequestBody): PageInfo<IntImpQueryBean>
+
+    /**
+     * 国际进港查询-分页合计
+     * 接口路径: /IntImpSearch/pageQueryTotal
+     */
+    @POST("IntImpSearch/pageQueryTotal")
+    suspend fun getIntImpQueryTotal(@Body data: RequestBody): BaseResultBean<ManifestTotalDto>
+
     /**
      * 国际出港待计重-分页搜索
      * 接口路径: /IntExpCheckIn/pageQuery

module_base/src/main/java/com/lukouguoji/module_base/router/ARouterConstants.kt

@@ -177,6 +177,7 @@ object ARouterConstants {
     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"   //国际进港 理货报告
+    const val ACTIVITY_URL_INT_IMP_PICK_UP_DLV = "/gjj/IntImpPickUpDLVActivity"   //国际进港 提取出库
 
     /////////////////  航班查询模块
     /**

module_gjj/src/main/java/com/lukouguoji/gjj/activity/GjjQueryListActivity.kt

@@ -27,7 +27,7 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout
 import java.text.SimpleDateFormat
 import java.util.*
 
-@Route(path = ARouterConstants.ACTIVITY_URL_GJJ_QUERY_LIST)
+//@Route(path = ARouterConstants.ACTIVITY_URL_GJJ_QUERY_LIST)
 class GjjQueryListActivity : BaseActivity(), View.OnClickListener {
     private val currentTitleName = "国际进港查询"
 

module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpPickUpDLVActivity.kt

@@ -0,0 +1,57 @@
+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.ActivityIntImpPickUpDlvBinding
+import com.lukouguoji.gjj.viewModel.IntImpPickUpDLVViewModel
+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.router.ARouterConstants
+
+/**
+ * 国际进港-提取出库
+ */
+@Route(path = ARouterConstants.ACTIVITY_URL_INT_IMP_PICK_UP_DLV)
+class IntImpPickUpDLVActivity :
+    BaseBindingActivity<ActivityIntImpPickUpDlvBinding, IntImpPickUpDLVViewModel>() {
+
+    override fun layoutId() = R.layout.activity_int_imp_pick_up_dlv
+    override fun viewModelClass() = IntImpPickUpDLVViewModel::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)
+
+        // 监听刷新事件
+        FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).observe(this) {
+            viewModel.refresh()
+        }
+
+        // 初始化代理人列表
+        viewModel.initAgentList()
+
+        // 初始加载数据
+        viewModel.refresh()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode == Activity.RESULT_OK) {
+            viewModel.onActivityResult(requestCode, resultCode, data)
+        }
+    }
+}

module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryActivity.kt

@@ -0,0 +1,51 @@
+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.ActivityIntImpQueryBinding
+import com.lukouguoji.gjj.viewModel.IntImpQueryViewModel
+import com.lukouguoji.module_base.base.BaseBindingActivity
+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.getLifecycleOwner
+import com.lukouguoji.module_base.router.ARouterConstants
+
+/**
+ * 国际进港查询列表页
+ */
+@Route(path = ARouterConstants.ACTIVITY_URL_GJJ_QUERY_LIST)
+class IntImpQueryActivity :
+    BaseBindingActivity<ActivityIntImpQueryBinding, IntImpQueryViewModel>() {
+
+    override fun layoutId() = R.layout.activity_int_imp_query
+
+    override fun viewModelClass() = IntImpQueryViewModel::class.java
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        setBackArrow("进港查询")
+
+        binding.viewModel = viewModel
+
+        viewModel.pageModel
+            .bindSmartRefreshLayout(binding.srl, binding.rv, viewModel, getLifecycleOwner())
+
+        FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).observe(this) {
+            viewModel.refresh()
+        }
+
+        viewModel.initAgentList()
+
+        viewModel.refresh()
+    }
+
+    companion object {
+        @JvmStatic
+        fun start(context: Context) {
+            context.startActivity(Intent(context, IntImpQueryActivity::class.java))
+        }
+    }
+}

module_gjj/src/main/java/com/lukouguoji/gjj/dialog/IntImpQueryFilterDialogModel.kt

@@ -0,0 +1,87 @@
+package com.lukouguoji.gjj.dialog
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.lifecycle.MutableLiveData
+import com.lukouguoji.gjj.R
+import com.lukouguoji.gjj.databinding.DialogIntImpQueryFilterBinding
+import com.lukouguoji.module_base.base.BaseDialogModel
+import com.lxj.xpopup.XPopup
+import com.lxj.xpopup.enums.PopupPosition
+import dev.DevUtils
+import dev.utils.app.info.KeyValue
+
+/**
+ * 国际进港查询筛选抽屉
+ */
+class IntImpQueryFilterDialogModel(
+    val spCode: MutableLiveData<String>,
+    val flightNo: MutableLiveData<String>,
+    val dest: MutableLiveData<String>,
+    val awbType: MutableLiveData<String>,
+    val businessType: MutableLiveData<String>,
+    val goodsCn: MutableLiveData<String>,
+    private val onConfirm: () -> Unit
+) : BaseDialogModel<DialogIntImpQueryFilterBinding>(DIALOG_TYPE_DRAWER) {
+
+    val awbTypeList = MutableLiveData(
+        listOf(
+            KeyValue("全部", ""),
+            KeyValue("主单", "1"),
+            KeyValue("分单", "2")
+        )
+    )
+
+    val businessTypeList = MutableLiveData(
+        listOf(
+            KeyValue("全部", ""),
+            KeyValue("普货", "1"),
+            KeyValue("特货", "2")
+        )
+    )
+
+    override fun layoutId() = R.layout.dialog_int_imp_query_filter
+
+    override fun onBuild(builder: XPopup.Builder) {
+        super.onBuild(builder)
+        builder.popupPosition(PopupPosition.Right)
+        val activity = DevUtils.getTopActivity()
+        val activityWidth = activity.window.decorView.width
+        builder.maxWidth(activityWidth / 3)
+        builder.popupWidth(activityWidth / 3)
+    }
+
+    override fun onDialogCreated(context: Context) {
+        binding.model = this
+        binding.lifecycleOwner = context as? androidx.lifecycle.LifecycleOwner
+
+        val titleColor = Color.parseColor("#666666")
+        binding.root.findViewById<TextView>(R.id.title_name)?.text = "筛选条件"
+        binding.root.findViewById<TextView>(R.id.title_name)?.setTextColor(titleColor)
+        binding.root.findViewById<TextView>(R.id.tool_tv_back)?.setTextColor(titleColor)
+        binding.root.findViewById<ImageView>(R.id.tool_iv_back)?.imageTintList = ColorStateList.valueOf(titleColor)
+        binding.root.findViewById<View>(R.id.toolbar)?.setBackgroundColor(Color.WHITE)
+
+        binding.root.findViewById<View>(R.id.tool_back)?.setOnClickListener {
+            dismiss()
+        }
+    }
+
+    fun onResetClick() {
+        spCode.value = ""
+        flightNo.value = ""
+        dest.value = ""
+        awbType.value = ""
+        businessType.value = ""
+        goodsCn.value = ""
+    }
+
+    fun onConfirmClick() {
+        dismiss()
+        onConfirm()
+    }
+}

module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpPickUpDLVViewHolder.kt

@@ -0,0 +1,26 @@
+package com.lukouguoji.gjj.holder
+
+import android.view.View
+import com.lukouguoji.gjj.databinding.ItemIntImpPickUpDlvBinding
+import com.lukouguoji.module_base.base.BaseViewHolder
+import com.lukouguoji.module_base.bean.IntImpPickUpDLVBean
+
+/**
+ * 国际进港-提取出库 列表项ViewHolder
+ */
+class IntImpPickUpDLVViewHolder(view: View) :
+    BaseViewHolder<IntImpPickUpDLVBean, ItemIntImpPickUpDlvBinding>(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()
+        }
+    }
+}

module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpQueryViewHolder.kt

@@ -0,0 +1,19 @@
+package com.lukouguoji.gjj.holder
+
+import android.view.View
+import com.lukouguoji.gjj.databinding.ItemIntImpQueryBinding
+import com.lukouguoji.module_base.base.BaseViewHolder
+import com.lukouguoji.module_base.bean.IntImpQueryBean
+
+/**
+ * 国际进港查询列表ViewHolder
+ */
+class IntImpQueryViewHolder(view: View) :
+    BaseViewHolder<IntImpQueryBean, ItemIntImpQueryBinding>(view) {
+
+    override fun onBind(item: Any?, position: Int) {
+        val bean = getItemBean(item)!!
+        binding.bean = bean
+        binding.executePendingBindings()
+    }
+}

module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt

@@ -0,0 +1,183 @@
+package com.lukouguoji.gjj.viewModel
+
+import android.app.Activity
+import android.content.Intent
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.lukouguoji.gjj.R
+import com.lukouguoji.gjj.holder.IntImpPickUpDLVViewHolder
+import com.lukouguoji.module_base.base.BasePageViewModel
+import com.lukouguoji.module_base.bean.IntImpPickUpDLVBean
+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 dev.utils.app.info.KeyValue
+import kotlinx.coroutines.launch
+
+/**
+ * 国际进港-提取出库 ViewModel
+ */
+class IntImpPickUpDLVViewModel : BasePageViewModel() {
+
+    // ========== 搜索条件 ==========
+    val paymentDateStart = MutableLiveData("")    // 缴费日期起
+    val paymentDateEnd = MutableLiveData("")      // 缴费日期止
+    val agentCode = MutableLiveData("")           // 代理人
+    val wbNo = MutableLiveData("")               // 运单号
+    val pickUpNo = MutableLiveData("")           // 提货单号
+
+    // ========== 下拉列表数据源 ==========
+    val agentList = MutableLiveData(listOf(KeyValue("全部", "")))
+
+    // ========== 统计信息 ==========
+    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<IntImpPickUpDLVBean>
+                ?: return@observeForever
+            list.forEach { it.checked.set(checked) }
+            pageModel.rv?.commonAdapter()?.notifyDataSetChanged()
+        }
+    }
+
+    // ========== 适配器配置 ==========
+    val itemViewHolder = IntImpPickUpDLVViewHolder::class.java
+    val itemLayoutId = R.layout.item_int_imp_pick_up_dlv
+
+    /**
+     * 初始化代理人列表
+     */
+    fun initAgentList() {
+        launchCollect({ NetApply.api.getIntImpAgentList() }) {
+            onSuccess = { result ->
+                val list = mutableListOf(KeyValue("全部", ""))
+                result.data?.forEach {
+                    list.add(KeyValue(it.name ?: "", it.code ?: ""))
+                }
+                agentList.value = list
+            }
+        }
+    }
+
+    /**
+     * 搜索按钮点击
+     */
+    fun searchClick() {
+        refresh()
+    }
+
+    /**
+     * 扫码运单号
+     */
+    fun scanWbNo() {
+        ScanModel.startScan(getTopActivity(), Constant.RequestCode.WAYBILL)
+    }
+
+    /**
+     * 扫码提货单号
+     */
+    fun scanPickUpNo() {
+        ScanModel.startScan(getTopActivity(), Constant.RequestCode.gnj_chu_ku_list)
+    }
+
+    /**
+     * 全选按钮点击
+     */
+    fun checkAllClick() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<IntImpPickUpDLVBean> ?: return
+        val shouldCheckAll = !isAllChecked.value!!
+        list.forEach { it.checked.set(shouldCheckAll) }
+        isAllChecked.value = shouldCheckAll
+        pageModel.rv?.commonAdapter()?.notifyDataSetChanged()
+    }
+
+    /**
+     * 确认出库
+     */
+    fun confirmOutbound() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<IntImpPickUpDLVBean> ?: return
+        val selectedItems = list.filter { it.isSelected }
+
+        if (selectedItems.isEmpty()) {
+            showToast("请选择要出库的记录")
+            return
+        }
+
+        launchLoadingCollect({ NetApply.api.confirmIntImpPickUpDLV(selectedItems.toRequestBody()) }) {
+            onSuccess = {
+                showToast("确认出库成功")
+                viewModelScope.launch {
+                    FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                }
+                refresh()
+            }
+        }
+    }
+
+    /**
+     * 获取列表数据
+     */
+    override fun getData() {
+        val filterParams = mapOf(
+            "beginDate" to paymentDateStart.value?.ifEmpty { null },
+            "endDate" to paymentDateEnd.value?.ifEmpty { null },
+            "agentCode" to agentCode.value?.ifEmpty { null },
+            "no" to wbNo.value?.ifEmpty { null },
+            "pkId" to pickUpNo.value?.ifEmpty { null }
+        )
+
+        val listParams = (filterParams + mapOf(
+            "page" to pageModel.page,
+            "limit" to pageModel.limit
+        )).toRequestBody()
+
+        val totalParams = filterParams.toRequestBody()
+
+        launchLoadingCollect({ NetApply.api.getIntImpPickUpDLVList(listParams) }) {
+            onSuccess = { result ->
+                pageModel.handleDataList(result.list)
+                pageModel.haveMore.postValue((result.pages) > pageModel.page)
+            }
+        }
+
+        launchCollect({ NetApply.api.getIntImpPickUpDLVTotal(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()
+            }
+        }
+    }
+
+    /**
+     * 处理扫码结果
+     */
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (resultCode == Activity.RESULT_OK && data != null) {
+            when (requestCode) {
+                Constant.RequestCode.WAYBILL -> {
+                    wbNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
+                    refresh()
+                }
+                Constant.RequestCode.gnj_chu_ku_list -> {
+                    pickUpNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
+                    refresh()
+                }
+            }
+        }
+    }
+}

module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt

@@ -0,0 +1,161 @@
+package com.lukouguoji.gjj.viewModel
+
+import android.app.Activity
+import android.content.Intent
+import androidx.lifecycle.MutableLiveData
+import com.lukouguoji.gjj.R
+import com.lukouguoji.gjj.dialog.IntImpQueryFilterDialogModel
+import com.lukouguoji.gjj.holder.IntImpQueryViewHolder
+import com.lukouguoji.module_base.base.BasePageViewModel
+import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.http.net.NetApply
+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 dev.utils.app.info.KeyValue
+import dev.utils.common.DateUtils
+import com.lukouguoji.module_base.ktx.formatDate
+
+/**
+ * 国际进港查询ViewModel
+ */
+class IntImpQueryViewModel : BasePageViewModel() {
+
+    // ==================== 搜索条件 ====================
+    val flightDateStart = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())
+    val flightDateEnd = MutableLiveData("")
+    val agentId = MutableLiveData("")
+    val outStatus = MutableLiveData("")
+    val waybillNo = MutableLiveData("")
+
+    // ==================== 下拉列表 ====================
+    val agentList = MutableLiveData(listOf(KeyValue("全部", "")))
+
+    val outStatusList = MutableLiveData(
+        listOf(
+            KeyValue("全部", ""),
+            KeyValue("未出库", "0"),
+            KeyValue("已出库", "1")
+        )
+    )
+
+    // ==================== 适配器配置 ====================
+    val itemViewHolder = IntImpQueryViewHolder::class.java
+    val itemLayoutId = R.layout.item_int_imp_query
+
+    // ==================== 统计数据 ====================
+    val totalCount = MutableLiveData("0")
+    val totalPc = MutableLiveData("0")
+    val totalWeight = MutableLiveData("0")
+
+    // ==================== 筛选条件 ====================
+    val spCode = MutableLiveData("")
+    val flightNo = MutableLiveData("")
+    val dest = MutableLiveData("")
+    val awbType = MutableLiveData("")
+    val businessType = MutableLiveData("")
+    val goodsCn = MutableLiveData("")
+
+    ///////////////////////////////////////////////////////////////////////////
+    // 方法区
+    ///////////////////////////////////////////////////////////////////////////
+
+    fun waybillScanClick() {
+        ScanModel.startScan(getTopActivity(), Constant.RequestCode.WAYBILL)
+    }
+
+    fun searchClick() {
+        refresh()
+    }
+
+    fun filterClick() {
+        val filterDialog = IntImpQueryFilterDialogModel(
+            spCode = spCode,
+            flightNo = flightNo,
+            dest = dest,
+            awbType = awbType,
+            businessType = businessType,
+            goodsCn = goodsCn,
+            onConfirm = { refresh() }
+        )
+        filterDialog.show()
+    }
+
+    override fun getData() {
+        val listParams = mapOf(
+            "pageNum" to pageModel.page,
+            "pageSize" to pageModel.limit,
+            "beginDate" to flightDateStart.value!!.ifEmpty { null },
+            "endDate" to flightDateEnd.value!!.ifEmpty { null },
+            "agentCode" to agentId.value!!.ifEmpty { null },
+            "outState" to outStatus.value!!.ifEmpty { null },
+            "wbNo" to waybillNo.value!!.ifEmpty { null },
+            "spCode" to spCode.value!!.ifEmpty { null },
+            "fno" to flightNo.value!!.ifEmpty { null },
+            "dest" to dest.value!!.ifEmpty { null },
+            "awbType" to awbType.value!!.ifEmpty { null },
+            "businessType" to businessType.value!!.ifEmpty { null },
+            "goods" to goodsCn.value!!.ifEmpty { null }
+        ).toRequestBody()
+
+        val totalParams = mapOf(
+            "beginDate" to flightDateStart.value!!.ifEmpty { null },
+            "endDate" to flightDateEnd.value!!.ifEmpty { null },
+            "agentCode" to agentId.value!!.ifEmpty { null },
+            "outState" to outStatus.value!!.ifEmpty { null },
+            "wbNo" to waybillNo.value!!.ifEmpty { null },
+            "spCode" to spCode.value!!.ifEmpty { null },
+            "fno" to flightNo.value!!.ifEmpty { null },
+            "dest" to dest.value!!.ifEmpty { null },
+            "awbType" to awbType.value!!.ifEmpty { null },
+            "businessType" to businessType.value!!.ifEmpty { null },
+            "goods" to goodsCn.value!!.ifEmpty { null }
+        ).toRequestBody()
+
+        launchLoadingCollect({
+            NetApply.api.getIntImpQueryList(listParams)
+        }) {
+            onSuccess = { pageInfo ->
+                pageModel.handleListBean(pageInfo.toBaseListBean())
+            }
+        }
+
+        launchCollect({
+            NetApply.api.getIntImpQueryTotal(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()
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (resultCode == Activity.RESULT_OK && data != null) {
+            when (requestCode) {
+                Constant.RequestCode.WAYBILL -> {
+                    waybillNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
+                    refresh()
+                }
+            }
+        }
+    }
+
+    fun initAgentList() {
+        launchCollect({
+            NetApply.api.getIntImpAgentList()
+        }) {
+            onSuccess = { result ->
+                val list = mutableListOf(KeyValue("全部", ""))
+                result.data?.forEach {
+                    list.add(KeyValue(it.name ?: "", it.code ?: ""))
+                }
+                agentList.value = list
+            }
+        }
+    }
+}

module_gjj/src/main/res/layout/activity_int_imp_pick_up_dlv.xml

@@ -0,0 +1,197 @@
+<?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.IntImpPickUpDLVViewModel" />
+    </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.paymentDateStart}"
+                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/img_date}"
+                type="@{SearchLayoutType.DATE}"
+                value="@={viewModel.paymentDateEnd}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <!-- 代理人 -->
+            <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                hint='@{"请选择代理人"}'
+                list="@{viewModel.agentList}"
+                type="@{SearchLayoutType.SPINNER}"
+                value="@={viewModel.agentCode}"
+                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/img_scan}"
+                setOnIconClickListener="@{(v)-> viewModel.scanWbNo()}"
+                type="@{SearchLayoutType.INPUT}"
+                value="@={viewModel.wbNo}"
+                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/img_scan}"
+                setOnIconClickListener="@{(v)-> viewModel.scanPickUpNo()}"
+                type="@{SearchLayoutType.INPUT}"
+                value="@={viewModel.pickUpNo}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <!-- 搜索按钮 -->
+            <ImageView
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:layout_marginHorizontal="10dp"
+                android:onClick="@{()-> viewModel.searchClick()}"
+                android:padding="2dp"
+                android:src="@drawable/img_search" />
+
+        </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_pick_up_dlv" />
+
+        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
+        <!-- 底部统计和操作按钮 -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@android: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:onClick="@{()-> viewModel.confirmOutbound()}"
+                android:text="确认出库" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</layout>

module_gjj/src/main/res/layout/activity_int_imp_query.xml

@@ -0,0 +1,177 @@
+<?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.IntImpQueryViewModel" />
+    </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
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                hint='@{"请选择开始日期"}'
+                icon="@{@drawable/img_date}"
+                type="@{SearchLayoutType.DATE}"
+                value="@={viewModel.flightDateStart}" />
+
+            <!-- 航班日期止 -->
+            <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                hint='@{"请选择结束日期"}'
+                icon="@{@drawable/img_date}"
+                type="@{SearchLayoutType.DATE}"
+                value="@={viewModel.flightDateEnd}" />
+
+            <!-- 代理人 -->
+            <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                hint='@{"请选择代理"}'
+                list="@{viewModel.agentList}"
+                type="@{SearchLayoutType.SPINNER}"
+                value="@={viewModel.agentId}" />
+
+            <!-- 出库状态 -->
+            <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                hint='@{"请选择出库状态"}'
+                list="@{viewModel.outStatusList}"
+                type="@{SearchLayoutType.SPINNER}"
+                value="@={viewModel.outStatus}" />
+
+            <!-- 运单号 -->
+            <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                hint='@{"请输入运单号"}'
+                icon="@{@drawable/img_scan}"
+                setOnIconClickListener="@{()-> viewModel.waybillScanClick()}"
+                type="@{SearchLayoutType.INPUT}"
+                value="@={viewModel.waybillNo}" />
+
+            <!-- 搜索和筛选按钮 -->
+            <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" />
+
+                <ImageView
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_marginLeft="16dp"
+                    android:onClick="@{()-> viewModel.filterClick()}"
+                    android:padding="5dp"
+                    android:src="@drawable/img_filter" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <!-- 列表区域 -->
+        <com.scwang.smart.refresh.layout.SmartRefreshLayout
+            android:id="@+id/srl"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                itemLayoutId="@{viewModel.itemLayoutId}"
+                viewHolder="@{viewModel.itemViewHolder}"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_int_imp_query" />
+
+        </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: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="16sp"
+                    android:textStyle="bold"
+                    tools:text="合计：3票" />
+
+                <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="16sp"
+                    android:textStyle="bold"
+                    tools:text="总件数：100" />
+
+                <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="16sp"
+                    android:textStyle="bold"
+                    tools:text="总重量：100" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+</layout>

module_gjj/src/main/res/layout/dialog_int_imp_query_filter.xml

@@ -0,0 +1,153 @@
+<?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="model"
+            type="com.lukouguoji.gjj.dialog.IntImpQueryFilterDialogModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <!-- 状态栏占位 -->
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="25dp"
+            android:background="@color/white" />
+
+        <!-- 标题栏 -->
+        <include layout="@layout/title_tool_bar" />
+
+        <com.google.android.material.divider.MaterialDivider
+            android:layout_width="match_parent"
+            android:layout_height="1dp" />
+
+        <!-- 筛选条件区域 -->
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:padding="15dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <!-- 特码 -->
+                <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                    hint='@{"请输入特码"}'
+                    title='@{"特码"}'
+                    titleLength="@{4}"
+                    type="@{DataLayoutType.INPUT}"
+                    value='@={model.spCode}'
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp" />
+
+                <!-- 航班号 -->
+                <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                    hint='@{"请输入航班号"}'
+                    title='@{"航班号"}'
+                    titleLength="@{4}"
+                    type="@{DataLayoutType.INPUT}"
+                    value='@={model.flightNo}'
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp" />
+
+                <!-- 目的港 -->
+                <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                    hint='@{"请输入目的港"}'
+                    title='@{"目的港"}'
+                    titleLength="@{4}"
+                    type="@{DataLayoutType.INPUT}"
+                    value='@={model.dest}'
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp" />
+
+                <!-- 运单类型 -->
+                <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                    hint='@{"请选择运单类型"}'
+                    list="@{model.awbTypeList}"
+                    title='@{"运单类型"}'
+                    titleLength="@{4}"
+                    type="@{DataLayoutType.SPINNER}"
+                    value='@={model.awbType}'
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp" />
+
+                <!-- 业务类型 -->
+                <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                    hint='@{"请选择业务类型"}'
+                    list="@{model.businessTypeList}"
+                    title='@{"业务类型"}'
+                    titleLength="@{4}"
+                    type="@{DataLayoutType.SPINNER}"
+                    value='@={model.businessType}'
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp" />
+
+                <!-- 品名(中) -->
+                <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                    hint='@{"请输入品名"}'
+                    title='@{"品名(中)"}'
+                    titleLength="@{4}"
+                    type="@{DataLayoutType.INPUT}"
+                    value='@={model.goodsCn}'
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp" />
+
+                <!-- 底部按钮区域 -->
+                <LinearLayout
+                    android:layout_width="300dp"
+                    android:layout_height="50dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="32dp"
+                    android:background="@color/white"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:paddingHorizontal="15dp">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="40dp"
+                        android:layout_marginRight="24dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/bg_primary_radius_4"
+                        android:gravity="center"
+                        android:onClick="@{()-> model.onResetClick()}"
+                        android:text="重置"
+                        android:textColor="@color/white"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="40dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/bg_primary_radius_4"
+                        android:gravity="center"
+                        android:onClick="@{()-> model.onConfirmClick()}"
+                        android:text="搜索"
+                        android:textColor="@color/white"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+</layout>

module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml

@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:loadImage="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="bean"
+            type="com.lukouguoji.module_base.bean.IntImpPickUpDLVBean" />
+
+        <variable
+            name="position"
+            type="Integer" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/bg_white_radius_8"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <!-- 选中图标 -->
+        <ImageView
+            android:id="@+id/iv_icon"
+            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" />
+
+        <!-- 数据展示区域 -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <!-- 第一行：运单号、代理人、航班信息、件数、重量 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                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
+                        completeSpace="@{5}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="运单号："
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.wbNo}"
+                        android:textColor="@color/colorPrimary"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+
+                <!-- 代理人 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        completeSpace="@{4}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="代理人："
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.agentCode}"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+
+                <!-- 航班信息 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        completeSpace="@{5}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="航班信息："
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.flight}"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+
+                <!-- 件数 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        completeSpace="@{3}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="件数："
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{String.valueOf(bean.pc)}"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+
+                <!-- 重量 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        completeSpace="@{3}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="重量："
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{String.valueOf((int)bean.weight)}"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!-- 第二行：提货单号、库位、提取时间、品名(中) -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                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
+                        completeSpace="@{5}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="提货单号："
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.pkId}"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+
+                <!-- 库位 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        completeSpace="@{4}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="库  位："
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.location}"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+
+                <!-- 提取时间 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        completeSpace="@{5}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="提取时间："
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.chargeTime}"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+
+                <!-- 品名(中)：合并件数+重量列位置 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.6"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        completeSpace="@{6}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="品名(中)："
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.goods}"
+                        android:textSize="16sp" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</layout>

module_gjj/src/main/res/layout/item_int_imp_query.xml

@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="bean"
+            type="com.lukouguoji.module_base.bean.IntImpQueryBean" />
+    </data>
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:id="@+id/ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginVertical="5dp"
+        android:background="@drawable/bg_item"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <!-- 左侧图标 -->
+        <ImageView
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:src="@drawable/img_plane" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <!-- 第一行：运单号、件数、重量、代理人、入库时间 -->
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <!-- 运单号 -->
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.1"
+                    android:gravity="center_vertical">
+
+                    <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.wbNo}"
+                        android:textColor="@color/colorPrimary"
+                        tools:text="78109081212" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <!-- 件数 -->
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.7"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{3}"
+                        android:text="件数：" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text='@{String.valueOf(bean.awbPc)}'
+                        tools:text="10" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <!-- 重量 -->
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:gravity="center_vertical">
+
+                    <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.awbName}'
+                        tools:text="国际进港" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <!-- 代理人 -->
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.0"
+                    android:gravity="center_vertical">
+
+                    <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.agentName}'
+                        tools:text="SF" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <!-- 入库时间 -->
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:gravity="center_vertical">
+
+                    <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.inDate}'
+                        tools:text="2024-05-13 17:10:22" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <!-- 第二行：航班、件数（入库）、重量（运单）、航程、出库时间 -->
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp">
+
+                <!-- 航班 -->
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.1"
+                    android:gravity="center_vertical">
+
+                    <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.flight}"
+                        tools:text="20240513/MU2026" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <!-- 入库件数 -->
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.7"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{3}"
+                        android:text="特码：" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.spCode}"
+                        tools:text="NOR" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <!-- 运单重量 -->
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:gravity="center_vertical">
+
+                    <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.businessName}'
+                        tools:text="普货" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <!-- 航程 -->
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.0"
+                    android:gravity="center_vertical">
+
+                    <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}"
+                        tools:text="HFE" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <!-- 出库时间 -->
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:gravity="center_vertical">
+
+                    <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.dlvTime}'
+                        tools:text="2024-05-13 17:10:22" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </LinearLayout>
+
+        <!-- 右侧箭头 -->
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:src="@drawable/img_pda_right" />
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</layout>