feat: 国际出港 出港仓库

app/src/main/AndroidManifest.xml

@@ -133,6 +133,12 @@
             android:configChanges="orientation|keyboardHidden"
             android:exported="false"
             android:screenOrientation="userLandscape" />
+        <!-- 国际出港仓库 -->
+        <activity
+            android:name="com.lukouguoji.gjc.activity.IntExpStorageUseActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="false"
+            android:screenOrientation="userLandscape" />
         <!-- 国际出港查询 -->
         <activity
             android:name="com.lukouguoji.gjc.activity.GjcQueryActivity"

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

@@ -424,6 +424,11 @@ class HomeFragment : Fragment() {
                         ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_INT_EXP_ARRIVE)
                             .navigation()
                     }
+                    // 仓库
+                    Constant.AuthName.GjcIntExpStorageUse -> {
+                        ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_INT_EXP_STORAGE_USE)
+                            .navigation()
+                    }
                     /**
                      * 国际进港
                      */
@@ -744,6 +749,14 @@ class HomeFragment : Fragment() {
                     )
                 )
 
+                list.add(
+                    RightMenu(
+                        Constant.AuthName.GjcIntExpStorageUse,
+                        R.mipmap.gjc_cang_ku_icon,
+                        "仓库"
+                    )
+                )
+
 //                list.add(
 //                    RightMenu(
 //                        Constant.AuthName.GjcWareHouseActivity,

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

@@ -243,9 +243,22 @@ data class GjcStorageUse(
     var maWbId: Long? = null,          // 运单id
     var prefix: String? = null,        // 运单前缀
     var no: String? = null,            // 运单号
-    var storageCode: String? = null,   // 库位号
+    var location: String? = null,      // 库位号
+    var storageCode: String? = null,   // 库位号(兼容字段)
+    var uld: String? = null,           // 板箱号
     var inDate: Date? = null,          // 入库时间
-    var inId: String? = null,          // 入库人
+    var inOpId: String? = null,        // 入库人
+    var inId: String? = null,          // 入库人(兼容字段)
     var outDate: Date? = null,         // 出库时间
-    var outId: String? = null          // 出库人
+    var outOpId: String? = null,       // 出库人
-)
+    var outId: String? = null          // 出库人(兼容字段)
+) {
+    // ==================== UI扩展字段 ====================
+    @Transient
+    val checked: ObservableBoolean = ObservableBoolean(false)  // 选中状态
+
+    // 兼容现有API的isSelected属性
+    var isSelected: Boolean
+        get() = checked.get()
+        set(value) = checked.set(value)
+}

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

@@ -253,6 +253,7 @@ interface Constant {
             const val GjcIntExpLoad = "AppIntExpLoad" //出港装载
             const val GjcIntExpTally = "AppIntExpTally" //出港理货
             const val GjcIntExpArrive = "AppIntExpArrive" //出港运抵
+            const val GjcIntExpStorageUse = "AppIntExpStorageUse" //仓库
 
             /**
              * 国际进港

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

@@ -811,6 +811,27 @@ interface Api {
     @POST("IntExpMove/move")
     suspend fun submitIntExpMove(@Body data: RequestBody): BaseResultBean<SimpleResultBean>
 
+    /**
+     * 国际出港仓库-分页查询
+     * 接口路径: /IntExpStorageUse/pageQuery
+     */
+    @POST("IntExpStorageUse/pageQuery")
+    suspend fun getIntExpStorageUseList(@Body data: RequestBody): PageInfo<GjcMaWb>
+
+    /**
+     * 国际出港仓库-分页合计
+     * 接口路径: /IntExpStorageUse/pageQueryTotal
+     */
+    @POST("IntExpStorageUse/pageQueryTotal")
+    suspend fun getIntExpStorageUseTotal(@Body data: RequestBody): BaseResultBean<ManifestTotalDto>
+
+    /**
+     * 国际出港仓库-运单号模糊查询(后四位)
+     * 接口路径: /IntExpStorageUse/queryWbNoList
+     */
+    @POST("IntExpStorageUse/queryWbNoList")
+    suspend fun getIntExpStorageWbNoList(@Body data: RequestBody): BaseResultBean<List<String>>
+
     /**
      * 国际出港待计重-分页搜索
      * 接口路径: /IntExpCheckIn/pageQuery

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

@@ -146,6 +146,7 @@ object ARouterConstants {
     const val ACTIVITY_URL_INT_EXP_LOAD = "/gjc/IntExpLoadActivity"   //国际出港 出港装载
     const val ACTIVITY_URL_INT_EXP_TALLY = "/gjc/IntExpTallyActivity"   //国际出港 出港理货
     const val ACTIVITY_URL_INT_EXP_ARRIVE = "/gjc/IntExpArriveActivity"   //国际出港 出港运抵
+    const val ACTIVITY_URL_INT_EXP_STORAGE_USE = "/gjc/IntExpStorageUseActivity"   //国际出港 仓库
 
     /////////////////  国际进港模块
     /**

module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpStorageUseActivity.kt

@@ -0,0 +1,55 @@
+package com.lukouguoji.gjc.activity
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.lukouguoji.gjc.R
+import com.lukouguoji.gjc.databinding.ActivityIntExpStorageUseBinding
+import com.lukouguoji.gjc.viewModel.IntExpStorageUseViewModel
+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_EXP_STORAGE_USE)
+class IntExpStorageUseActivity :
+    BaseBindingActivity<ActivityIntExpStorageUseBinding, IntExpStorageUseViewModel>() {
+
+    override fun layoutId() = R.layout.activity_int_exp_storage_use
+    override fun viewModelClass() = IntExpStorageUseViewModel::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.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.wbNo.value = data?.getStringExtra(Constant.Result.CODED_CONTENT)
+            viewModel.searchClick()
+        }
+    }
+}

module_gjc/src/main/java/com/lukouguoji/gjc/holder/IntExpStorageUseSubViewHolder.kt

@@ -0,0 +1,26 @@
+package com.lukouguoji.gjc.holder
+
+import android.view.View
+import com.lukouguoji.gjc.databinding.ItemIntExpStorageUseSubBinding
+import com.lukouguoji.module_base.base.BaseViewHolder
+import com.lukouguoji.module_base.bean.GjcStorageUse
+
+/**
+ * 国际出港-仓库 库位明细行 ViewHolder
+ */
+class IntExpStorageUseSubViewHolder(view: View) :
+    BaseViewHolder<GjcStorageUse, ItemIntExpStorageUseSubBinding>(view) {
+
+    override fun onBind(item: Any?, position: Int) {
+        val bean = getItemBean(item) ?: return
+        binding.bean = bean
+        binding.position = position
+        binding.executePendingBindings()
+
+        // 单选框点击切换选择状态
+        binding.ivCheckbox.setOnClickListener {
+            bean.checked.set(!bean.checked.get())
+            binding.executePendingBindings()
+        }
+    }
+}

module_gjc/src/main/java/com/lukouguoji/gjc/holder/IntExpStorageUseViewHolder.kt

@@ -0,0 +1,44 @@
+package com.lukouguoji.gjc.holder
+
+import android.view.View
+import com.lukouguoji.gjc.R
+import com.lukouguoji.gjc.databinding.ItemIntExpStorageUseBinding
+import com.lukouguoji.module_base.adapter.setCommonAdapter
+import com.lukouguoji.module_base.base.BaseViewHolder
+import com.lukouguoji.module_base.bean.GjcMaWb
+import com.lukouguoji.module_base.ktx.refresh
+
+/**
+ * 国际出港-仓库 ViewHolder
+ */
+class IntExpStorageUseViewHolder(view: View) :
+    BaseViewHolder<GjcMaWb, ItemIntExpStorageUseBinding>(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()
+        }
+
+        // 展开按钮点击事件
+        binding.ivShow.setOnClickListener {
+            bean.showMore.set(!bean.showMore.get())
+        }
+
+        // 初始化库位明细子列表 RecyclerView
+        setCommonAdapter(
+            binding.rvSub,
+            IntExpStorageUseSubViewHolder::class.java,
+            R.layout.item_int_exp_storage_use_sub
+        )
+
+        // 刷新库位明细数据
+        binding.rvSub.refresh(bean.storageUseList ?: emptyList())
+    }
+}

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt

@@ -0,0 +1,194 @@
+package com.lukouguoji.gjc.viewModel
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.lukouguoji.gjc.R
+import com.lukouguoji.gjc.holder.IntExpStorageUseViewHolder
+import com.lukouguoji.module_base.base.BasePageViewModel
+import com.lukouguoji.module_base.bean.GjcMaWb
+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 IntExpStorageUseViewModel : BasePageViewModel() {
+
+    // ========== 筛选条件 ==========
+    val flightDate = MutableLiveData("")               // 航班日期
+    val flightNo = MutableLiveData("")                 // 航班号
+    val clearResult = MutableLiveData("")              // 清仓综合结果
+    val clearResultList = MutableLiveData<List<KeyValue>>() // 清仓综合结果列表
+    val wbNo = MutableLiveData("")                     // 运单号
+    val storageCode = MutableLiveData("")              // 库位号
+
+    // ========== 统计信息 ==========
+    val totalWbNumber = MutableLiveData("0")           // 总票数
+    val totalPc = MutableLiveData("0")                 // 总件数
+    val totalWeight = MutableLiveData("0")             // 总重量
+
+    // ========== 全选状态 ==========
+    val isAllChecked = MutableLiveData(false)
+
+    init {
+        // 初始化清仓综合结果列表（根据实际需求配置）
+        clearResultList.value = listOf(
+            KeyValue("全部", ""),
+            KeyValue("正常", "0"),
+            KeyValue("异常", "1")
+        )
+
+        // 监听全选状态，自动更新所有列表项
+        isAllChecked.observeForever { checked ->
+            val list = pageModel.rv?.commonAdapter()?.items as? List<GjcMaWb> ?: return@observeForever
+            list.forEach { it.checked.set(checked) }
+            pageModel.rv?.commonAdapter()?.notifyDataSetChanged()
+        }
+    }
+
+    // ========== 适配器配置 ==========
+    val itemViewHolder = IntExpStorageUseViewHolder::class.java
+    val itemLayoutId = R.layout.item_int_exp_storage_use
+
+    /**
+     * 搜索按钮点击
+     */
+    fun searchClick() {
+        refresh()
+    }
+
+    /**
+     * 全选按钮点击
+     */
+    fun checkAllClick() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjcMaWb> ?: return
+
+        val shouldCheckAll = !isAllChecked.value!!
+        list.forEach { it.checked.set(shouldCheckAll) }
+        isAllChecked.value = shouldCheckAll
+
+        pageModel.rv?.commonAdapter()?.notifyDataSetChanged()
+    }
+
+    /**
+     * 扫码运单号
+     */
+    fun scanWbNo() {
+        ScanModel.startScan(getTopActivity(), Constant.RequestCode.WAYBILL)
+    }
+
+    /**
+     * 清仓操作
+     */
+    fun clearStorage() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjcMaWb> ?: return
+        val selectedItems = list.filter { it.isSelected }
+
+        if (selectedItems.isEmpty()) {
+            showToast("请选择要清仓的运单")
+            return
+        }
+
+        // TODO: 实现清仓接口调用
+        showToast("清仓功能待实现")
+    }
+
+    /**
+     * 修改库位
+     */
+    fun modifyStorage() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjcMaWb> ?: return
+        val selectedItems = list.filter { it.isSelected }
+
+        if (selectedItems.isEmpty()) {
+            showToast("请选择要修改库位的运单")
+            return
+        }
+
+        // TODO: 实现修改库位接口调用或弹出对话框
+        showToast("修改库位功能待实现")
+    }
+
+    /**
+     * 出库操作
+     */
+    fun outStorage() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjcMaWb> ?: return
+        val selectedItems = list.filter { it.isSelected }
+
+        if (selectedItems.isEmpty()) {
+            showToast("请选择要出库的运单")
+            return
+        }
+
+        // TODO: 实现出库接口调用
+        showToast("出库功能待实现")
+    }
+
+    /**
+     * 入库操作
+     */
+    fun inStorage() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjcMaWb> ?: return
+        val selectedItems = list.filter { it.isSelected }
+
+        if (selectedItems.isEmpty()) {
+            showToast("请选择要入库的运单")
+            return
+        }
+
+        // TODO: 实现入库接口调用
+        showToast("入库功能待实现")
+    }
+
+    /**
+     * 获取数据 (重写BasePageViewModel)
+     */
+    override fun getData() {
+        // 构建搜索条件
+        val filterParams = mapOf(
+            "fdate" to flightDate.value?.ifEmpty { null },
+            "fno" to flightNo.value?.ifEmpty { null },
+            "wbNo" to wbNo.value?.ifEmpty { null },
+            "storageCode" to storageCode.value?.ifEmpty { null }
+        )
+
+        // 列表参数 (含分页)
+        val listParams = (filterParams + mapOf(
+            "pageNum" to pageModel.page,
+            "pageSize" to pageModel.limit
+        )).toRequestBody()
+
+        // 统计参数 (无分页)
+        val totalParams = filterParams.toRequestBody()
+
+        // 获取列表 (带Loading)
+        launchLoadingCollect({ NetApply.api.getIntExpStorageUseList(listParams) }) {
+            onSuccess = { result ->
+                // 手动处理 PageInfo 数据
+                pageModel.handleDataList(result.list)
+                pageModel.haveMore.postValue((result.pages) > pageModel.page)
+            }
+        }
+
+        // 获取统计信息 (后台请求，不阻塞列表)
+        launchCollect({ NetApply.api.getIntExpStorageUseTotal(totalParams) }) {
+            onSuccess = { result ->
+                val data = result.data
+                totalWbNumber.value = (data?.wbNumber ?: 0).toString()
+                totalPc.value = (data?.totalPc ?: 0).toString()
+                totalWeight.value = (data?.totalWeight ?: 0.0).toString()
+            }
+        }
+    }
+}

module_gjc/src/main/res/layout/activity_int_exp_storage_use.xml

@@ -0,0 +1,232 @@
+<?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.gjc.viewModel.IntExpStorageUseViewModel" />
+    </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}"
+                setUpperCaseAlphanumeric="@{true}"
+                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.clearResultList}"
+                type="@{SearchLayoutType.SPINNER}"
+                value="@={viewModel.clearResult}"
+                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='@{"请输入库位号"}'
+                type="@{SearchLayoutType.INPUT}"
+                value="@={viewModel.storageCode}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <!-- 搜索按钮 -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="10dp">
+
+                <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_exp_storage_use" />
+
+        </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.totalWbNumber+"票"}'
+                    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>
+
+            <!-- 操作按钮组 -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <!-- 清仓按钮 -->
+                <TextView
+                    style="@style/tv_bottom_btn"
+                    android:layout_marginEnd="10dp"
+                    android:onClick="@{()-> viewModel.clearStorage()}"
+                    android:text="清 仓" />
+
+                <!-- 修改库位按钮 -->
+                <TextView
+                    style="@style/tv_bottom_btn"
+                    android:layout_marginEnd="10dp"
+                    android:onClick="@{()-> viewModel.modifyStorage()}"
+                    android:text="修改库位" />
+
+                <!-- 出库按钮 -->
+                <TextView
+                    style="@style/tv_bottom_btn"
+                    android:layout_marginEnd="10dp"
+                    android:onClick="@{()-> viewModel.outStorage()}"
+                    android:text="出 库" />
+
+                <!-- 入库按钮 -->
+                <TextView
+                    style="@style/tv_bottom_btn"
+                    android:onClick="@{()-> viewModel.inStorage()}"
+                    android:text="入 库" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</layout>

module_gjc/src/main/res/layout/item_int_exp_storage_use.xml

@@ -0,0 +1,431 @@
+<?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:loadImage="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="bean"
+            type="com.lukouguoji.module_base.bean.GjcMaWb" />
+
+        <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:orientation="vertical">
+
+        <!-- 白色卡片主要内容区域 -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_white_radius_8"
+            android:orientation="vertical">
+
+            <!-- 主要内容区域 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                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="match_parent"
+                            android:layout_weight="1.0"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                completeSpace="@{4}"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="运单号："
+                                android:textColor="@color/text_normal"
+                                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"
+                                android:textStyle="bold" />
+
+                        </LinearLayout>
+
+                        <!-- 航班信息 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1.2"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                completeSpace="@{5}"
+                                android:text="航班信息："
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{bean.flight}"
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                        </LinearLayout>
+
+                        <!-- 航程 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="0.8"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                completeSpace="@{3}"
+                                android:text="航程："
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{bean.range}"
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                        </LinearLayout>
+
+                        <!-- 品名(英) -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1.2"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                completeSpace="@{5}"
+                                android:text="品名(英)："
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:text="@{bean.goods}"
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                        </LinearLayout>
+
+                        <!-- 重量 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="0.8"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                completeSpace="@{3}"
+                                android:text="重量："
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{String.valueOf((int)bean.weight)}"
+                                android:textColor="@color/text_normal"
+                                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.0"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                completeSpace="@{4}"
+                                android:text="代理人："
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{bean.agentName}"
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                        </LinearLayout>
+
+                        <!-- 件数 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1.2"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                completeSpace="@{5}"
+                                android:text="件数："
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{String.valueOf(bean.pc)}"
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                        </LinearLayout>
+
+                        <!-- 清仓正常否 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="0.8"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                completeSpace="@{3}"
+                                android:text="清仓正常否："
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="是"
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                        </LinearLayout>
+
+                        <!-- 入库时间 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1.2"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                completeSpace="@{5}"
+                                android:text="入库时间："
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{bean.opDate}"
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                        </LinearLayout>
+
+                        <!-- 库位数 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="0.8"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                completeSpace="@{3}"
+                                android:text="库位数："
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@{String.valueOf(bean.storageUseNumber)}"
+                                android:textColor="@color/text_normal"
+                                android:textSize="16sp" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!-- 展开/折叠按钮 -->
+            <ImageView
+                android:id="@+id/iv_show"
+                android:layout_width="match_parent"
+                android:layout_height="20dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
+                android:padding="5dp"
+                android:src="@mipmap/img_down"
+                visible="@{bean.storageUseList != null &amp;&amp; !bean.storageUseList.empty}" />
+
+        </LinearLayout>
+
+        <!-- 库位明细列表容器（在白色卡片外面） -->
+        <LinearLayout
+            visible="@{bean.showMore}"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:background="#e3f6e0"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <!-- 表头 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="10dp"
+                android:orientation="horizontal"
+                android:paddingHorizontal="10dp">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"
+                    android:gravity="center"
+                    android:text="选项"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="库位号"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="入库人"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.5"
+                    android:gravity="center"
+                    android:text="入库时间"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="出库人"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.5"
+                    android:gravity="center"
+                    android:text="出库时间"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+
+            <com.google.android.material.divider.MaterialDivider
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/c999999" />
+
+            <!-- 子列表 RecyclerView -->
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_sub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</layout>

module_gjc/src/main/res/layout/item_int_exp_storage_use_sub.xml

@@ -0,0 +1,90 @@
+<?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.GjcStorageUse" />
+
+        <variable
+            name="position"
+            type="Integer" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingHorizontal="10dp"
+        android:paddingVertical="8dp">
+
+        <!-- 选项（单选框） -->
+        <ImageView
+            android:id="@+id/iv_checkbox"
+            android:layout_width="0dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="0.5"
+            loadImage="@{bean.checked.get() ? @drawable/radiobtn_checked_gray : @drawable/radiobtn_unchecked_gray}"
+            android:src="@drawable/radiobtn_unchecked_style" />
+
+        <!-- 库位号 -->
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@{bean.location ?? bean.storageCode}"
+            android:textColor="@color/text_normal"
+            android:textSize="14sp" />
+
+        <!-- 入库人 -->
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@{bean.inOpId ?? bean.inId}"
+            android:textColor="@color/text_normal"
+            android:textSize="14sp" />
+
+        <!-- 入库时间 -->
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1.5"
+            android:gravity="center"
+            android:text="@{bean.inDate != null ? bean.inDate.toString() : ``}"
+            android:textColor="@color/text_normal"
+            android:textSize="14sp" />
+
+        <!-- 出库人 -->
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@{bean.outOpId ?? bean.outId}"
+            android:textColor="@color/text_normal"
+            android:textSize="14sp" />
+
+        <!-- 出库时间 -->
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1.5"
+            android:gravity="center"
+            android:text="@{bean.outDate != null ? bean.outDate.toString() : ``}"
+            android:textColor="@color/text_normal"
+            android:textSize="14sp" />
+
+    </LinearLayout>
+
+</layout>