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

fix: 国际进港分单编辑主分校验使用总件数，并加大件数与重量间距

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
杨建宽
2026-03-25 17:43:34 +08:00
parent 471c81bdc7
commit 56945f8488
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpManifestSubEditActivity.kt
View File

@@ -49,7 +49,7 @@ class IntImpManifestSubEditActivity :
Intent(context, IntImpManifestSubEditActivity::class.java) Intent(context, IntImpManifestSubEditActivity::class.java)
.putExtra(Constant.Key.PAGE_TYPE, DetailsPageType.Add.name) .putExtra(Constant.Key.PAGE_TYPE, DetailsPageType.Add.name)
.putExtra(Constant.Key.BEAN, manifest) .putExtra(Constant.Key.BEAN, manifest)
.putExtra(KEY_MAIN_PC, manifest.pc) .putExtra(KEY_MAIN_PC, manifest.totalPc)
.putExtra(KEY_MAIN_WEIGHT, manifest.weight) .putExtra(KEY_MAIN_WEIGHT, manifest.weight)
.putExtra(KEY_OTHER_SUB_PC, otherSubPc) .putExtra(KEY_OTHER_SUB_PC, otherSubPc)
.putExtra(KEY_OTHER_SUB_WEIGHT, otherSubWeight) .putExtra(KEY_OTHER_SUB_WEIGHT, otherSubWeight)
@@ -70,7 +70,7 @@ class IntImpManifestSubEditActivity :
.putExtra(Constant.Key.PAGE_TYPE, DetailsPageType.Modify.name) .putExtra(Constant.Key.PAGE_TYPE, DetailsPageType.Modify.name)
.putExtra(Constant.Key.BEAN, manifest) .putExtra(Constant.Key.BEAN, manifest)
.putExtra("haWb", haWb) .putExtra("haWb", haWb)
.putExtra(KEY_MAIN_PC, manifest.pc) .putExtra(KEY_MAIN_PC, manifest.totalPc)
.putExtra(KEY_MAIN_WEIGHT, manifest.weight) .putExtra(KEY_MAIN_WEIGHT, manifest.weight)
.putExtra(KEY_OTHER_SUB_PC, otherSubPc) .putExtra(KEY_OTHER_SUB_PC, otherSubPc)
.putExtra(KEY_OTHER_SUB_WEIGHT, otherSubWeight) .putExtra(KEY_OTHER_SUB_WEIGHT, otherSubWeight)

2
module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestSubEditViewModel.kt
View File

@@ -120,7 +120,7 @@ class IntImpManifestSubEditViewModel : BaseViewModel() {
val totalSubPc = otherSubPc + currentPc val totalSubPc = otherSubPc + currentPc
val totalSubWeight = otherSubWeight + currentWeight val totalSubWeight = otherSubWeight + currentWeight
mainSubCheck.value = "${totalSubPc}/${mainPc} ${formatWeight(totalSubWeight)}/${formatWeight(mainWeight)}KG" mainSubCheck.value = "${totalSubPc}/${mainPc} ${formatWeight(totalSubWeight)}/${formatWeight(mainWeight)}KG"
// 件数或重量任一超过主单则校验不通过 // 件数或重量任一超过主单则校验不通过
isCheckValid.value = totalSubPc <= mainPc && totalSubWeight <= mainWeight isCheckValid.value = totalSubPc <= mainPc && totalSubWeight <= mainWeight