diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpManifestSubEditActivity.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpManifestSubEditActivity.kt index e6d038d..21826eb 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpManifestSubEditActivity.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpManifestSubEditActivity.kt @@ -49,7 +49,7 @@ class IntImpManifestSubEditActivity : Intent(context, IntImpManifestSubEditActivity::class.java) .putExtra(Constant.Key.PAGE_TYPE, DetailsPageType.Add.name) .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_OTHER_SUB_PC, otherSubPc) .putExtra(KEY_OTHER_SUB_WEIGHT, otherSubWeight) @@ -70,7 +70,7 @@ class IntImpManifestSubEditActivity : .putExtra(Constant.Key.PAGE_TYPE, DetailsPageType.Modify.name) .putExtra(Constant.Key.BEAN, manifest) .putExtra("haWb", haWb) - .putExtra(KEY_MAIN_PC, manifest.pc) + .putExtra(KEY_MAIN_PC, manifest.totalPc) .putExtra(KEY_MAIN_WEIGHT, manifest.weight) .putExtra(KEY_OTHER_SUB_PC, otherSubPc) .putExtra(KEY_OTHER_SUB_WEIGHT, otherSubWeight) diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestSubEditViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestSubEditViewModel.kt index 18a2b89..e4ea041 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestSubEditViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestSubEditViewModel.kt @@ -120,7 +120,7 @@ class IntImpManifestSubEditViewModel : BaseViewModel() { val totalSubPc = otherSubPc + currentPc 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