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 9aa608a..dd74452 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 @@ -32,6 +32,10 @@ class GjjManifestAddViewModel : BaseViewModel() { // 舱单ID(编辑时使用) var mfId: Long = 0 + // 编号和前缀(编辑时使用) + var no: String = "" + var prefix: String = "" + // 航班ID var fid: String = "" @@ -271,6 +275,8 @@ class GjjManifestAddViewModel : BaseViewModel() { // 保存舱单ID mfId = manifest.mfId fid = manifest.fid.toString() + no = manifest.no + prefix = manifest.prefix // 填充表单字段 waybillNo.value = manifest.wbNo @@ -299,6 +305,8 @@ class GjjManifestAddViewModel : BaseViewModel() { */ private fun loadManifestFromImportBean(manifest: com.lukouguoji.module_base.bean.GjjImportManifest) { fid = manifest.fid.toString() + no = manifest.no + prefix = manifest.prefix // 填充表单字段 waybillNo.value = manifest.wbNo @@ -368,6 +376,8 @@ class GjjManifestAddViewModel : BaseViewModel() { val params = mapOf( "mfId" to if (pageType.value == DetailsPageType.Modify) mfId else null, "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, "agentCode" to agent.value, "spCode" to specialCode.value.let { if (it.isNullOrEmpty()) "NOR" else it }, diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestDetailsViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestDetailsViewModel.kt index 2b9e05c..7a452a5 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestDetailsViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestDetailsViewModel.kt @@ -22,6 +22,8 @@ class GjjManifestDetailsViewModel : BaseViewModel(), IGetData { var id = "" var fid = "" + var no = "" + var prefix = "" var pic = "" var originalPic = "" @@ -103,6 +105,8 @@ class GjjManifestDetailsViewModel : BaseViewModel(), IGetData { onSuccess = { result -> result.data?.let { data -> fid = data.fid.toString() + no = data.no + prefix = data.prefix waybillNo.value = data.getWaybillCode().noNull() waybillNum.value = data.awbpc.toString() actualNum.value = data.pc.toString() @@ -223,6 +227,8 @@ class GjjManifestDetailsViewModel : BaseViewModel(), IGetData { mapOf( "mfId" to id, "fid" to fid, + "no" to no, + "prefix" to prefix, "wbNo" to waybillNo.value, "agent" to agent, "spCode" to specialCode,