From 084832e4e95c2a7ef4e9c9e58e0b0f791a538263 Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Thu, 23 Jul 2026 11:58:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=9A=E4=B8=AA=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E8=BF=9B=E5=87=BA=E6=B8=AF=E9=A1=B5=E9=9D=A2=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=A1=B9=E4=B8=8E=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 进港舱单新增/编辑：品名(中)改为非必填 - 国际出港开始计重：运抵件数/重量改为必填，新增运抵重量超预配3%校验 - 国际出港板箱过磅：架子车号改为非必填 - 国际进港出库列表：新增特码栏、删除提货单号、提取时间改办理时间、查询条件改特码 - 进港/出港仓库列表：清仓结果筛选传参修复并反转值(正常=1/异常=0) - 组装ULD未维护提示文言优化，版本号升至1.8.8 Co-Authored-By: Claude Opus 4.6 --- app/build.gradle | 4 +-- .../viewModel/GjcBoxWeighingAddViewModel.kt | 3 +- .../viewModel/GjcWeighingStartViewModel.kt | 32 +++++++++++++++++-- .../viewModel/IntExpAssembleStartViewModel.kt | 2 +- .../viewModel/IntExpStorageUseViewModel.kt | 7 ++-- .../layout/activity_gjc_weighing_start.xml | 2 ++ .../gjj/viewModel/GjjManifestAddViewModel.kt | 1 - .../gjj/viewModel/IntImpPickUpDLVViewModel.kt | 10 +++--- .../viewModel/IntImpStorageUseViewModel.kt | 4 +-- .../res/layout/activity_gjj_manifest_add.xml | 2 +- .../layout/activity_int_imp_pick_up_dlv.xml | 8 ++--- .../res/layout/item_int_imp_pick_up_dlv.xml | 12 +++---- 12 files changed, 58 insertions(+), 29 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 794d215..c9dfb46 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,8 +26,8 @@ android { applicationId "com.lukouguoji.aerologic" minSdkVersion 24 targetSdkVersion 30 - versionCode 87 - versionName "1.8.7" + versionCode 88 + versionName "1.8.8" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt index b104056..fd1ae84 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt @@ -366,8 +366,7 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() { bean.passageway = passagewayList.value?.firstOrNull{ it.value == channel.value }?.key ?: "" bean.passagewayId = channel.value ?: "" - // 验证必填字段 - if (bean.carId.verifyNullOrEmpty("请输入架子车号")) return + // 验证必填字段（架子车号改为非必填） if (bean.uld.verifyNullOrEmpty("请输入ULD编号")) return if (bean.passageway.verifyNullOrEmpty("请选择通道号")) return diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt index 3a1e784..fa338d6 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt @@ -355,7 +355,11 @@ class GjcWeighingStartViewModel : BaseViewModel() { if (bean.fno.verifyNullOrEmpty("请输入航班号")) return if (channel.value.verifyNullOrEmpty("请选择通道号")) return - // 2. 校验件数: 运抵件数 + 实时件数 不能大于 预配件数 + // 2. 校验运抵件数、运抵重量必填 + if (arrivePc.value.verifyNullOrEmpty("请输入运抵件数")) return + if (arriveWeight.value.verifyNullOrEmpty("请输入运抵重量")) return + + // 3. 校验件数: 运抵件数 + 实时件数 不能大于 预配件数 val realTimePcVal = realTimePc.value?.toLongOrNull() ?: 0L val arrivePcVal = arrivePc.value?.toLongOrNull() ?: bean.arrivePc ?: 0L val preallocatedPc = bean.pc ?: 0L @@ -365,7 +369,17 @@ class GjcWeighingStartViewModel : BaseViewModel() { return } - // 3. 收集当前表单数据，更新到 bean + // 4. 校验重量: 运抵重量 + 实时重量 不能超过预配重量的3% + val realTimeWeightVal = realTimeWeight.value?.toDoubleOrNull() ?: 0.0 + val arriveWeightCheckVal = arriveWeight.value?.toDoubleOrNull() ?: 0.0 + val preallocatedWeight = bean.weight ?: 0.0 + + if (arriveWeightCheckVal + realTimeWeightVal > preallocatedWeight * 1.03) { + showToast("运抵重量 + 实时重量不能超过预配重量的3%") + return + } + + // 5. 收集当前表单数据，更新到 bean bean.apply { // 更新运抵数据（如果用户已编辑） arrivePc = this@GjcWeighingStartViewModel.arrivePc.value?.toLongOrNull() ?: arrivePc @@ -429,6 +443,10 @@ class GjcWeighingStartViewModel : BaseViewModel() { if (bean.fno.verifyNullOrEmpty("请输入航班号")) return if (channel.value.verifyNullOrEmpty("请选择通道号")) return + // 校验运抵件数、运抵重量必填 + if (arrivePc.value.verifyNullOrEmpty("请输入运抵件数")) return + if (arriveWeight.value.verifyNullOrEmpty("请输入运抵重量")) return + // 校验件数: 运抵件数 + 实时件数 不能大于 预配件数 val realTimePcVal = realTimePc.value?.toLongOrNull() ?: 0L val arrivePcVal = arrivePc.value?.toLongOrNull() ?: bean.arrivePc ?: 0L @@ -439,6 +457,16 @@ class GjcWeighingStartViewModel : BaseViewModel() { return } + // 校验重量: 运抵重量 + 实时重量 不能超过预配重量的3% + val realTimeWeightVal = realTimeWeight.value?.toDoubleOrNull() ?: 0.0 + val arriveWeightCheckVal = arriveWeight.value?.toDoubleOrNull() ?: 0.0 + val preallocatedWeight = bean.weight ?: 0.0 + + if (arriveWeightCheckVal + realTimeWeightVal > preallocatedWeight * 1.03) { + showToast("运抵重量 + 实时重量不能超过预配重量的3%") + return + } + // 从编辑字段获取数值 val arriveWeightVal = arriveWeight.value?.toDoubleOrNull() ?: bean.arriveWeight val arriveVolumeVal = arriveVolume.value?.toDoubleOrNull() ?: bean.arriveVolume 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 d35545a..d655587 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 @@ -449,7 +449,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() { assembleInfoList.value = mutableListOf() } } else { - showToast("未查询到该ULD信息") + showToast("ULD 编号未维护，请先进行维护！") } } onFailed = { code, message -> diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt index 4874ddb..4af85b6 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt @@ -62,8 +62,8 @@ class IntExpStorageUseViewModel : BasePageViewModel() { // 初始化清仓综合结果列表（根据实际需求配置） clearResultList.value = listOf( KeyValue("全部", ""), - KeyValue("正常", "0"), - KeyValue("异常", "1") + KeyValue("正常", "1"), + KeyValue("异常", "0") ) } @@ -306,7 +306,8 @@ class IntExpStorageUseViewModel : BasePageViewModel() { "fdate" to flightDate.value?.ifEmpty { null }, "fno" to flightNo.value?.ifEmpty { null }, "wbNo" to wbNo.value?.ifEmpty { null }, - "location" to location.value?.ifEmpty { null } + "location" to location.value?.ifEmpty { null }, + "clearNormal" to clearResult.value?.ifEmpty { null } ) // 列表参数 (含分页) diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml index 4482aa0..3e036fe 100644 --- a/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml +++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml @@ -322,6 +322,7 @@ { - pickUpNo.value = data.getStringExtra(Constant.Result.CODED_CONTENT) + spCode.value = data.getStringExtra(Constant.Result.CODED_CONTENT) refresh() } } diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpStorageUseViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpStorageUseViewModel.kt index 0811722..702680e 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpStorageUseViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpStorageUseViewModel.kt @@ -57,8 +57,8 @@ class IntImpStorageUseViewModel : BasePageViewModel() { init { clearResultList.value = listOf( KeyValue("全部", ""), - KeyValue("正常", "0"), - KeyValue("异常", "1") + KeyValue("正常", "1"), + KeyValue("异常", "0") ) } diff --git a/module_gjj/src/main/res/layout/activity_gjj_manifest_add.xml b/module_gjj/src/main/res/layout/activity_gjj_manifest_add.xml index 83d349d..b3e95ad 100644 --- a/module_gjj/src/main/res/layout/activity_gjj_manifest_add.xml +++ b/module_gjj/src/main/res/layout/activity_gjj_manifest_add.xml @@ -266,7 +266,7 @@ - + diff --git a/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml b/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml index d17e575..37fe4b0 100644 --- a/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml +++ b/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml @@ -160,13 +160,13 @@ - + - + @@ -210,7 +210,7 @@ - +