fix: 国际进港修改舱单接口补充 no 和 prefix 字段
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -32,6 +32,10 @@ class GjjManifestAddViewModel : BaseViewModel() {
|
|||||||
// 舱单ID(编辑时使用)
|
// 舱单ID(编辑时使用)
|
||||||
var mfId: Long = 0
|
var mfId: Long = 0
|
||||||
|
|
||||||
|
// 编号和前缀(编辑时使用)
|
||||||
|
var no: String = ""
|
||||||
|
var prefix: String = ""
|
||||||
|
|
||||||
// 航班ID
|
// 航班ID
|
||||||
var fid: String = ""
|
var fid: String = ""
|
||||||
|
|
||||||
@@ -271,6 +275,8 @@ class GjjManifestAddViewModel : BaseViewModel() {
|
|||||||
// 保存舱单ID
|
// 保存舱单ID
|
||||||
mfId = manifest.mfId
|
mfId = manifest.mfId
|
||||||
fid = manifest.fid.toString()
|
fid = manifest.fid.toString()
|
||||||
|
no = manifest.no
|
||||||
|
prefix = manifest.prefix
|
||||||
|
|
||||||
// 填充表单字段
|
// 填充表单字段
|
||||||
waybillNo.value = manifest.wbNo
|
waybillNo.value = manifest.wbNo
|
||||||
@@ -299,6 +305,8 @@ class GjjManifestAddViewModel : BaseViewModel() {
|
|||||||
*/
|
*/
|
||||||
private fun loadManifestFromImportBean(manifest: com.lukouguoji.module_base.bean.GjjImportManifest) {
|
private fun loadManifestFromImportBean(manifest: com.lukouguoji.module_base.bean.GjjImportManifest) {
|
||||||
fid = manifest.fid.toString()
|
fid = manifest.fid.toString()
|
||||||
|
no = manifest.no
|
||||||
|
prefix = manifest.prefix
|
||||||
|
|
||||||
// 填充表单字段
|
// 填充表单字段
|
||||||
waybillNo.value = manifest.wbNo
|
waybillNo.value = manifest.wbNo
|
||||||
@@ -368,6 +376,8 @@ class GjjManifestAddViewModel : BaseViewModel() {
|
|||||||
val params = mapOf(
|
val params = mapOf(
|
||||||
"mfId" to if (pageType.value == DetailsPageType.Modify) mfId else null,
|
"mfId" to if (pageType.value == DetailsPageType.Modify) mfId else null,
|
||||||
"fid" to fid,
|
"fid" to fid,
|
||||||
|
"no" to if (pageType.value == DetailsPageType.Modify) no else null,
|
||||||
|
"prefix" to if (pageType.value == DetailsPageType.Modify) prefix else null,
|
||||||
"wbNo" to waybillNo.value,
|
"wbNo" to waybillNo.value,
|
||||||
"agentCode" to agent.value,
|
"agentCode" to agent.value,
|
||||||
"spCode" to specialCode.value.let { if (it.isNullOrEmpty()) "NOR" else it },
|
"spCode" to specialCode.value.let { if (it.isNullOrEmpty()) "NOR" else it },
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ class GjjManifestDetailsViewModel : BaseViewModel(), IGetData {
|
|||||||
|
|
||||||
var id = ""
|
var id = ""
|
||||||
var fid = ""
|
var fid = ""
|
||||||
|
var no = ""
|
||||||
|
var prefix = ""
|
||||||
var pic = ""
|
var pic = ""
|
||||||
var originalPic = ""
|
var originalPic = ""
|
||||||
|
|
||||||
@@ -103,6 +105,8 @@ class GjjManifestDetailsViewModel : BaseViewModel(), IGetData {
|
|||||||
onSuccess = { result ->
|
onSuccess = { result ->
|
||||||
result.data?.let { data ->
|
result.data?.let { data ->
|
||||||
fid = data.fid.toString()
|
fid = data.fid.toString()
|
||||||
|
no = data.no
|
||||||
|
prefix = data.prefix
|
||||||
waybillNo.value = data.getWaybillCode().noNull()
|
waybillNo.value = data.getWaybillCode().noNull()
|
||||||
waybillNum.value = data.awbpc.toString()
|
waybillNum.value = data.awbpc.toString()
|
||||||
actualNum.value = data.pc.toString()
|
actualNum.value = data.pc.toString()
|
||||||
@@ -223,6 +227,8 @@ class GjjManifestDetailsViewModel : BaseViewModel(), IGetData {
|
|||||||
mapOf(
|
mapOf(
|
||||||
"mfId" to id,
|
"mfId" to id,
|
||||||
"fid" to fid,
|
"fid" to fid,
|
||||||
|
"no" to no,
|
||||||
|
"prefix" to prefix,
|
||||||
"wbNo" to waybillNo.value,
|
"wbNo" to waybillNo.value,
|
||||||
"agent" to agent,
|
"agent" to agent,
|
||||||
"spCode" to specialCode,
|
"spCode" to specialCode,
|
||||||
|
|||||||
Reference in New Issue
Block a user