feat: 进港舱单新增总重量字段并修正过磅记录代理显示

- 进港舱单 Bean 增加 totalWeight 字段
- 新增/详情页表单加入"总重量"项并重排布局,备注移至 UN 编号同行
- 出港过磅记录列表代理列由 agentCode 改为 agentName 显示

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-05-14 13:02:46 +08:00
parent 623ebc22f7
commit 5750ab2036
6 changed files with 111 additions and 68 deletions

View File

@@ -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,