diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt index db1da15..a1f1d1e 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt @@ -236,13 +236,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() { fun loadWaitingAssembleWaybills() { val wbNo = searchText.value?.trim() ?: "" - // 验证运单号不能为空 - if (wbNo.isEmpty()) { - showToast("请输入运单号") - return - } - - // 发起网络请求 + // 发起网络请求(空参数时相当于刷新列表) launchLoadingCollect({ NetApply.api.queryWaitingAssemble(wbNo) }) { onSuccess = { result -> // 数据转换: GjcWarehouse -> AssembleWaybillBean @@ -447,6 +441,16 @@ class IntExpAssembleStartViewModel : BaseViewModel() { return } + // 校验组装件数不能大于运单件数 + val waybillPieces = waybillInfo.value?.waybillPieces?.trim() ?: "" + val assembleCountInt = assembleCount.toLongOrNull() ?: 0L + val waybillPiecesInt = waybillPieces.toLongOrNull() ?: 0L + + if (assembleCountInt > waybillPiecesInt) { + showToast("组装件数不能大于运单件数") + return + } + val assembleWeight = waybillInfo.value?.assembleWeight?.trim() ?: "" // 组装重量为非必填,不进行验证 diff --git a/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml b/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml index 7b45e7a..00c1aaf 100644 --- a/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml +++ b/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml @@ -167,10 +167,13 @@ - + android:gravity="center" + android:text="选择" + android:textColor="@color/text_normal" + android:textSize="13sp" />