From 56945f8488e1c90ed74789ed75f6b5214c67df07 Mon Sep 17 00:00:00 2001 From: YANGJIANKUAN Date: Wed, 25 Mar 2026 17:43:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E8=BF=9B=E6=B8=AF?= =?UTF-8?q?=E5=88=86=E5=8D=95=E7=BC=96=E8=BE=91=E4=B8=BB=E5=88=86=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BD=BF=E7=94=A8=E6=80=BB=E4=BB=B6=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=8A=A0=E5=A4=A7=E4=BB=B6=E6=95=B0=E4=B8=8E=E9=87=8D?= =?UTF-8?q?=E9=87=8F=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 --- .../lukouguoji/gjj/activity/IntImpManifestSubEditActivity.kt | 4 ++-- .../gjj/viewModel/IntImpManifestSubEditViewModel.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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