fix(gjj): 进港仓库补齐始发站与库位件重,运单信息去掉出库时间

- 运单信息 Tab 去掉「出库时间」
- 始发站显示 "-":详情 warehouseList 返回 fdep 而非 dep,列表 IntImpStorage/pageQuery
  不返回 dep/fdep、始发站在 origin。GjjWarehouse 新增 fdep 与 depDisplay
  (fdep → dep → origin),GjcMaWb 新增 depDisplay(dep → origin),仓库卡片与列表卡片改绑
- 库位卡片:GjjStorageUse 补 inPc/inWeight/outPc/outWeight,增加出入库件数与重量两行

Refs: 禅道 Bug #635

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
YANG JIANKUAN
2026-10-14 20:22:01 -07:00
parent 9db20749e2
commit a4167c3cf3
7 changed files with 78 additions and 12 deletions

View File

@@ -177,6 +177,13 @@ data class GjcMaWb(
val agentDisplay: String?
get() = if (agentName.isNullOrEmpty()) agentCode else agentName
/**
* 5.5寸手机版-进港仓库:始发站展示值。IntImpStorage/pageQuery 不返回 dep/fdep,
* 始发站在 origin(货源地)中(Bug #635 实测)。
*/
val depDisplay: String?
get() = if (dep.isNullOrEmpty()) origin else dep
/**
* 5.5寸手机版-出港仓库:卡片状态标签(已清仓=绿 / 未清仓=橙,clearNormal 为空视作未清仓)。
* 已清仓时卡片「清仓」按钮置灰不可点。

View File

@@ -54,9 +54,14 @@ class GjjWarehouse(
var splitFlag: String? = "",
var inDate: String? = "",
var clearNormal: String? = "",
var range: String? = ""
var range: String? = "",
var fdep: String? = "" // 始发站(详情接口 warehouseList 返回 fdep,dep 恒为空)
) {
/** 始发站展示:优先 fdep,兜底 dep / origin(Bug #635) */
val depDisplay: String
get() = listOf(fdep, dep, origin).firstOrNull { !it.isNullOrEmpty() } ?: ""
fun getWaybillCode() = "${prefix}${no}"
fun getFlightDesc() = "${fdate}/${fno}"

View File

@@ -1,5 +1,6 @@
package com.lukouguoji.module_base.bean
import com.lukouguoji.module_base.ktx.toPlainText
import java.io.Serializable
/**
@@ -19,5 +20,14 @@ data class GjjStorageUse(
var outDate: String? = null, // 出库时间
var outOpId: String? = null, // 出库人ID
var outOpName: String? = null, // 出库人姓名
var cargoStatus: String? = null // 货物状态
) : Serializable
var cargoStatus: String? = null, // 货物状态
var inPc: Long? = null, // 入库件数
var inWeight: Double? = null, // 入库重量
var outPc: Long? = null, // 出库件数
var outWeight: Double? = null // 出库重量
) : Serializable {
val inPcText: String get() = inPc?.toString() ?: ""
val inWeightText: String get() = inWeight?.let { "${it.toPlainText()} kg" } ?: ""
val outPcText: String get() = outPc?.toString() ?: ""
val outWeightText: String get() = outWeight?.let { "${it.toPlainText()} kg" } ?: ""
}