fix: 国际进港出库列表页面优化及交互完善

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

app/src/main/AndroidManifest.xml

@@ -487,6 +487,13 @@
             android:exported="false"
             android:screenOrientation="userLandscape" />
 
+        <!-- 国际进港-费用修改 -->
+        <activity
+            android:name="com.lukouguoji.gjj.activity.IntImpPickUpChargeEditActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="false"
+            android:screenOrientation="userLandscape" />
+
         <!-- 国际进港-提取出库 -->
         <activity
             android:name="com.lukouguoji.gjj.activity.IntImpPickUpDLVActivity"

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

@@ -54,6 +54,18 @@ class IntImpPickUpDLVBean : Serializable {
     var awbPc: Long = 0
 
     // ========== UI扩展字段 ==========
+    /**
+     * 航班信息展示：优先使用 flight 字段，否则用 fdate(去杠)/fno 拼接
+     * 格式示例：20240204/MU2023
+     */
+    val flightInfo: String
+        get() {
+            if (!flight.isNullOrEmpty()) return flight
+            val dateStr = fdate?.replace("-", "")?.take(8) ?: ""
+            val noStr = fno ?: ""
+            return if (dateStr.isNotEmpty() || noStr.isNotEmpty()) "$dateStr/$noStr" else ""
+        }
+
     val checked: ObservableBoolean = ObservableBoolean(false)
 
     var isSelected: Boolean

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

@@ -5,28 +5,33 @@ import java.io.Serializable
 
 /**
  * 国际进港提取记录-列表数据Bean
- * 对应API: IntImpPickUpRecord/pageQuery
+ * 对应API: IntImpPickup/pageQuery
  */
 class IntImpPickUpRecordBean : Serializable {
     var id: Long = 0                     // 主键ID
     var wbNo: String = ""                // 运单号
+    var no: String = ""                  // 主单号
+    var prefix: String = ""              // 前缀
+    var hno: String = ""                 // 分单号
+    var serialNo: String = ""            // 序号
     var pc: Int = 0                      // 件数
     var weight: Double = 0.0             // 重量
-    var checkWeight: Double = 0.0        // 计重重量
+    var cashWeight: Double = 0.0         // 计费重量
     var agentCode: String = ""           // 代理人
     var spCode: String = ""              // 特码
-    var serviceFee: Double = 0.0         // 服务费
+    var optCharge: Double = 0.0          // 服务费
-    var storageFee: Double = 0.0         // 仓储费
+    var whsCharge: Double = 0.0          // 仓储费
-    var totalAmount: Double = 0.0        // 总金额
+    var amount: Double = 0.0             // 总金额
-    var pickUpTime: String = ""          // 提取时间
+    var chargeTime: String = ""          // 缴费时间/提取时间
-    var pickUpNo: String = ""            // 提货编号
+    var pkId: String = ""                // 提货编号
-    var infoFee: Double = 0.0            // 信息费
+    var tranCharge: Double = 0.0         // 信息费
-    var drawFee: Double = 0.0            // 抽单费
+    var drawBillCharge: Double = 0.0     // 抽单费
-    var coldFee: Double = 0.0            // 冷藏费
+    var efrCharge: Double = 0.0          // 冷藏费
-    var forkliftFee: Double = 0.0        // 铲车费
+    var svlCharge: Double = 0.0          // 铲车费
-    var tallyFee: Double = 0.0           // 理货费
+    var tallyCharge: Double = 0.0        // 理货费
-    var operator: String = ""            // 办理人
+    var chargeName: String = ""          // 办理人名称
-    var outTime: String = ""             // 出库时间
+    var chargeId: String = ""            // 收费员ID
+    var dlvTime: String = ""             // 出库时间
 
     // ========== UI扩展字段 ==========
     val checked: ObservableBoolean = ObservableBoolean(false)

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

@@ -954,31 +954,31 @@ interface Api {
 
     /**
      * 国际进港提取记录-分页查询
-     * 接口路径: /IntImpPickUpRecord/pageQuery
+     * 接口路径: /IntImpPickup/pageQuery
      */
-    @POST("IntImpPickUpRecord/pageQuery")
+    @POST("IntImpPickup/pageQuery")
     suspend fun getIntImpPickUpRecordList(@Body data: RequestBody): PageInfo<IntImpPickUpRecordBean>
 
     /**
      * 国际进港提取记录-分页合计
-     * 接口路径: /IntImpPickUpRecord/pageQueryTotal
+     * 接口路径: /IntImpPickup/pageQueryTotal
      */
-    @POST("IntImpPickUpRecord/pageQueryTotal")
+    @POST("IntImpPickup/pageQueryTotal")
     suspend fun getIntImpPickUpRecordTotal(@Body data: RequestBody): BaseResultBean<ManifestTotalDto>
 
     /**
      * 国际进港提取记录-清除提货
-     * 接口路径: /IntImpPickUpRecord/clearPickUp
+     * 接口路径: /IntImpPickup/clearPickup
      */
-    @POST("IntImpPickUpRecord/clearPickUp")
+    @POST("IntImpPickup/clearPickup")
-    suspend fun clearIntImpPickUp(@Body data: RequestBody): BaseResultBean<Boolean>
+    suspend fun clearIntImpPickUp(@Body data: RequestBody): BaseResultBean<String>
 
     /**
-     * 国际进港提取记录-详情
+     * 国际进港提取记录-修改费用
-     * 接口路径: /IntImpPickUpRecord/getDetails
+     * 接口路径: /IntImpPickup/modifyCharge
      */
-    @POST("IntImpPickUpRecord/getDetails")
+    @POST("IntImpPickup/modifyCharge")
-    suspend fun getIntImpPickUpRecordDetails(@Body data: RequestBody): BaseResultBean<IntImpPickUpRecordBean>
+    suspend fun modifyIntImpPickUpCharge(@Body data: RequestBody): BaseResultBean<String>
 
     /**
      * 国际进港提取出库-分页查询

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

@@ -0,0 +1,37 @@
+package com.lukouguoji.gjj.activity
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.google.gson.Gson
+import com.lukouguoji.gjj.R
+import com.lukouguoji.gjj.databinding.ActivityIntImpPickUpChargeEditBinding
+import com.lukouguoji.gjj.viewModel.IntImpPickUpChargeEditViewModel
+import com.lukouguoji.module_base.base.BaseBindingActivity
+import com.lukouguoji.module_base.bean.IntImpPickUpRecordBean
+import com.lukouguoji.module_base.common.Constant
+
+/**
+ * 国际进港-费用修改
+ */
+class IntImpPickUpChargeEditActivity :
+    BaseBindingActivity<ActivityIntImpPickUpChargeEditBinding, IntImpPickUpChargeEditViewModel>() {
+
+    override fun layoutId() = R.layout.activity_int_imp_pick_up_charge_edit
+    override fun viewModelClass() = IntImpPickUpChargeEditViewModel::class.java
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        setBackArrow("国际进港费用修改")
+        binding.viewModel = viewModel
+        viewModel.initOnCreated(intent)
+    }
+
+    companion object {
+        @JvmStatic
+        fun start(context: Context, bean: IntImpPickUpRecordBean) {
+            val starter = Intent(context, IntImpPickUpChargeEditActivity::class.java)
+                .putExtra(Constant.Key.DATA, Gson().toJson(bean))
+            context.startActivity(starter)
+        }
+    }
+}

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

@@ -3,7 +3,6 @@ package com.lukouguoji.gjj.activity
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.lukouguoji.gjj.R
 import com.lukouguoji.gjj.databinding.ActivityIntImpPickUpRecordBinding
@@ -14,8 +13,11 @@ 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.interfaces.IOnItemClickListener
+import com.lukouguoji.module_base.ktx.addOnItemClickListener
 import com.lukouguoji.module_base.ktx.commonAdapter
 import com.lukouguoji.module_base.ktx.showToast
+import com.lukouguoji.module_base.model.ConfirmDialogModel
 import com.lukouguoji.module_base.router.ARouterConstants
 
 /**
@@ -41,11 +43,35 @@ class IntImpPickUpRecordActivity :
         // 绑定分页
         viewModel.pageModel.bindSmartRefreshLayout(binding.srl, binding.rv, viewModel, this)
 
+        // 设置列表项点击回调（侧滑修改按钮）
+        binding.rv.addOnItemClickListener(object : IOnItemClickListener {
+            override fun onItemClick(position: Int, type: Int) {
+                when (type) {
+                    2000 -> {
+                        // 侧滑修改操作
+                        val list = viewModel.pageModel.rv?.commonAdapter()?.items as? List<*> ?: return
+                        val bean = list.getOrNull(position) as? IntImpPickUpRecordBean ?: return
+                        IntImpPickUpChargeEditActivity.start(this@IntImpPickUpRecordActivity, bean)
+                    }
+                }
+            }
+        })
+
         // 监听刷新事件
         FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).observe(this) {
             viewModel.refresh()
         }
 
+        // 运单号自动查询额外参数
+        binding.pslWbNo.autoQueryConfig.extraParamsProvider = {
+            mapOf(
+                "beginDate" to viewModel.paymentDateStart.value,
+                "endDate" to viewModel.paymentDateEnd.value,
+                "agentCode" to viewModel.agentCode.value,
+                "spCode" to viewModel.spCode.value
+            )
+        }
+
         // 初始化下拉列表
         viewModel.initAgentList()
         viewModel.initSpecialCodeList()
@@ -68,14 +94,12 @@ class IntImpPickUpRecordActivity :
             return
         }
 
-        AlertDialog.Builder(this)
+        ConfirmDialogModel(
-            .setTitle("清除提货确认")
+            message = "确定要清除选中的 ${selectedItems.size} 条提货记录吗？",
-            .setMessage("确定要清除选中的 ${selectedItems.size} 条提货记录吗？")
+            title = "清除提货确认"
-            .setPositiveButton("确定") { _, _ ->
+        ) {
             viewModel.clearPickUp(selectedItems)
-            }
+        }.show(this)
-            .setNegativeButton("取消", null)
-            .show()
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

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

@@ -3,10 +3,12 @@ package com.lukouguoji.gjj.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import com.google.gson.Gson
 import com.lukouguoji.gjj.R
 import com.lukouguoji.gjj.databinding.ActivityIntImpPickUpRecordDetailsBinding
 import com.lukouguoji.gjj.viewModel.IntImpPickUpRecordDetailsViewModel
 import com.lukouguoji.module_base.base.BaseBindingActivity
+import com.lukouguoji.module_base.bean.IntImpPickUpRecordBean
 import com.lukouguoji.module_base.common.Constant
 
 /**
@@ -26,9 +28,9 @@ class IntImpPickUpRecordDetailsActivity :
 
     companion object {
         @JvmStatic
-        fun start(context: Context, id: Long) {
+        fun start(context: Context, bean: IntImpPickUpRecordBean) {
             val starter = Intent(context, IntImpPickUpRecordDetailsActivity::class.java)
-                .putExtra(Constant.Key.ID, id)
+                .putExtra(Constant.Key.DATA, Gson().toJson(bean))
             context.startActivity(starter)
         }
     }

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

@@ -25,8 +25,14 @@ class IntImpPickUpRecordViewHolder(view: View) :
         }
 
         // 列表项点击进入提取详情
-        itemView.setOnClickListener {
+        binding.ll.setOnClickListener {
-            IntImpPickUpRecordDetailsActivity.start(itemView.context, bean.id)
+            IntImpPickUpRecordDetailsActivity.start(itemView.context, bean)
+        }
+
+        // 侧滑菜单 - 修改按钮
+        binding.btnEdit.setOnClickListener {
+            binding.swipeMenu.quickClose()
+            clickListener?.onItemClick(position, 2000)  // type=2000表示修改操作
         }
     }
 }

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

@@ -0,0 +1,89 @@
+package com.lukouguoji.gjj.viewModel
+
+import android.content.Intent
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.google.gson.Gson
+import com.lukouguoji.module_base.base.BaseViewModel
+import com.lukouguoji.module_base.bean.IntImpPickUpRecordBean
+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.launchLoadingCollect
+import com.lukouguoji.module_base.ktx.showToast
+import com.lukouguoji.module_base.ktx.toRequestBody
+import kotlinx.coroutines.launch
+
+/**
+ * 国际进港费用修改 ViewModel
+ */
+class IntImpPickUpChargeEditViewModel : BaseViewModel() {
+
+    val dataBean = MutableLiveData(IntImpPickUpRecordBean())
+
+    // 可编辑费用字段（String 用于双向绑定）
+    val tranChargeStr = MutableLiveData("")       // 信息费
+    val whsChargeStr = MutableLiveData("")        // 仓储费
+    val drawBillChargeStr = MutableLiveData("")   // 抽单费
+    val efrChargeStr = MutableLiveData("")        // 冷藏费
+    val svlChargeStr = MutableLiveData("")        // 铲车费
+    val tallyChargeStr = MutableLiveData("")      // 理货费
+
+    fun initOnCreated(intent: Intent) {
+        val jsonData = intent.getStringExtra(Constant.Key.DATA) ?: ""
+        if (jsonData.isNotEmpty()) {
+            try {
+                val bean = Gson().fromJson(jsonData, IntImpPickUpRecordBean::class.java)
+                dataBean.value = bean
+                // 初始化可编辑费用字段
+                tranChargeStr.value = if (bean.tranCharge != 0.0) bean.tranCharge.toString() else ""
+                whsChargeStr.value = if (bean.whsCharge != 0.0) bean.whsCharge.toString() else ""
+                drawBillChargeStr.value = if (bean.drawBillCharge != 0.0) bean.drawBillCharge.toString() else ""
+                efrChargeStr.value = if (bean.efrCharge != 0.0) bean.efrCharge.toString() else ""
+                svlChargeStr.value = if (bean.svlCharge != 0.0) bean.svlCharge.toString() else ""
+                tallyChargeStr.value = if (bean.tallyCharge != 0.0) bean.tallyCharge.toString() else ""
+            } catch (e: Exception) {
+                showToast("数据解析失败")
+                getTopActivity().finish()
+            }
+        } else {
+            showToast("未接收到数据")
+            getTopActivity().finish()
+        }
+    }
+
+    /**
+     * 保存修改
+     */
+    fun submit() {
+        val bean = dataBean.value ?: return
+
+        // 同步可编辑费用字段回 bean
+        bean.tranCharge = tranChargeStr.value?.toDoubleOrNull() ?: 0.0
+        bean.whsCharge = whsChargeStr.value?.toDoubleOrNull() ?: 0.0
+        bean.drawBillCharge = drawBillChargeStr.value?.toDoubleOrNull() ?: 0.0
+        bean.efrCharge = efrChargeStr.value?.toDoubleOrNull() ?: 0.0
+        bean.svlCharge = svlChargeStr.value?.toDoubleOrNull() ?: 0.0
+        bean.tallyCharge = tallyChargeStr.value?.toDoubleOrNull() ?: 0.0
+
+        launchLoadingCollect({
+            NetApply.api.modifyIntImpPickUpCharge(bean.toRequestBody())
+        }) {
+            onSuccess = {
+                showToast("修改成功")
+                viewModelScope.launch {
+                    FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                }
+                getTopActivity().finish()
+            }
+        }
+    }
+
+    /**
+     * 取消
+     */
+    fun cancel() {
+        getTopActivity().finish()
+    }
+}

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

@@ -16,9 +16,12 @@ 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.formatDate
 import com.lukouguoji.module_base.ktx.toRequestBody
+import com.lukouguoji.module_base.model.ConfirmDialogModel
 import com.lukouguoji.module_base.model.ScanModel
 import dev.utils.app.info.KeyValue
+import dev.utils.common.DateUtils
 import kotlinx.coroutines.launch
 
 /**
@@ -27,7 +30,7 @@ import kotlinx.coroutines.launch
 class IntImpPickUpDLVViewModel : BasePageViewModel() {
 
     // ========== 搜索条件 ==========
-    val paymentDateStart = MutableLiveData("")    // 缴费日期起
+    val paymentDateStart = MutableLiveData(DateUtils.getCurrentTime().formatDate())    // 缴费日期起
     val paymentDateEnd = MutableLiveData("")      // 缴费日期止
     val agentCode = MutableLiveData("")           // 代理人
     val wbNo = MutableLiveData("")               // 运单号
@@ -116,6 +119,10 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() {
             return
         }
 
+        ConfirmDialogModel(
+            message = "确定要将选中的${selectedItems.size}条记录确认出库吗？",
+            title = "确认出库"
+        ) {
             launchLoadingCollect({ NetApply.api.confirmIntImpPickUpDLV(selectedItems.toRequestBody()) }) {
                 onSuccess = {
                     showToast("确认出库成功")
@@ -125,6 +132,7 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() {
                     refresh()
                 }
             }
+        }.show()
     }
 
     /**

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

@@ -2,41 +2,26 @@ package com.lukouguoji.gjj.viewModel
 
 import android.content.Intent
 import androidx.lifecycle.MutableLiveData
+import com.google.gson.Gson
 import com.lukouguoji.module_base.base.BaseViewModel
 import com.lukouguoji.module_base.bean.IntImpPickUpRecordBean
 import com.lukouguoji.module_base.common.Constant
-import com.lukouguoji.module_base.http.net.NetApply
-import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.showToast
-import com.lukouguoji.module_base.ktx.toRequestBody
 
 /**
  * 国际进港提取详情 ViewModel
  */
 class IntImpPickUpRecordDetailsViewModel : BaseViewModel() {
 
-    var recordId: Long = 0
-
     val dataBean = MutableLiveData(IntImpPickUpRecordBean())
 
     fun initOnCreated(intent: Intent) {
-        recordId = intent.getLongExtra(Constant.Key.ID, 0)
+        val json = intent.getStringExtra(Constant.Key.DATA) ?: ""
-        if (recordId > 0) {
+        if (json.isNotEmpty()) {
-            getData()
+            dataBean.value = Gson().fromJson(json, IntImpPickUpRecordBean::class.java)
         } else {
             showToast("参数错误")
             getTopActivity().finish()
         }
     }
-
-    private fun getData() {
-        val params = mapOf("id" to recordId).toRequestBody()
-        launchLoadingCollect({
-            NetApply.api.getIntImpPickUpRecordDetails(params)
-        }) {
-            onSuccess = {
-                dataBean.value = it.data ?: IntImpPickUpRecordBean()
-            }
-        }
-    }
 }

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

@@ -18,8 +18,10 @@ import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.noNull
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
+import com.lukouguoji.module_base.ktx.formatDate
 import com.lukouguoji.module_base.model.ScanModel
 import com.lukouguoji.module_base.util.DictUtils
+import dev.utils.common.DateUtils
 import dev.utils.app.info.KeyValue
 import kotlinx.coroutines.launch
 
@@ -29,7 +31,7 @@ import kotlinx.coroutines.launch
 class IntImpPickUpRecordViewModel : BasePageViewModel() {
 
     // ========== 筛选条件 ==========
-    val paymentDateStart = MutableLiveData("")       // 缴费日期起
+    val paymentDateStart = MutableLiveData(DateUtils.getCurrentTime().formatDate())  // 缴费日期起
     val paymentDateEnd = MutableLiveData("")          // 缴费日期止
     val agentCode = MutableLiveData("")               // 代理人
     val spCode = MutableLiveData("")                  // 特码
@@ -144,16 +146,16 @@ class IntImpPickUpRecordViewModel : BasePageViewModel() {
      */
     override fun getData() {
         val filterParams = mapOf(
-            "paymentDateStart" to paymentDateStart.value?.ifEmpty { null },
+            "beginDate" to paymentDateStart.value?.ifEmpty { null },
-            "paymentDateEnd" to paymentDateEnd.value?.ifEmpty { null },
+            "endDate" to paymentDateEnd.value?.ifEmpty { null },
             "agentCode" to agentCode.value?.ifEmpty { null },
             "spCode" to spCode.value?.ifEmpty { null },
             "wbNo" to wbNo.value?.ifEmpty { null }
         )
 
         val listParams = (filterParams + mapOf(
-            "pageNum" to pageModel.page,
+            "page" to pageModel.page,
-            "pageSize" to pageModel.limit
+            "limit" to pageModel.limit
         )).toRequestBody()
 
         val totalParams = filterParams.toRequestBody()

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

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <import type="com.lukouguoji.module_base.ui.weight.data.layout.DataLayoutType" />
+
+        <variable
+            name="viewModel"
+            type="com.lukouguoji.gjj.viewModel.IntImpPickUpChargeEditViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_f2"
+        android:orientation="vertical">
+
+        <!-- 标题栏 -->
+        <include layout="@layout/title_tool_bar" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="15dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_white_radius_8"
+                    android:orientation="vertical"
+                    android:padding="15dp">
+
+                    <!-- 第1行：运单号、代理人、特码（只读） -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"运 单 号"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.wbNo}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"代 理 人"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.agentCode}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"特 码"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.spCode}' />
+
+                    </LinearLayout>
+
+                    <!-- 第2行：提货编号、件数、重量（只读） -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"提货编号"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.pkId}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"件数"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.pc)}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"重量"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.weight)}' />
+
+                    </LinearLayout>
+
+                    <!-- 第3行：计费重量（只读）、信息费（可编辑）、服务费（只读） -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"计费重量"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.cashWeight)}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入信息费"}'
+                            title='@{"信息费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.tranChargeStr}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"服务费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.optCharge)}' />
+
+                    </LinearLayout>
+
+                    <!-- 第4行：仓储费、抽单费、冷藏费（可编辑） -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入仓储费"}'
+                            title='@{"仓储费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.whsChargeStr}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入抽单费"}'
+                            title='@{"抽单费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.drawBillChargeStr}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入冷藏费"}'
+                            title='@{"冷藏费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.efrChargeStr}' />
+
+                    </LinearLayout>
+
+                    <!-- 第5行：铲车费、理货费（可编辑）、总金额（只读） -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入铲车费"}'
+                            title='@{"铲车费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.svlChargeStr}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{true}"
+                            hint='@{"请输入理货费"}'
+                            title='@{"理货费"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.tallyChargeStr}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"总金额"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{String.valueOf(viewModel.dataBean.amount)}' />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- 底部操作按钮 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="56dp"
+                    android:layout_marginTop="24dp"
+                    android:gravity="center"
+                    android:paddingHorizontal="15dp">
+
+                    <TextView
+                        style="@style/tv_bottom_btn"
+                        android:layout_width="120dp"
+                        android:layout_marginEnd="20dp"
+                        android:onClick="@{()-> viewModel.cancel()}"
+                        android:text="取消" />
+
+                    <TextView
+                        style="@style/tv_bottom_btn"
+                        android:layout_width="120dp"
+                        android:onClick="@{()-> viewModel.submit()}"
+                        android:text="保存" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </ScrollView>
+
+    </LinearLayout>
+
+</layout>

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

@@ -61,6 +61,12 @@
 
             <!-- 运单号 -->
             <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                autoQueryEnabled="@{true}"
+                autoQueryMaxLength="@{8}"
+                autoQueryMinLength="@{4}"
+                autoQueryParamKey="@{`wbNo`}"
+                autoQueryTitle="@{`选择运单号`}"
+                autoQueryUrl="@{`/IntImpPickUpDlv/queryWbNoList`}"
                 hint='@{"请输入运单号"}'
                 icon="@{@drawable/img_scan}"
                 setOnIconClickListener="@{(v)-> viewModel.scanWbNo()}"
@@ -159,7 +165,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text='@{"合计:" + viewModel.totalCount + "票"}'
+                    android:text='@{"合计：" + viewModel.totalCount + "票"}'
                     android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold" />
@@ -168,7 +174,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
-                    android:text='@{"总件数:" + viewModel.totalPc}'
+                    android:text='@{"总件数：" + viewModel.totalPc}'
                     android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold" />
@@ -177,7 +183,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
-                    android:text='@{"总重量:" + viewModel.totalWeight}'
+                    android:text='@{"总重量：" + viewModel.totalWeight}'
                     android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold" />

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

@@ -75,6 +75,13 @@
 
             <!-- 运单号 -->
             <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                android:id="@+id/pslWbNo"
+                autoQueryEnabled="@{true}"
+                autoQueryMaxLength="@{8}"
+                autoQueryMinLength="@{4}"
+                autoQueryParamKey="@{`wbNo`}"
+                autoQueryTitle="@{`选择运单号`}"
+                autoQueryUrl="@{`/IntImpPickup/queryWbNoList`}"
                 hint='@{"请输入运单号"}'
                 icon="@{@drawable/img_scan}"
                 setOnIconClickListener="@{(v)-> viewModel.scanWbNo()}"
@@ -162,7 +169,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text='@{"合计:" + viewModel.totalCount + "票"}'
+                    android:text='@{"合计：" + viewModel.totalCount + "票"}'
                     android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold" />
@@ -171,7 +178,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
-                    android:text='@{"总件数:" + viewModel.totalPc}'
+                    android:text='@{"总件数：" + viewModel.totalPc}'
                     android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold" />
@@ -180,7 +187,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
-                    android:text='@{"总重量:" + viewModel.totalWeight}'
+                    android:text='@{"总重量：" + viewModel.totalWeight}'
                     android:textColor="@color/bottom_tool_tips_text_color"
                     android:textSize="18sp"
                     android:textStyle="bold" />

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

@@ -84,7 +84,7 @@
                         title='@{"提货编号"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.pickUpNo}'
+                        value='@{viewModel.dataBean.pkId}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
@@ -123,7 +123,7 @@
                         title='@{"计费重量"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.checkWeight)}'
+                        value='@{String.valueOf(viewModel.dataBean.cashWeight)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
@@ -133,7 +133,7 @@
                         title='@{"信息费"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.infoFee)}'
+                        value='@{String.valueOf(viewModel.dataBean.tranCharge)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
@@ -143,7 +143,7 @@
                         title='@{"服务费"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.serviceFee)}'
+                        value='@{String.valueOf(viewModel.dataBean.optCharge)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
@@ -162,7 +162,7 @@
                         title='@{"仓储费"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.storageFee)}'
+                        value='@{String.valueOf(viewModel.dataBean.whsCharge)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
@@ -172,7 +172,7 @@
                         title='@{"抽单费"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.drawFee)}'
+                        value='@{String.valueOf(viewModel.dataBean.drawBillCharge)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
@@ -182,7 +182,7 @@
                         title='@{"冷藏费"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.coldFee)}'
+                        value='@{String.valueOf(viewModel.dataBean.efrCharge)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
@@ -201,7 +201,7 @@
                         title='@{"铲车费"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.forkliftFee)}'
+                        value='@{String.valueOf(viewModel.dataBean.svlCharge)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
@@ -211,7 +211,7 @@
                         title='@{"理货费"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.tallyFee)}'
+                        value='@{String.valueOf(viewModel.dataBean.tallyCharge)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
@@ -221,7 +221,7 @@
                         title='@{"总金额"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{String.valueOf(viewModel.dataBean.totalAmount)}'
+                        value='@{String.valueOf(viewModel.dataBean.amount)}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
@@ -240,7 +240,7 @@
                         title='@{"提取时间"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.pickUpTime}'
+                        value='@{viewModel.dataBean.chargeTime}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
@@ -250,7 +250,7 @@
                         title='@{"办理人"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.operator}'
+                        value='@{viewModel.dataBean.chargeName}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />
@@ -260,7 +260,7 @@
                         title='@{"出库时间"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@{viewModel.dataBean.outTime}'
+                        value='@{viewModel.dataBean.dlvTime}'
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1" />

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

@@ -13,12 +13,13 @@
             type="Integer" />
     </data>
 
-    <LinearLayout
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:id="@+id/ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="10dp"
+        android:layout_marginHorizontal="15dp"
-        android:layout_marginTop="10dp"
+        android:layout_marginVertical="5dp"
-        android:background="@drawable/bg_white_radius_8"
+        android:background="@drawable/bg_item"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:padding="10dp">
@@ -28,7 +29,7 @@
             android:id="@+id/iv_icon"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginEnd="10dp"
+            android:layout_gravity="center"
             loadImage="@{bean.checked.get() ? @drawable/img_plane_s : @drawable/img_plane}"
             android:src="@drawable/img_plane" />
 
@@ -36,22 +37,21 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
             android:layout_weight="1"
             android:orientation="vertical">
 
             <!-- 第一行：运单号、代理人、航班信息、件数、重量 -->
-            <LinearLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="wrap_content">
-                android:orientation="horizontal">
 
                 <!-- 运单号 -->
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1.0"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical">
-                    android:orientation="horizontal">
 
                     <TextView
                         completeSpace="@{5}"
@@ -65,17 +65,17 @@
                         android:layout_height="wrap_content"
                         android:text="@{bean.wbNo}"
                         android:textColor="@color/colorPrimary"
-                        android:textSize="16sp" />
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
 
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <!-- 代理人 -->
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="0.6"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical">
-                    android:orientation="horizontal">
 
                     <TextView
                         completeSpace="@{4}"
@@ -90,15 +90,14 @@
                         android:text="@{bean.agentCode}"
                         android:textSize="16sp" />
 
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <!-- 航班信息 -->
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1.0"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical">
-                    android:orientation="horizontal">
 
                     <TextView
                         completeSpace="@{5}"
@@ -110,21 +109,20 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{bean.flight}"
+                        android:text="@{bean.flightInfo}"
                         android:textSize="16sp" />
 
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <!-- 件数 -->
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.8"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical">
-                    android:orientation="horizontal">
 
                     <TextView
-                        completeSpace="@{3}"
+                        completeSpace="@{5}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="件数："
@@ -136,15 +134,14 @@
                         android:text="@{String.valueOf(bean.pc)}"
                         android:textSize="16sp" />
 
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <!-- 重量 -->
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="0.6"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical">
-                    android:orientation="horizontal">
 
                     <TextView
                         completeSpace="@{3}"
@@ -159,24 +156,22 @@
                         android:text="@{String.valueOf((int)bean.weight)}"
                         android:textSize="16sp" />
 
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
-            </LinearLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
             <!-- 第二行：提货单号、库位、提取时间、品名(中) -->
-            <LinearLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="10dp">
-                android:orientation="horizontal">
 
                 <!-- 提货单号 -->
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1.0"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical">
-                    android:orientation="horizontal">
 
                     <TextView
                         completeSpace="@{5}"
@@ -191,15 +186,14 @@
                         android:text="@{bean.pkId}"
                         android:textSize="16sp" />
 
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <!-- 库位 -->
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="0.6"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical">
-                    android:orientation="horizontal">
 
                     <TextView
                         completeSpace="@{4}"
@@ -214,15 +208,14 @@
                         android:text="@{bean.location}"
                         android:textSize="16sp" />
 
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <!-- 提取时间 -->
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1.0"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical">
-                    android:orientation="horizontal">
 
                     <TextView
                         completeSpace="@{5}"
@@ -237,35 +230,37 @@
                         android:text="@{bean.chargeTime}"
                         android:textSize="16sp" />
 
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
-                <!-- 品名(中)：合并件数+重量列位置 -->
+                <!-- 品名(中)：占据件数+重量两列宽度 -->
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.6"
+                    android:layout_weight="1.4"
-                    android:gravity="center_vertical"
+                    android:gravity="center_vertical">
-                    android:orientation="horizontal">
 
                     <TextView
-                        completeSpace="@{6}"
+                        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_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:text="@{bean.goods}"
                         android:textSize="16sp" />
 
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
         </LinearLayout>
 
-        </LinearLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
-
-    </LinearLayout>
 
 </layout>

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

@@ -13,13 +13,26 @@
             type="Integer" />
     </data>
 
-    <!-- 主列表项容器 -->
+    <!-- 外层容器承载间距 -->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="10dp"
+        android:layout_marginHorizontal="15dp"
-        android:layout_marginTop="10dp"
+        android:layout_marginVertical="5dp"
-        android:background="@drawable/bg_white_radius_8"
+        android:orientation="vertical">
+
+        <!-- 侧滑布局 -->
+        <com.mcxtzhang.swipemenulib.SwipeMenuLayout
+            android:id="@+id/swipe_menu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- 主列表项容器 -->
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_item"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
                 android:padding="10dp">
@@ -29,7 +42,7 @@
                 android:id="@+id/iv_icon"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-            android:layout_marginEnd="10dp"
+                android:layout_gravity="center"
                 loadImage="@{bean.checked.get() ? @drawable/img_plane_s : @drawable/img_plane}"
                 android:src="@drawable/img_plane" />
 
@@ -37,267 +50,274 @@
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
                 android:layout_weight="1"
                 android:orientation="vertical">
 
-            <!-- 第一行：运单号、件数、重量、计重重量、代理 -->
+                <!-- 第一行：运单号、件数、重量、计费重量、代理 -->
-            <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                    android:layout_height="wrap_content">
-                android:orientation="horizontal">
 
                     <!-- 运单号 -->
-                <LinearLayout
+                    <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                        android:layout_weight="1.0"
-                    android:orientation="horizontal">
+                        android:gravity="center_vertical">
 
                         <TextView
                             completeSpace="@{4}"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:text="运单号"
+                            android:text="运单号："
                             android:textSize="16sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
                             android:text="@{bean.wbNo}"
                             android:textColor="@color/colorPrimary"
                             android:textSize="16sp" />
 
-                </LinearLayout>
+                    </androidx.appcompat.widget.LinearLayoutCompat>
 
                     <!-- 件数 -->
-                <LinearLayout
+                    <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="0.7"
-                    android:orientation="horizontal">
+                        android:gravity="center_vertical">
-
-                    <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:layout_marginStart="8dp"
-                        android:text="@{String.valueOf(bean.pc)}"
-                        android:textSize="16sp"
-                        android:textStyle="bold" />
-
-                </LinearLayout>
-
-                <!-- 重量 -->
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
-                    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:layout_marginStart="8dp"
-                        android:text="@{String.valueOf((int)bean.weight)}"
-                        android:textSize="16sp"
-                        android:textStyle="bold" />
-
-                </LinearLayout>
-
-                <!-- 计重重量 -->
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="horizontal">
 
                         <TextView
                             completeSpace="@{5}"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:text="计重重量"
+                            android:text="件数："
                             android:textSize="16sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
+                            android:text="@{String.valueOf(bean.pc)}"
-                        android:text="@{String.valueOf((int)bean.checkWeight)}"
                             android:textSize="16sp" />
 
-                </LinearLayout>
+                    </androidx.appcompat.widget.LinearLayoutCompat>
 
-                <!-- 代理 -->
+                    <!-- 重量 -->
-                <LinearLayout
+                    <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="0.7"
-                    android:orientation="horizontal">
+                        android:gravity="center_vertical">
 
                         <TextView
-                        completeSpace="@{3}"
+                            completeSpace="@{5}"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:text="代理"
+                            android:text="重量："
                             android:textSize="16sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
+                            android:text="@{String.valueOf((int)bean.weight)}"
-                        android:text="@{bean.agentCode}"
                             android:textSize="16sp" />
 
-                </LinearLayout>
+                    </androidx.appcompat.widget.LinearLayoutCompat>
 
-            </LinearLayout>
+                    <!-- 计费重量 -->
-
+                    <androidx.appcompat.widget.LinearLayoutCompat
-            <!-- 第二行：特码、服务费、仓储费、总金额、提取时间 -->
+                        android:layout_width="0dp"
-            <LinearLayout
-                android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
+                        android:layout_weight="0.7"
-                android:orientation="horizontal">
+                        android:gravity="center_vertical">
 
-                <!-- 特码 -->
+                        <TextView
-                <LinearLayout
+                            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="@{String.valueOf((int)bean.cashWeight)}"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- 代理 -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1.2"
-                    android:orientation="horizontal">
+                        android:gravity="center_vertical">
-
-                    <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:layout_marginStart="8dp"
-                        android:text="@{bean.spCode}"
-                        android:textSize="16sp" />
-
-                </LinearLayout>
-
-                <!-- 服务费 -->
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    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:layout_marginStart="4dp"
-                        android:text="@{String.valueOf((int)bean.serviceFee)}"
-                        android:textSize="16sp" />
-
-                </LinearLayout>
-
-                <!-- 仓储费 -->
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
-                    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:layout_marginStart="4dp"
-                        android:text="@{String.valueOf((int)bean.storageFee)}"
-                        android:textSize="16sp" />
-
-                </LinearLayout>
-
-                <!-- 总金额 -->
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    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:layout_marginStart="8dp"
-                        android:text="@{String.valueOf((int)bean.totalAmount)}"
-                        android:textSize="16sp" />
-
-                </LinearLayout>
-
-                <!-- 提取时间 -->
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:orientation="horizontal">
 
                         <TextView
                             completeSpace="@{5}"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:text="提取时间"
+                            android:text="代理："
                             android:textSize="16sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
+                            android:text="@{bean.agentCode}"
-                        android:text="@{bean.pickUpTime}"
                             android:textSize="16sp" />
 
-                </LinearLayout>
+                    </androidx.appcompat.widget.LinearLayoutCompat>
 
-            </LinearLayout>
+                </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.0"
+                        android:gravity="center_vertical">
+
+                        <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.spCode}"
+                            android:textSize="16sp" />
+
+                    </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
+                            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="@{String.valueOf((int)bean.optCharge)}"
+                            android:textSize="16sp" />
+
+                    </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
+                            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="@{String.valueOf((int)bean.whsCharge)}"
+                            android:textSize="16sp" />
+
+                    </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
+                            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="@{String.valueOf((int)bean.amount)}"
+                            android:textSize="16sp" />
+
+                    </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
+                            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" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
             </LinearLayout>
 
             <!-- 右侧箭头 -->
             <ImageView
-            android:layout_width="20dp"
+                android:layout_width="30dp"
-            android:layout_height="20dp"
+                android:layout_height="30dp"
-            android:layout_marginStart="5dp"
+                android:layout_gravity="center"
-            android:src="@drawable/ic_arrow_right" />
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/img_pda_right" />
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+        <!-- 侧滑菜单区域 -->
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <!-- 修改按钮 -->
+            <TextView
+                android:id="@+id/btn_edit"
+                style="@style/tv_item_action"
+                android:background="@color/colorPrimary"
+                android:text="修改" />
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </com.mcxtzhang.swipemenulib.SwipeMenuLayout>
 
     </LinearLayout>