eric/aerologic-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 国际出港查询

Browse Source
This commit is contained in:
杨建宽
2025-12-02 18:02:17 +08:00
parent 0c3c78b42e
commit be0541f522
14 changed files with 1253 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryActivity.kt Normal file
View File

@@ -0,0 +1,48 @@
package com.lukouguoji.gjc.activity
import android.content.Context
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.ActivityGjcQueryBinding
import com.lukouguoji.gjc.viewModel.GjcQueryViewModel
import com.lukouguoji.module_base.base.BaseBindingActivity
import com.lukouguoji.module_base.ktx.getLifecycleOwner
import com.lukouguoji.module_base.router.ARouterConstants
/**
* 国际出港查询列表页
*/
@Route(path = ARouterConstants.ACTIVITY_URL_GJC_QUERY_LIST)
class GjcQueryActivity :
BaseBindingActivity<ActivityGjcQueryBinding, GjcQueryViewModel>() {
override fun layoutId() = R.layout.activity_gjc_query
override fun viewModelClass() = GjcQueryViewModel::class.java
override fun initOnCreate(savedInstanceState: Bundle?) {
setBackArrow("国际出港查询")
binding.viewModel = viewModel
// 绑定分页逻辑
viewModel.pageModel
.bindSmartRefreshLayout(binding.srl, binding.rv, viewModel, getLifecycleOwner())
// 初始化代理列表
viewModel.initAgentList()
// 初始加载
viewModel.refresh()
}
companion object {
@JvmStatic
fun start(context: Context) {
val starter = Intent(context, GjcQueryActivity::class.java)
context.startActivity(starter)
}
}
}

2
module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryListActivity.kt
View File

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

83
module_gjc/src/main/java/com/lukouguoji/gjc/dialog/GjcQueryFilterDialogModel.kt Normal file
View File

@@ -0,0 +1,83 @@
package com.lukouguoji.gjc.dialog
import android.content.Context
import android.view.View
import android.widget.TextView
import androidx.lifecycle.MutableLiveData
import com.lukouguoji.gjc.R
import com.lukouguoji.gjc.databinding.DialogGjcQueryFilterBinding
import com.lukouguoji.module_base.base.BaseDialogModel
import com.lxj.xpopup.XPopup
import dev.utils.app.ScreenUtils
import dev.utils.app.info.KeyValue
/**
* 国际出港查询筛选抽屉
*/
class GjcQueryFilterDialogModel(
val spCode: MutableLiveData<String>, // 特码
val dest: MutableLiveData<String>, // 目的港
val awbType: MutableLiveData<String>, // 运单类型
val businessType: MutableLiveData<String>, // 业务类型
val goodsCn: MutableLiveData<String>, // 品名（中）
private val onConfirm: () -> Unit
) : BaseDialogModel<DialogGjcQueryFilterBinding>(DIALOG_TYPE_DRAWER) {
// 运单类型列表
val awbTypeList = MutableLiveData(
listOf(
KeyValue("全部", ""),
KeyValue("主单", "1"),
KeyValue("分单", "2")
)
)
// 业务类型列表
val businessTypeList = MutableLiveData(
listOf(
KeyValue("全部", ""),
KeyValue("普货", "1"),
KeyValue("特货", "2")
)
)
override fun layoutId() = R.layout.dialog_gjc_query_filter
override fun onBuild(builder: XPopup.Builder) {
super.onBuild(builder)
// 设置抽屉宽度为屏幕宽度的1/3
builder.maxWidth((ScreenUtils.getScreenWidth() / 3.0).toInt())
}
override fun onDialogCreated(context: Context) {
binding.model = this
binding.lifecycleOwner = context as? androidx.lifecycle.LifecycleOwner
// 设置标题
binding.root.findViewById<TextView>(R.id.title_name)?.text = "筛选条件"
// 返回按钮
binding.root.findViewById<View>(R.id.tool_back)?.setOnClickListener {
dismiss()
}
}
/**
* 重置筛选条件
*/
fun onResetClick() {
spCode.value = ""
dest.value = ""
awbType.value = ""
businessType.value = ""
goodsCn.value = ""
}
/**
* 确认筛选
*/
fun onConfirmClick() {
dismiss()
onConfirm()
}
}

27
module_gjc/src/main/java/com/lukouguoji/gjc/holder/GjcQueryViewHolder.kt Normal file
View File

@@ -0,0 +1,27 @@
package com.lukouguoji.gjc.holder
import android.view.View
import com.lukouguoji.gjc.databinding.ItemGjcQueryBinding
import com.lukouguoji.module_base.base.BaseViewHolder
import com.lukouguoji.module_base.bean.GjcMaWb
/**
* 国际出港查询列表ViewHolder
*/
class GjcQueryViewHolder(view: View) :
BaseViewHolder<GjcMaWb, ItemGjcQueryBinding>(view) {
override fun onBind(item: Any?, position: Int) {
val bean = getItemBean(item)!!
binding.bean = bean
// 立即更新UI（避免闪烁）
binding.executePendingBindings()
// 整行点击事件（暂时不跳转详情页）
// binding.ll.setOnClickListener {
// // 后续可添加详情页跳转
// // GjcQueryDetailsActivity.start(it.context, bean.maWbId)
// }
}
}

186
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt Normal file
View File

@@ -0,0 +1,186 @@
package com.lukouguoji.gjc.viewModel
import android.app.Activity
import android.content.Intent
import androidx.lifecycle.MutableLiveData
import com.lukouguoji.gjc.R
import com.lukouguoji.gjc.dialog.GjcQueryFilterDialogModel
import com.lukouguoji.gjc.holder.GjcQueryViewHolder
import com.lukouguoji.module_base.base.BasePageViewModel
import com.lukouguoji.module_base.common.Constant
import com.lukouguoji.module_base.http.net.NetApply
import com.lukouguoji.module_base.ktx.launchCollect
import com.lukouguoji.module_base.ktx.launchLoadingCollect
import com.lukouguoji.module_base.ktx.showToast
import com.lukouguoji.module_base.ktx.toRequestBody
import com.lukouguoji.module_base.model.ScanModel
import dev.utils.app.info.KeyValue
/**
* 国际出港查询ViewModel
*/
class GjcQueryViewModel : BasePageViewModel() {
// ==================== 搜索条件 ====================
val flightDateStart = MutableLiveData("") // 航班日期起
val flightDateEnd = MutableLiveData("") // 航班日期止
val agentId = MutableLiveData("") // 代理ID
val outStatus = MutableLiveData("") // 出库状态
val waybillNo = MutableLiveData("") // 运单号
// ==================== 下拉列表 ====================
// 代理下拉列表（从API获取）
val agentList = MutableLiveData(listOf(KeyValue("全部", "")))
// 出库状态下拉列表
val outStatusList = MutableLiveData(
listOf(
KeyValue("全部", ""),
KeyValue("未出库", "0"),
KeyValue("已出库", "1")
)
)
// ==================== 适配器配置 ====================
val itemViewHolder = GjcQueryViewHolder::class.java
val itemLayoutId = R.layout.item_gjc_query
// ==================== 统计数据 ====================
val totalCount = MutableLiveData("0") // 合计票数
val totalPc = MutableLiveData("0") // 总件数
val totalWeight = MutableLiveData("0") // 总重量
// ==================== 筛选条件（预留）====================
val spCode = MutableLiveData("") // 特码
val dest = MutableLiveData("") // 目的港
val awbType = MutableLiveData("") // 运单类型
val businessType = MutableLiveData("") // 业务类型
val goodsCn = MutableLiveData("") // 品名（中）
///////////////////////////////////////////////////////////////////////////
// 方法区
///////////////////////////////////////////////////////////////////////////
/**
* 扫码输入运单号
*/
fun waybillScanClick() {
ScanModel.startScan(getTopActivity(), Constant.RequestCode.WAYBILL)
}
/**
* 搜索按钮点击
*/
fun searchClick() {
refresh()
}
/**
* 筛选按钮点击
*/
fun filterClick() {
val filterDialog = GjcQueryFilterDialogModel(
spCode = spCode,
dest = dest,
awbType = awbType,
businessType = businessType,
goodsCn = goodsCn,
onConfirm = { refresh() }
)
filterDialog.show()
}
/**
* 获取列表数据
* 核心方法：调用API获取数据并转换PageInfo为BaseListBean
*/
override fun getData() {
// 构建查询参数（列表接口）
val listParams = mapOf(
"pageNum" to pageModel.page,
"pageSize" to pageModel.limit,
"fdateStart" to flightDateStart.value!!.ifEmpty { null },
"fdateEnd" to flightDateEnd.value!!.ifEmpty { null },
"agentCode" to agentId.value!!.ifEmpty { null },
"outState" to outStatus.value!!.ifEmpty { null },
"wbNo" to waybillNo.value!!.ifEmpty { null },
// 筛选条件（暂未使用）
"spCode" to spCode.value!!.ifEmpty { null },
"dest" to dest.value!!.ifEmpty { null },
"awbType" to awbType.value!!.ifEmpty { null },
"businessType" to businessType.value!!.ifEmpty { null },
"goodsCn" to goodsCn.value!!.ifEmpty { null }
).toRequestBody()
// 构建查询参数（统计接口 - 使用相同的搜索条件）
val totalParams = mapOf(
"fdateStart" to flightDateStart.value!!.ifEmpty { null },
"fdateEnd" to flightDateEnd.value!!.ifEmpty { null },
"agentCode" to agentId.value!!.ifEmpty { null },
"outState" to outStatus.value!!.ifEmpty { null },
"wbNo" to waybillNo.value!!.ifEmpty { null },
// 筛选条件
"spCode" to spCode.value!!.ifEmpty { null },
"dest" to dest.value!!.ifEmpty { null },
"awbType" to awbType.value!!.ifEmpty { null },
"businessType" to businessType.value!!.ifEmpty { null },
"goodsCn" to goodsCn.value!!.ifEmpty { null }
).toRequestBody()
// 获取列表数据（显示loading）
launchLoadingCollect({
NetApply.api.getGjcQueryList(listParams)
}) {
onSuccess = { result ->
val pageInfo = result.data
if (pageInfo != null) {
// ⚠️ 核心：使用toBaseListBean()转换PageInfo为BaseListBean
pageModel.handleListBean(pageInfo.toBaseListBean())
}
}
}
// 获取统计数据（后台调用，不显示loading）
launchCollect({
NetApply.api.getGjcQueryTotal(totalParams)
}) {
onSuccess = { result ->
val data = result.data
totalCount.value = (data?.wbNumber ?: 0).toString()
totalPc.value = (data?.totalPc ?: 0).toString()
totalWeight.value = (data?.totalWeight ?: 0.0).toString()
}
}
}
/**
* 处理扫码结果
*/
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (resultCode == Activity.RESULT_OK && data != null) {
when (requestCode) {
Constant.RequestCode.WAYBILL -> {
waybillNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT)
refresh()
}
}
}
}
/**
* 初始化代理下拉列表（从API获取）
*/
fun initAgentList() {
launchCollect({
NetApply.api.getIntExpAgentList()
}) {
onSuccess = { result ->
val list = mutableListOf(KeyValue("全部", ""))
result.data?.forEach {
list.add(KeyValue(it.name ?: "", it.code ?: ""))
}
agentList.value = list
}
}
}
}