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

feat: 开始组装 opt

Browse Source
This commit is contained in:
杨建宽
2025-12-18 09:52:13 +08:00
parent 2664cc7c69
commit e208d54a3c
7 changed files with 67 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.claude/settings.local.json
View File

@@ -36,7 +36,8 @@
"Bash(sort:*)",
"Bash(ls:*)",
"Bash(xargs rm:*)",
"Bash(git -C /Users/kid/Development/Fusion/Projects/aerologic-app stash)"
"Bash(git -C /Users/kid/Development/Fusion/Projects/aerologic-app stash)",
"WebFetch(domain:api.apifox.cn)"
],
"deny": [],
"ask": []

1
module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt
View File

@@ -16,6 +16,7 @@ class GjcUldUseBean {
var netWeight: Double = 0.0 // 装机重量
var totalWeight: Double = 0.0 // 总重
var uldWeight: Double = 0.0 // uld重量
var consumeWeight: Double = 0.0 // 耗材重量
var volume: Double = 0.0 // 体积
var maxVolume: Double = 0.0 // uld最大容积
var maxWeight: Double = 0.0 // uld最大载重

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

@@ -601,6 +601,15 @@ interface Api {
@GET("IntExpAssemble/queryWaitingAssemble")
suspend fun queryWaitingAssemble(@Query("wbNo") wbNo: String): BaseResultBean<MutableList<GjcWarehouse>>
/**
* 国际出港组装 - 根据全ULD查询ULD状态和耗材重量
* 接口路径: /IntExpAssemble/getUld
* @param uld ULD编号
* @return ULD信息，包含status（0：正常，1：故障）和consumeWeight（耗材重量）
*/
@GET("IntExpAssemble/getUld")
suspend fun getUldWithConsumeWeight(@Query("uld") uld: String): BaseResultBean<GjcUldUseBean>
/**
* 国际出港出库交接-分页查询
* 接口路径: /IntExpOutHandover/pageQuery

4
module_gjc/src/main/java/com/lukouguoji/gjc/page/assemble/IntExpAssembleStartActivity.kt
View File

@@ -14,6 +14,7 @@ import com.lukouguoji.module_base.base.CommonAdapter
import com.lukouguoji.module_base.common.Constant
import com.lukouguoji.module_base.interfaces.IOnItemClickListener
import com.lukouguoji.module_base.ktx.addOnItemClickListener
import com.lukouguoji.module_base.ktx.setUpperCaseAlphanumericFilter
import com.lukouguoji.module_base.router.ARouterConstants
/**
@@ -44,6 +45,9 @@ class IntExpAssembleStartActivity :
setBackArrow("开始组装")
binding.viewModel = viewModel
// 为ULD编号添加大写字母和数字的输入限制
binding.uldNoInput.et.setUpperCaseAlphanumericFilter()
// 初始化列表
initRecyclerViews()

45
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt
View File

@@ -51,6 +51,9 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
// ========== 组装人列表 ==========
val assemblerList = MutableLiveData<List<KeyValue>>(emptyList())
// ========== 标记位，避免重复查询 ==========
private var lastQueriedUldNo = ""
/**
* 初始化模拟数据（已废弃）
*/
@@ -192,7 +195,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
val warehouseList = result.data ?: mutableListOf()
val waybillBeanList = warehouseList.map { warehouse ->
AssembleWaybillBean().apply {
waybillNo = warehouse.no
waybillNo = warehouse.wbNo
pieces = warehouse.pc.toString()
weight = String.format("%.1f", warehouse.weight)
flight = warehouse.flight
@@ -244,6 +247,46 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
}
/**
* ULD编号输入完成时调用
*/
fun onUldNoInputComplete() {
val uld = uldInfo.value?.uldNo?.trim() ?: ""
if (uld.isNotEmpty() && uld != lastQueriedUldNo) {
lastQueriedUldNo = uld
queryUldInfo(uld)
}
}
/**
* 查询ULD信息（状态和耗材重量）
*/
private fun queryUldInfo(uldNo: String) {
launchCollect({ NetApply.api.getUldWithConsumeWeight(uldNo) }) {
onSuccess = { result ->
val uldBean = result.data
if (uldBean != null) {
// 更新ULD状态和耗材重量
uldInfo.value = uldInfo.value?.apply {
// status: 0-正常, 1-故障
uldStatus = when (uldBean.status) {
"0" -> "正常"
"1" -> "故障"
else -> uldBean.status ?: ""
}
// 耗材重量保持可编辑，仅在为空时填充
if (materialWeight.isEmpty()) {
materialWeight = uldBean.consumeWeight?.toString() ?: ""
}
}
}
}
onFailed = { code, message ->
showToast("查询ULD信息失败: $message")
}
}
}
/**
* 卸货按钮点击
*/

6
module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml
View File

@@ -48,7 +48,7 @@
android:orientation="vertical">
<!-- 搜索框 -->
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayoutNew
hint='@{"请输入搜索内容"}'
hint='@{"请输入ULD编码"}'
type="@{SearchLayoutType.INPUT}"
value="@={viewModel.searchText}"
android:layout_width="match_parent"
@@ -139,7 +139,7 @@
<!-- 搜索框 -->
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayoutNew
android:id="@+id/tvWbSearch"
hint='@{"请输入搜索内容"}'
hint='@{"请输入原单号"}'
icon="@{@drawable/img_search}"
setOnSearchListener="@{viewModel::loadWaitingAssembleWaybills}"
setSearchIconClickListener="@{viewModel::loadWaitingAssembleWaybills}"
@@ -248,7 +248,9 @@
android:orientation="horizontal">
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
android:id="@+id/uldNoInput"
required="@{false}"
setRefreshCallBack="@{viewModel::onUldNoInputComplete}"
title='@{"ULD编号："}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"

4
module_gjc/src/main/res/layout/item_assemble_waybill.xml
View File

@@ -18,11 +18,13 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="36dp"
android:gravity="center_vertical"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"