From 5750ab2036f44df1de3feace0502ec84ed307c92 Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Thu, 14 May 2026 13:02:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=9B=E6=B8=AF=E8=88=B1=E5=8D=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=80=BB=E9=87=8D=E9=87=8F=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E6=AD=A3=E8=BF=87=E7=A3=85=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 进港舱单 Bean 增加 totalWeight 字段 - 新增/详情页表单加入"总重量"项并重排布局，备注移至 UN 编号同行 - 出港过磅记录列表代理列由 agentCode 改为 agentName 显示 Co-Authored-By: Claude Opus 4.6 --- .../module_base/bean/GjjImportManifest.kt | 2 + .../module_base/bean/GjjManifest.kt | 1 + .../res/layout/item_gjc_weighing_record.xml | 2 +- .../gjj/viewModel/GjjManifestAddViewModel.kt | 7 ++ .../res/layout/activity_gjj_manifest_add.xml | 92 ++++++++++++------- .../activity_int_imp_manifest_details.xml | 75 ++++++++------- 6 files changed, 111 insertions(+), 68 deletions(-) diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjImportManifest.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjImportManifest.kt index e6d2361..87a9c80 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjImportManifest.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjImportManifest.kt @@ -109,6 +109,8 @@ data class GjjImportManifest( var splitFlag: String = "", // 总件数 var totalPc: Long = 0, + // 总重量 + var totalWeight: Double = 0.0, // 危险品编号 var unNumber: String = "", // 体积 diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt index 6ea086f..e85c72f 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt @@ -19,6 +19,7 @@ data class GjjManifest( var fid: Long = 0, // FID var pc: Long = 0, // 件数 var totalPc: Long = 0, // 总件数 + var totalWeight: Double = 0.0, // 总重量 var weight: Double = 0.0, // 重量 var volume: Double = 0.0, // 体积 var goods: String = "", // 品名（英） diff --git a/module_gjc/src/main/res/layout/item_gjc_weighing_record.xml b/module_gjc/src/main/res/layout/item_gjc_weighing_record.xml index ee24b9e..73977ec 100644 --- a/module_gjc/src/main/res/layout/item_gjc_weighing_record.xml +++ b/module_gjc/src/main/res/layout/item_gjc_weighing_record.xml @@ -181,7 +181,7 @@ diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestAddViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestAddViewModel.kt index 485f87b..33686d4 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestAddViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestAddViewModel.kt @@ -105,6 +105,9 @@ class GjjManifestAddViewModel : BaseViewModel() { // 运单件数 val waybillNum = MutableLiveData("") + // 运单重量 + val waybillWeight = MutableLiveData("") + // 实到数量 val actualNum = MutableLiveData("") @@ -281,6 +284,7 @@ class GjjManifestAddViewModel : BaseViewModel() { // 填充表单字段 waybillNo.value = manifest.getWaybillNo() waybillNum.value = manifest.totalPc.toString() + waybillWeight.value = manifest.totalWeight.toString() actualNum.value = manifest.pc.toString() actualWeight.value = manifest.weight.toString() billingWeight.value = manifest.cashWeight.toString() @@ -311,6 +315,7 @@ class GjjManifestAddViewModel : BaseViewModel() { // 填充表单字段 waybillNo.value = "${manifest.prefix}${manifest.no}" waybillNum.value = manifest.totalPc.toString() + waybillWeight.value = manifest.totalWeight.toString() actualNum.value = manifest.pc.toString() actualWeight.value = manifest.weight.toString() departure.value = manifest.origin @@ -359,6 +364,7 @@ class GjjManifestAddViewModel : BaseViewModel() { || verifyWaybillNo(waybillNo.value) || agent.value.verifyNullOrEmpty("请选择代理") || waybillNum.value.verifyNullOrEmpty("请输入运单件数") + || waybillWeight.value.verifyNullOrEmpty("请输入运单重量") || actualNum.value.verifyNullOrEmpty("请输入实到件数") || actualWeight.value.verifyNullOrEmpty("请输入实到重量") || billingWeight.value.verifyNullOrEmpty("请输入计费重量") @@ -382,6 +388,7 @@ class GjjManifestAddViewModel : BaseViewModel() { "spCode" to specialCode.value.let { if (it.isNullOrEmpty()) "NOR" else it }, "businessType" to businessType.value, "totalPc" to waybillNum.value, + "totalWeight" to waybillWeight.value, "pc" to actualNum.value, "weight" to actualWeight.value, "cashWeight" to billingWeight.value, 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 35e38dd..83d349d 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 @@ -185,7 +185,7 @@ - + + + + + + + + - - - - - @@ -263,6 +276,16 @@ android:layout_marginStart="15dp" android:layout_weight="1" /> + + + + + + - - - - - @@ -309,6 +323,15 @@ android:layout_marginStart="15dp" android:layout_weight="1" /> + + + + + + + + android:layout_weight="0.605" /> - - - + diff --git a/module_gjj/src/main/res/layout/activity_int_imp_manifest_details.xml b/module_gjj/src/main/res/layout/activity_int_imp_manifest_details.xml index 73fb613..dec9463 100644 --- a/module_gjj/src/main/res/layout/activity_int_imp_manifest_details.xml +++ b/module_gjj/src/main/res/layout/activity_int_imp_manifest_details.xml @@ -111,7 +111,7 @@ - + + + + + + + + - - - - - + + + + + - - - - - - - - + + + + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="0.605" />