feat: 出港计重 开始计重

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

@@ -642,6 +642,23 @@ interface Api {
     @POST("IntExpCheckIn/pageQueryTotal")
     suspend fun getGjcWeighingStatistics(@Body data: RequestBody): BaseResultBean<GjcWeighingStatisticsBean>
 
+    /**
+     * 国际出港待计重-开始计重-根据wbId查询详情
+     * 接口路径: /IntExpCheckIn/queryWbById
+     * @param maWbId 运单主键ID
+     */
+    @POST("IntExpCheckIn/queryWbById")
+    suspend fun getIntExpCheckInWbById(@Query("maWbId") maWbId: Long): BaseResultBean<GjcMaWb>
+
+    /**
+     * 国际出港待计重-开始计重-根据运单id查询实时计重数据
+     * 接口路径: /IntExpCheckIn/queryRecordByWh
+     * @param maWbId 运单主键ID
+     * @return 返回GjcCheckInRecord,包含实时的pc、weight、volume
+     */
+    @POST("IntExpCheckIn/queryRecordByWh")
+    suspend fun getIntExpRealTimeRecord(@Query("maWbId") maWbId: Long): BaseResultBean<GjcCheckInRecord>
+
     /**
      * 国际出港计重记录-分页搜索
      * 接口路径: /IntExpCheckIn/checked/pageQuery

module_base/src/main/java/com/lukouguoji/module_base/ui/weight/data/layout/DataLayoutKtx.kt

@@ -205,7 +205,6 @@ fun setSearchLayoutDataValueNew(
         layout.value = value
     }
 }
-
 @BindingAdapter(
     "enable",
     requireAll = false

module_base/src/main/java/com/lukouguoji/module_base/util/DictUtils.kt

@@ -1,12 +1,9 @@
 package com.lukouguoji.module_base.util
 
-import androidx.lifecycle.MutableLiveData
 import com.lukouguoji.module_base.bean.DictBean
 import com.lukouguoji.module_base.bean.DictListBean
 import com.lukouguoji.module_base.http.net.NetApply
 import com.lukouguoji.module_base.ktx.launchCollect
-import com.lukouguoji.module_base.ktx.toMap
-import com.lukouguoji.module_base.ktx.toRequestBody
 import dev.utils.app.info.KeyValue
 import java.util.Collections.emptyList
 
@@ -179,7 +176,7 @@ object DictUtils {
     ) {
         launchCollect({
             NetApply.api
-                .getSpecialCodeList(flag, ieFlag,parentcode)
+                .getSpecialCodeList(flag, ieFlag, parentcode)
         }) {
             onSuccess = {
                 handleCallBack(it, checkedValue, addAll, callBack)
@@ -404,6 +401,22 @@ object DictUtils {
         }
     }
 
+    /**
+     * 国际出港通道号列表
+     */
+    fun getGjcChannelList(
+        callBack: (List<KeyValue>) -> Unit
+    ) {
+        launchCollect({
+            NetApply.api
+                .getDictList("GJCPASSAGEWAY")
+        }) {
+            onSuccess = {
+                callBack((it.data ?: emptyList()).map { b -> b.toKeyValue() })
+            }
+        }
+    }
+
 
     /**
      * 货物类型
@@ -510,7 +523,7 @@ object DictUtils {
                 .getDictList("DGRDETAIL")
         }) {
             onSuccess = {
-                callBack((it.data ?: emptyList()).map { b -> KeyValue(b.value,b.value) })
+                callBack((it.data ?: emptyList()).map { b -> KeyValue(b.value, b.value) })
             }
         }
     }
@@ -629,12 +642,14 @@ object DictUtils {
             NetApply.api.getUserByRoleId("6")
         }) {
             onSuccess = {
-                val jbDrivers = (it.data ?: emptyList()).map { b -> KeyValue(b.username, b.username) }
+                val jbDrivers =
+                    (it.data ?: emptyList()).map { b -> KeyValue(b.username, b.username) }
                 launchCollect({
                     NetApply.api.getUserByRoleId("7")
                 }) {
-                    onSuccess = {iit ->
-                        val shDrivers = (iit.data ?: emptyList()).map { b -> KeyValue(b.username, b.username) }
+                    onSuccess = { iit ->
+                        val shDrivers =
+                            (iit.data ?: emptyList()).map { b -> KeyValue(b.username, b.username) }
                         callBack(jbDrivers + shDrivers)
                     }
                 }