feat: 国际出港开始组装运单列表首次装货后显示剩余/总数

首次装货成功前件数、重量列显示总数;成功后表头切换为
「剩余件数/总件数」「剩余重量/总重量」,剩余值由 pc 减
checkInPc、weight 减 checkInWeight 得出。三处接口数据转
Bean 的重复代码合并为扩展函数。

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-09-08 20:43:55 +08:00
parent 6b2006fdb7
commit 7a09bbbeab
4 changed files with 60 additions and 40 deletions

View File

@@ -19,6 +19,27 @@ class AssembleWaybillBean {
var originalPieces: String = "" // 原始运单件数
var originalWeight: String = "" // 原始运单重量
// ========== 剩余/总数显示(开始组装页首次装货成功后切换) ==========
var checkInPieces: Long = 0 // 已组装件数(接口 checkInPc
var checkInWeight: Double = 0.0 // 已组装重量(接口 checkInWeight
var showRemaining: Boolean = false // 是否以“剩余/总数”形式显示
/** 件数列显示:首次装货成功前为总件数,之后为“剩余件数/总件数”(剩余 = pc checkInPc */
val piecesDisplay: String
get() {
if (!showRemaining) return pieces
val total = pieces.toLongOrNull() ?: return pieces
return "${total - checkInPieces}/$pieces"
}
/** 重量列显示:首次装货成功前为总重量,之后为“剩余重量/总重量”(剩余 = weight checkInWeight */
val weightDisplay: String
get() {
if (!showRemaining) return weight
val total = weight.toDoubleOrNull() ?: return weight
return String.format("%.1f", total - checkInWeight) + "/" + weight
}
val fLightInfo: String
get() = "$fno/${fdate.replace("-", "")}"