From 1ec08b4847a2a21993eb80c6b8fdebc0b1a31fc8 Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <tim.yee@hotmail.com>
Date: Tue, 7 Apr 2026 15:11:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E8=BF=9B=E6=B8=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=88=B1=E5=8D=95=E6=8E=A5=E5=8F=A3=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=20no=20=E5=92=8C=20prefix=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../gjj/viewModel/GjjManifestAddViewModel.kt           | 10 ++++++++++
 .../gjj/viewModel/GjjManifestDetailsViewModel.kt       |  6 ++++++
 2 files changed, 16 insertions(+)

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,