feat: opt 开始装载
This commit is contained in:
@@ -76,6 +76,11 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
|
|||||||
*/
|
*/
|
||||||
private var editMode: Pair<String, String>? = null // Pair<ULD编号, 运单号>
|
private var editMode: Pair<String, String>? = null // Pair<ULD编号, 运单号>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ULD编号锁定状态
|
||||||
|
*/
|
||||||
|
val isUldNoLocked = MutableLiveData(false)
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 加载组装位置列表
|
* 加载组装位置列表
|
||||||
@@ -150,9 +155,10 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
|
|||||||
previousAssembleCount = ""
|
previousAssembleCount = ""
|
||||||
previousAssembleWeight = ""
|
previousAssembleWeight = ""
|
||||||
|
|
||||||
// 如果在编辑模式,退出编辑模式
|
// 如果在编辑模式,退出编辑模式并解锁 ULD
|
||||||
if (editMode != null) {
|
if (editMode != null) {
|
||||||
editMode = null
|
editMode = null
|
||||||
|
isUldNoLocked.value = false
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// 同一个运单:保留组装件数和组装重量
|
// 同一个运单:保留组装件数和组装重量
|
||||||
@@ -701,7 +707,10 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
|
|||||||
operator = previousOperator // 保留之前选择的组装人
|
operator = previousOperator // 保留之前选择的组装人
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. 标记编辑模式(存储原始 ULD 编号和运单号)
|
// 3. 锁定 ULD 编号
|
||||||
|
isUldNoLocked.value = true
|
||||||
|
|
||||||
|
// 4. 标记编辑模式(存储原始 ULD 编号和运单号)
|
||||||
editMode = Pair(item.parentUldNo, waybill.waybillNo)
|
editMode = Pair(item.parentUldNo, waybill.waybillNo)
|
||||||
|
|
||||||
// 5. 查询 ULD 信息(如果需要)
|
// 5. 查询 ULD 信息(如果需要)
|
||||||
@@ -813,6 +822,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
|
|||||||
waybillInfo.value = WaybillInfoBean().apply {
|
waybillInfo.value = WaybillInfoBean().apply {
|
||||||
operator = previousOperator // 恢复组装人
|
operator = previousOperator // 恢复组装人
|
||||||
}
|
}
|
||||||
|
isUldNoLocked.value = false
|
||||||
editMode = null
|
editMode = null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -249,6 +249,7 @@
|
|||||||
|
|
||||||
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
|
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
|
||||||
android:id="@+id/uldNoInput"
|
android:id="@+id/uldNoInput"
|
||||||
|
enable="@{!viewModel.isUldNoLocked}"
|
||||||
required="@{false}"
|
required="@{false}"
|
||||||
setRefreshCallBack="@{viewModel::onUldNoInputComplete}"
|
setRefreshCallBack="@{viewModel::onUldNoInputComplete}"
|
||||||
title='@{"ULD编号:"}'
|
title='@{"ULD编号:"}'
|
||||||
|
|||||||
Reference in New Issue
Block a user