feat: 国际出港组装分配

module_base/src/main/java/com/lukouguoji/module_base/bean/GjcAssembleAllocate.kt

@@ -0,0 +1,30 @@
+package com.lukouguoji.module_base.bean
+
+import androidx.databinding.ObservableBoolean
+import com.lukouguoji.module_base.interfaces.ICheck
+
+/**
+ * 国际出港组装分配Bean
+ */
+data class GjcAssembleAllocate(
+    val abDate: String? = null,       // 组装时间
+    val abName: String? = null,       // 组装公司(中文)
+    val abid: String? = null,         // 组装公司ID
+    val acDate: String? = null,       // 分配时间
+    val acName: String? = null,       // 分配人(中文)
+    val acid: String? = null,         // 分配人ID
+    val fdate: String? = null,        // 航班日期
+    val fdep: String? = null,         // 始发站
+    val fdest: String? = null,        // 目的站
+    val fid: Long? = null,            // 航班id
+    val fidList: List<Long>? = null,  // 航班fid列表
+    val fno: String? = null,          // 航班号
+    val id: Long? = null,             // 主键
+    val jtz: String? = null,          // 经停站
+    val range: String? = null,        // 航程
+
+    // 用于UI的可观察选中状态
+    val checked: ObservableBoolean = ObservableBoolean(false)
+) : ICheck {
+    override fun getCheckObservable(): ObservableBoolean = checked
+}

module_base/src/main/java/com/lukouguoji/module_base/common/Constant.kt

@@ -245,6 +245,7 @@ interface Constant {
             const val GjcGoodsListActivity = "AppIntExpGoods" //货物交接
             const val GjcInspectionActivity = "AppIntExpInspection" //收运检查
             const val GjcIntExpAssembleActivity = "AppIntExpAssemble" //出港组装
+            const val GjcAssembleAllocateActivity = "AppIntExpAssembleAllocate" //组装分配
 
             /**
              * 国际进港

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

@@ -1,7 +1,6 @@
 //package com.lukouguoji.module_base.http.net
 package com.lukouguoji.module_base.http.net
 
-import com.alibaba.fastjson.JSONObject
 import com.lukouguoji.module_base.bean.AccidentVisaBean
 import com.lukouguoji.module_base.bean.AirportBean
 import com.lukouguoji.module_base.bean.AppUpdateResponse
@@ -19,6 +18,7 @@ import com.lukouguoji.module_base.bean.FlatcarBean
 import com.lukouguoji.module_base.bean.FlightBean
 import com.lukouguoji.module_base.bean.FlightFilterBean
 import com.lukouguoji.module_base.bean.GbCarOrUldBean
+import com.lukouguoji.module_base.bean.GjcAssembleAllocate
 import com.lukouguoji.module_base.bean.GjcBoxAddInsertBean
 import com.lukouguoji.module_base.bean.GjcBoxAssembleBean
 import com.lukouguoji.module_base.bean.GjcBoxDetailsBean
@@ -27,6 +27,8 @@ import com.lukouguoji.module_base.bean.GjcCheckInRecord
 import com.lukouguoji.module_base.bean.GjcGoodsAddBean
 import com.lukouguoji.module_base.bean.GjcGoodsBean
 import com.lukouguoji.module_base.bean.GjcGoodsDetailsBean
+import com.lukouguoji.module_base.bean.GjcInspectionBean
+import com.lukouguoji.module_base.bean.GjcMaWb
 import com.lukouguoji.module_base.bean.GjcMove
 import com.lukouguoji.module_base.bean.GjcUldUseBean
 import com.lukouguoji.module_base.bean.GjcWarehouse
@@ -35,8 +37,6 @@ import com.lukouguoji.module_base.bean.GjcWaybillDataBean
 import com.lukouguoji.module_base.bean.GjcWeighingBean
 import com.lukouguoji.module_base.bean.GjcWeighingRecordBean
 import com.lukouguoji.module_base.bean.GjcWeighingStatisticsBean
-import com.lukouguoji.module_base.bean.GjcMaWb
-import com.lukouguoji.module_base.bean.PageInfo
 import com.lukouguoji.module_base.bean.GjjGoodsBean
 import com.lukouguoji.module_base.bean.GjjGoodsDetailsBean
 import com.lukouguoji.module_base.bean.GjjGoodsTypeBean
@@ -45,15 +45,11 @@ import com.lukouguoji.module_base.bean.GjjManifestBean
 import com.lukouguoji.module_base.bean.GjjPackTypeBean
 import com.lukouguoji.module_base.bean.GjjTallyBean
 import com.lukouguoji.module_base.bean.GjjTallyDetailsBean
-import com.lukouguoji.module_base.bean.JianDataBean
-import com.lukouguoji.module_base.bean.PacketParseBean
 import com.lukouguoji.module_base.bean.GjjTallyRecordBean
 import com.lukouguoji.module_base.bean.GncAssembleListBean
 import com.lukouguoji.module_base.bean.GncCunFangBean
 import com.lukouguoji.module_base.bean.GncDistributionBean
 import com.lukouguoji.module_base.bean.GncFuBangBean
-import com.lukouguoji.module_base.bean.GjcInspectionBean
-import com.lukouguoji.module_base.bean.ManifestTotalDto
 import com.lukouguoji.module_base.bean.GncInspectionBean
 import com.lukouguoji.module_base.bean.GncQueryBean
 import com.lukouguoji.module_base.bean.GncQueryDetailsBean
@@ -67,10 +63,14 @@ import com.lukouguoji.module_base.bean.GnjStashBean
 import com.lukouguoji.module_base.bean.GnjUnloadListBean
 import com.lukouguoji.module_base.bean.GnjYiKuBean
 import com.lukouguoji.module_base.bean.GoodsTransportBean
+import com.lukouguoji.module_base.bean.JianDataBean
 import com.lukouguoji.module_base.bean.LogBean
+import com.lukouguoji.module_base.bean.ManifestTotalDto
 import com.lukouguoji.module_base.bean.MessageBean
 import com.lukouguoji.module_base.bean.MoveStashBean
 import com.lukouguoji.module_base.bean.PackageBean
+import com.lukouguoji.module_base.bean.PacketParseBean
+import com.lukouguoji.module_base.bean.PageInfo
 import com.lukouguoji.module_base.bean.SYWaybillBean
 import com.lukouguoji.module_base.bean.ShouYunSyncBean
 import com.lukouguoji.module_base.bean.SimpleResultBean
@@ -86,7 +86,6 @@ import com.lukouguoji.module_base.ktx.toRequestBody
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import okhttp3.ResponseBody
-import retrofit2.Call
 import retrofit2.http.*
 
 /**
@@ -448,6 +447,27 @@ interface Api {
     @POST("IntExpSearch/detail")
     suspend fun getGjcQueryDetails(@Query("maWbId") maWbId: Long): BaseResultBean<Map<String, Any>>
 
+    /**
+     * 国际出港组装分配-分页查询
+     * 接口路径: /IntExpAssemble/allocate/pageQuery
+     */
+    @POST("IntExpAssemble/allocate/pageQuery")
+    suspend fun getGjcAssembleAllocateList(@Body params: RequestBody): BaseResultBean<PageInfo<GjcAssembleAllocate>>
+
+    /**
+     * 国际出港组装分配-分页合计统计
+     * 接口路径: /IntExpAssemble/allocate/pageQueryTotal
+     */
+    @POST("IntExpAssemble/allocate/pageQueryTotal")
+    suspend fun getGjcAssembleAllocateTotal(@Body params: RequestBody): BaseResultBean<ManifestTotalDto>
+
+    /**
+     * 国际出港组装分配-执行分配操作
+     * 接口路径: /IntExpAssemble/allocate
+     */
+    @POST("IntExpAssemble/allocate")
+    suspend fun allocateAssemble(@Body params: RequestBody): BaseResultBean<Boolean>
+
     /**
      * 国际出港板箱过磅-分页搜索
      * 接口路径: /IntExpWeighting/pageQuery

module_base/src/main/java/com/lukouguoji/module_base/router/ARouterConstants.kt

@@ -141,6 +141,7 @@ object ARouterConstants {
     const val ACTIVITY_URL_INT_EXP_ASSEMBLE = "/gjc/IntExpAssembleActivity"   //国际出港 出港组装
     const val ACTIVITY_URL_INT_EXP_ASSEMBLE_START = "/gjc/IntExpAssembleStartActivity"   //国际出港 开始组装
     const val ACTIVITY_URL_INT_EXP_MOVE = "/gjc/IntExpMoveActivity"   //国际出港 出港移库
+    const val ACTIVITY_URL_GJC_ASSEMBLE_ALLOCATE = "/gjc/GjcAssembleAllocateActivity"  //国际出港 组装分配
 
     /////////////////  国际进港模块
     /**