feat: fix issues

module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestAddViewModel.kt

@@ -2,6 +2,7 @@ package com.lukouguoji.gjj.viewModel
 
 import android.content.Intent
 import android.view.View
+import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.lukouguoji.module_base.base.BaseViewModel
@@ -38,9 +39,6 @@ class GjjManifestAddViewModel : BaseViewModel() {
     // 航班号
     val flightNo = MutableLiveData("")
 
-    // 航程
-    val range = MutableLiveData("")
-
     // 运单号
     val waybillNo = MutableLiveData("")
 
@@ -80,12 +78,10 @@ class GjjManifestAddViewModel : BaseViewModel() {
                     fid = flight.fid.noNull()
                     departure.value = flight.fdep.noNull()
                     destination.value = flight.fdest.noNull()
-                    range.value = flight.range.noNull()
                 } else {
                     fid = ""
                     departure.value = ""
                     destination.value = ""
-                    range.value = ""
                     showToast(it.msg.noNull("获取航班信息失败"))
                 }
             }
@@ -93,7 +89,6 @@ class GjjManifestAddViewModel : BaseViewModel() {
                 fid = ""
                 departure.value = ""
                 destination.value = ""
-                range.value = ""
             }
         }
     }
@@ -119,6 +114,17 @@ class GjjManifestAddViewModel : BaseViewModel() {
     // 目的港
     val destination = MutableLiveData("")
 
+    // 航程（自动拼接：始发站-目的站）
+    val range = MediatorLiveData<String>().apply {
+        val update = {
+            val dep = departure.value ?: ""
+            val dest = destination.value ?: ""
+            value = if (dep.isNotEmpty() || dest.isNotEmpty()) "$dep-$dest" else ""
+        }
+        addSource(departure) { update() }
+        addSource(destination) { update() }
+    }
+
     // 品名(中)
     val goodsNameCn = MutableLiveData("")
 
@@ -154,10 +160,10 @@ class GjjManifestAddViewModel : BaseViewModel() {
     val waybillType = MutableLiveData("")
 
     init {
-        DictUtils.getAgentList(addAll = false) {
+        DictUtils.getIntImpAgentList(addAll = false) {
             agentList.postValue(listOf(KeyValue("", "")) + it)
         }
-        DictUtils.getSpecialCodeList(addAll = false, flag = 1, ieFlag = "I") {
+        DictUtils.getSpecialCodeList(addAll = false, flag = 1, ieFlag = "") {
             val list = arrayListOf<KeyValue>()
             it.find { b -> b.key.contains("普通货物") }?.let { b ->
                 list.add(b)
@@ -168,7 +174,7 @@ class GjjManifestAddViewModel : BaseViewModel() {
         DictUtils.getBusinessTypeList(addAll = false) {
             businessTypeList.postValue(it)
         }
-        DictUtils.getGjjPackageTypeList(addAll = false) {
+        DictUtils.getShouYunPackageTypeList {
             packageTypeList.postValue(listOf(KeyValue("", "")) + it)
         }
         DictUtils.getGjjGoodsTypeList(addAll = false) {