feat: opt 进港查询

.claude/settings.local.json

@@ -97,7 +97,12 @@
       "Read(//usr/local/**)",
       "Read(//opt/homebrew/opt/**)",
       "Bash(/Users/kid/.vfox/sdks/java/bin/java -version 2>&1)",
-      "Bash(export JAVA_HOME=/Users/kid/.vfox/sdks/java)"
+      "Bash(export JAVA_HOME=/Users/kid/.vfox/sdks/java)",
+      "mcp__apifox__read_project_oas_kcl8s7",
+      "mcp__apifox__refresh_project_oas_kcl8s7",
+      "mcp__apifox__read_project_oas_ref_resources_kcl8s7",
+      "mcp__apifox__read_project_oas_x3v6fh",
+      "mcp__apifox__read_project_oas_ref_resources_x3v6fh"
     ],
     "deny": [],
     "ask": []

.vfox/sdks/java

@@ -1 +1 @@
-/Users/kid/.vfox/cache/java/v-17+35-amzn/java-17+35-amzn
+/Users/kid/.version-fox/cache/java/v-17+35-amzn/java-17+35-amzn

app/src/main/java/com/lukouguoji/aerologic/page/log/list/LogQueryViewHolder.kt

@@ -11,8 +11,5 @@ class LogQueryViewHolder(view: View) : BaseViewHolder<LogBean, ItemLogQueryBindi
     override fun onBind(item: Any?, position: Int) {
         val bean = getItemBean(item)
         binding.bean = bean
-        itemView.setOnClickListener {
-            bean?.let { LogDetailActivity.start(itemView.context, it) }
-        }
     }
 }

app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt

@@ -970,13 +970,6 @@ class HomeFragment : Fragment() {
                         "ULD管理"
                     )
                 )
-                list.add(
-                    RightMenu(
-                        Constant.AuthName.ComprehensiveColdStorage,
-                        com.lukouguoji.module_base.R.mipmap.gnc_cangku,
-                        "冷库登记"
-                    )
-                )
             }
 
             else -> {

module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt

@@ -302,6 +302,12 @@ interface Api {
     @POST("typeCode/countryType")
     suspend fun getAreaTypeList(): DictListBean
 
+    /**
+     * 获取国家代码
+     */
+    @POST("typeCode/countryCode")
+    suspend fun getCountryCodeList(): DictListBean
+
     /**
      * 获取通讯方式类型
      */

module_gjj/src/main/java/com/lukouguoji/gjj/dialog/IntImpQueryFilterDialogModel.kt

@@ -13,6 +13,7 @@ import com.lukouguoji.module_base.base.BaseDialogModel
 import com.lxj.xpopup.XPopup
 import com.lxj.xpopup.enums.PopupPosition
 import dev.DevUtils
+import com.lukouguoji.module_base.util.DictUtils
 import dev.utils.app.info.KeyValue
 
 /**
@@ -22,28 +23,16 @@ class IntImpQueryFilterDialogModel(
     val spCode: MutableLiveData<String>,
     val spCodeList: MutableLiveData<List<KeyValue>>,
     val flightNo: MutableLiveData<String>,
-    val dest: MutableLiveData<String>,
+    val origin: MutableLiveData<String>,
     val awbType: MutableLiveData<String>,
     val businessType: MutableLiveData<String>,
     val goodsCn: MutableLiveData<String>,
     private val onConfirm: () -> Unit
 ) : BaseDialogModel<DialogIntImpQueryFilterBinding>(DIALOG_TYPE_DRAWER) {
 
-    val awbTypeList = MutableLiveData(
+    val awbTypeList = MutableLiveData<List<KeyValue>>(emptyList())
-        listOf(
-            KeyValue("全部", ""),
-            KeyValue("主单", "1"),
-            KeyValue("分单", "2")
-        )
-    )
 
-    val businessTypeList = MutableLiveData(
+    val businessTypeList = MutableLiveData<List<KeyValue>>(emptyList())
-        listOf(
-            KeyValue("全部", ""),
-            KeyValue("普货", "1"),
-            KeyValue("特货", "2")
-        )
-    )
 
     override fun layoutId() = R.layout.dialog_int_imp_query_filter
 
@@ -70,12 +59,19 @@ class IntImpQueryFilterDialogModel(
         binding.root.findViewById<View>(R.id.tool_back)?.setOnClickListener {
             dismiss()
         }
+
+        DictUtils.getWaybillTypeList(type = "II", addAll = true, checkedValue = awbType.value) {
+            awbTypeList.postValue(it)
+        }
+        DictUtils.getBusinessTypeList(type = "II", addAll = true, checkedValue = businessType.value) {
+            businessTypeList.postValue(it)
+        }
     }
 
     fun onResetClick() {
         spCode.value = ""
         flightNo.value = ""
-        dest.value = ""
+        origin.value = ""
         awbType.value = ""
         businessType.value = ""
         goodsCn.value = ""

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

@@ -57,7 +57,7 @@ class IntArrSupplementInfoViewModel : BaseViewModel() {
      * 加载国家代码下拉列表
      */
     private fun loadCountryCodeList() {
-        launchCollect({ NetApply.api.getAreaTypeList() }) {
+        launchCollect({ NetApply.api.getCountryCodeList() }) {
             onSuccess = { result ->
                 val keyValueList = result.data?.mapNotNull { bean ->
                     if (bean.code != null && bean.name != null) {

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

@@ -13,6 +13,7 @@ import com.lukouguoji.module_base.ktx.launchCollect
 import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
+import com.lukouguoji.module_base.util.DictUtils
 import dev.utils.app.info.KeyValue
 import kotlinx.coroutines.launch
 
@@ -102,21 +103,14 @@ class IntImpQueryEditViewModel : BaseViewModel() {
     }
 
     /**
-     * 加载包装类型下拉列表（国际进港专用）
+     * 加载包装类型下拉列表（收运包装类型）
      */
     private fun loadPackageTypeList() {
-        launchCollect({ NetApply.api.getGjjPackTypeList() }) {
+        DictUtils.getShouYunPackageTypeList(checkedValue = dataBean.value?.packageType) {
-            onSuccess = { result ->
+            packageTypeList.postValue(it)
-                val list = result.data?.mapNotNull { bean ->
-                    if (bean.packageName.isNotEmpty()) {
-                        KeyValue(bean.packageName, bean.packageName)
-                    } else null
-                } ?: emptyList()
-                packageTypeList.value = list
             matchPackageType()
         }
     }
-    }
 
     /**
      * 加载运单类型下拉列表

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

@@ -62,7 +62,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener {
     // ==================== 筛选条件 ====================
     val spCode = MutableLiveData("")
     val flightNo = MutableLiveData("")
-    val dest = MutableLiveData("")
+    val origin = MutableLiveData("")
     val awbType = MutableLiveData("")
     val businessType = MutableLiveData("")
     val goodsCn = MutableLiveData("")
@@ -84,7 +84,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener {
             spCode = spCode,
             spCodeList = spCodeList,
             flightNo = flightNo,
-            dest = dest,
+            origin = origin,
             awbType = awbType,
             businessType = businessType,
             goodsCn = goodsCn,
@@ -104,7 +104,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener {
             "wbNo" to waybillNo.value!!.ifEmpty { null },
             "spCode" to spCode.value!!.ifEmpty { null },
             "fno" to flightNo.value!!.ifEmpty { null },
-            "dest" to dest.value!!.ifEmpty { null },
+            "origin" to origin.value!!.ifEmpty { null },
             "awbType" to awbType.value!!.ifEmpty { null },
             "businessType" to businessType.value!!.ifEmpty { null },
             "goods" to goodsCn.value!!.ifEmpty { null }
@@ -118,7 +118,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener {
             "wbNo" to waybillNo.value!!.ifEmpty { null },
             "spCode" to spCode.value!!.ifEmpty { null },
             "fno" to flightNo.value!!.ifEmpty { null },
-            "dest" to dest.value!!.ifEmpty { null },
+            "origin" to origin.value!!.ifEmpty { null },
             "awbType" to awbType.value!!.ifEmpty { null },
             "businessType" to businessType.value!!.ifEmpty { null },
             "goods" to goodsCn.value!!.ifEmpty { null }

module_gjj/src/main/res/layout/dialog_int_imp_query_filter.xml

@@ -63,13 +63,13 @@
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="10dp" />
 
-                <!-- 目的港 -->
+                <!-- 始发港 -->
                 <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                    hint='@{"请输入目的港"}'
+                    hint='@{"请输入始发港"}'
-                    title='@{"目的港"}'
+                    title='@{"始发港"}'
                     titleLength="@{4}"
                     type="@{DataLayoutType.INPUT}"
-                    value='@={model.dest}'
+                    value='@={model.origin}'
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="10dp" />

module_gjj/src/main/res/layout/item_int_imp_query.xml

@@ -88,7 +88,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text='@{String.valueOf(bean.awbPc)}'
+                        android:text='@{String.valueOf(bean.inPc)}'
                         tools:text="10" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
@@ -109,7 +109,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text='@{String.valueOf(bean.awbWeight)}'
+                        android:text='@{String.valueOf(bean.inWeight)}'
                         tools:text="200" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>

module_gjj/src/main/res/layout/item_int_imp_query_storage.xml

@@ -78,7 +78,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
             android:gravity="center"
-            android:text="@{bean.outDate != null && bean.outDate.length() >= 16 ? bean.outDate.substring(0, 16) : (bean.outDate != null && bean.outDate.length() > 0 ? bean.outDate : `--`)}"
+            android:text="@{bean.outDate != null && bean.outDate.length() >= 16 ? bean.outDate.substring(0, 16) : (bean.outDate ?? ``)}"
             android:textColor="@android:color/black"
             android:textSize="14sp" />