feat: opt 国际出港

module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt

@@ -41,7 +41,7 @@ import me.jessyan.autosize.internal.CustomAdapt
  * ========== 开发调试开关 ==========
  * TODO: 正式发布前务必设置为 false
  */
-private const val DEV_AUTO_LOGIN = true  // 自动登录开关
+private const val DEV_AUTO_LOGIN = false  // 自动登录开关
 
 @Route(path = ARouterConstants.ACTIVITY_URL_LOGIN)
 class LoginActivity : BaseActivity(),

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt

@@ -60,6 +60,8 @@ class GjcWeighingStartViewModel : BaseViewModel() {
     val arriveWeight = MutableLiveData("")        // 运抵重量
     val arriveVolume = MutableLiveData("")        // 运抵体积
 
+    val pageRemark = MutableLiveData("")    // 备注
+
     // 下拉选择数据源
     val channelList = MutableLiveData<List<KeyValue>>()        // 通道号列表
     val agentList = MutableLiveData<List<KeyValue>>()          // 代理人列表
@@ -167,6 +169,7 @@ class GjcWeighingStartViewModel : BaseViewModel() {
         launchLoadingCollect({ NetApply.api.getIntExpCheckInWbById(maWbId) }) {
             onSuccess = { result ->
                 maWbBean.value = result.data ?: GjcMaWb()
+                pageRemark.value = maWbBean.value?.remark
                 // 更新航班日期字符串
                 flightDate.value = result.data?.fdate?.formatDate() ?: ""
             }
@@ -270,6 +273,8 @@ class GjcWeighingStartViewModel : BaseViewModel() {
                 this@GjcWeighingStartViewModel.arriveVolume.value?.toDoubleOrNull() ?: arriveVolume
             // 添加通道号
             passageWay = this@GjcWeighingStartViewModel.channel.value
+
+            remark = pageRemark.value
         }
 
         // 3. 构建请求数据（GjcMaWb转RequestBody，包含通道号）
@@ -295,6 +300,9 @@ class GjcWeighingStartViewModel : BaseViewModel() {
                     arrivePc.value = ""
                     arriveWeight.value = ""
                     arriveVolume.value = ""
+
+                    pageRemark.value = ""
+
                     maWbBean.value = maWbBean.value?.apply {
                         carId = null
                         remark = null
@@ -351,7 +359,7 @@ class GjcWeighingStartViewModel : BaseViewModel() {
             "goodsCn" to bean.goodsCn,
             "businessType" to bean.businessType,
             "carId" to bean.carId,
-            "remark" to bean.remark,
+            "remark" to pageRemark.value,
             "checkIn" to "1",  // 收运状态设置为已收运
             "passageWay" to channel.value  // 通道号参数
         ).toRequestBody(removeEmptyOrNull = true)

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt

@@ -128,7 +128,7 @@ class GjcWeighingViewModel : BasePageViewModel() {
             "fno" to flightNo.value!!.ifEmpty { null },
             "agentCode" to agentCode.value!!.ifEmpty { null },
             "spCode" to spCode.value!!.ifEmpty { null },
-            "likeNo" to waybillNo.value!!.ifEmpty { null },
+            "wbNo" to waybillNo.value!!.ifEmpty { null },
         ).toRequestBody()
 
         // 构建查询参数（统计接口 - 使用相同的搜索条件）
@@ -137,7 +137,7 @@ class GjcWeighingViewModel : BasePageViewModel() {
             "fno" to flightNo.value!!.ifEmpty { null },
             "agentCode" to agentCode.value!!.ifEmpty { null },
             "spCode" to spCode.value!!.ifEmpty { null },
-            "likeNo" to waybillNo.value!!.ifEmpty { null },
+            "wbNo" to waybillNo.value!!.ifEmpty { null },
         ).toRequestBody()
 
         // 获取列表数据（显示loading）

module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml

@@ -69,7 +69,7 @@
                                     type="@{DataLayoutType.INPUT}"
                                     value='@={viewModel.maWbBean.wbNo}'
                                     autoQueryEnabled="@{true}"
-                                    autoQueryUrl="@{`/IntExpCheckIn/checked/queryWbNoList`}"
+                                    autoQueryUrl="@{`/IntExpCheckIn/queryWbNoList`}"
                                     autoQueryParamKey="@{`wbNo`}"
                                     autoQueryMinLength="@{4}"
                                     autoQueryMaxLength="@{8}"
@@ -397,7 +397,7 @@
                         title='@{"备    注"}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
-                        value='@={viewModel.maWbBean.remark}'
+                        value='@={viewModel.pageRemark}'
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp" />