feat: 出港组装 list
This commit is contained in:
@@ -51,4 +51,8 @@ class GjcUldUseBean {
|
||||
var remark: String = "" // 备注
|
||||
var checkFlag: String = "" // 检查标记
|
||||
var emptyUld: String = "" // 空ULD
|
||||
|
||||
// ========== 出港组装页面扩展字段 ==========
|
||||
var isExpanded: Boolean = false // 展开状态
|
||||
var waybillDetails: MutableList<GjcWarehouse>? = null // 运单明细缓存
|
||||
}
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.lukouguoji.module_base.bean
|
||||
|
||||
/**
|
||||
* 国际出港-运单明细Bean
|
||||
* 对应API: IntExpAssemble/queryAssembled
|
||||
*/
|
||||
class GjcWarehouse {
|
||||
var whId: Long = 0 // ID
|
||||
var no: String = "" // 运单号(11位)
|
||||
var prefix: String = "" // 运单前缀
|
||||
var wbNo: String = "" // 主运单编号
|
||||
var pc: Long = 0 // 件数
|
||||
var weight: Double = 0.0 // 重量
|
||||
var volume: Double = 0.0 // 体积
|
||||
var agentCode: String = "" // 代理code
|
||||
var agentName: String = "" // 代理名称
|
||||
var dest: String = "" // 目的港
|
||||
var dest1: String = "" // 卸货站
|
||||
var dest2: String = "" // 第二目的地
|
||||
var dep: String = "" // 始发站
|
||||
var spCode: String = "" // 特码
|
||||
var goods: String = "" // 品名(英)
|
||||
var goodsCn: String = "" // 品名(中)
|
||||
var fdate: String = "" // 航班日期
|
||||
var fno: String = "" // 航班号
|
||||
var fclose: String = "" // 航班关闭时间
|
||||
var flight: String = "" // 航班:航班日期/航班号
|
||||
var range: String = "" // 航程
|
||||
var businessType: String = "" // 业务类型
|
||||
var opId: String = "" // 收运人ID
|
||||
var userName: String = "" // 收运人
|
||||
var opDate: String = "" // 收运时间
|
||||
var location: String = "" // uld
|
||||
var checkInPc: Long = 0 // 入库件数
|
||||
var checkInWeight: Double = 0.0 // 入库重量
|
||||
var assembleCount: Int = 0 // 已经组装的数量
|
||||
}
|
||||
@@ -244,6 +244,7 @@ interface Constant {
|
||||
const val GjcBanXListActivity = "AppIntExpBox" //板箱
|
||||
const val GjcGoodsListActivity = "AppIntExpGoods" //货物交接
|
||||
const val GjcInspectionActivity = "AppIntExpInspection" //收运检查
|
||||
const val GjcIntExpAssembleActivity = "AppIntExpAssemble" //出港组装
|
||||
|
||||
/**
|
||||
* 国际进港
|
||||
|
||||
@@ -28,6 +28,7 @@ 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.GjcUldUseBean
|
||||
import com.lukouguoji.module_base.bean.GjcWarehouse
|
||||
import com.lukouguoji.module_base.bean.GjcWaybillBean
|
||||
import com.lukouguoji.module_base.bean.GjcWaybillDataBean
|
||||
import com.lukouguoji.module_base.bean.GjcWeighingBean
|
||||
@@ -443,6 +444,30 @@ interface Api {
|
||||
@POST("IntExpWeighting/weight")
|
||||
suspend fun submitGjcBoxWeighing(@Body data: RequestBody): BaseResultBean<SimpleResultBean>
|
||||
|
||||
// ==================== 国际出港-出港组装 ====================
|
||||
|
||||
/**
|
||||
* 国际出港组装-分页查询已组装的ULD列表
|
||||
* 接口路径: /IntExpAssemble/pageQuery
|
||||
*/
|
||||
@POST("IntExpAssemble/pageQuery")
|
||||
suspend fun getIntExpAssembleList(@Body data: RequestBody): BaseListBean<GjcUldUseBean>
|
||||
|
||||
/**
|
||||
* 国际出港组装-分页合计统计数据
|
||||
* 接口路径: /IntExpAssemble/pageQueryTotal
|
||||
*/
|
||||
@POST("IntExpAssemble/pageQueryTotal")
|
||||
suspend fun getIntExpAssembleTotal(@Body data: RequestBody): BaseResultBean<ManifestTotalDto>
|
||||
|
||||
/**
|
||||
* 国际出港组装-根据板箱组装记录查询运单明细
|
||||
* 接口路径: /IntExpAssemble/queryAssembled
|
||||
* @param data 请求参数:useId(ULD使用ID)
|
||||
*/
|
||||
@POST("IntExpAssemble/queryAssembled")
|
||||
suspend fun getIntExpAssembleWaybillDetails(@Body data: RequestBody): BaseResultBean<MutableList<GjcWarehouse>>
|
||||
|
||||
/**
|
||||
* 国际出港待计重-分页搜索
|
||||
* 接口路径: /IntExpCheckIn/pageQuery
|
||||
|
||||
@@ -136,6 +136,7 @@ object ARouterConstants {
|
||||
const val ACTIVITY_URL_GJC_INSPECTION = "/gjc/GjcInspectionActivity" //国际出港 收运检查
|
||||
const val ACTIVITY_URL_GJC_INSPECTION_DETAILS = "/gjc/GjcInspectionDetailsActivity" //国际出港 收运检查详情
|
||||
const val ACTIVITY_URL_GJC_HANDOVER = "/gjc/GjcHandoverActivity" //国际出港 货物交接单
|
||||
const val ACTIVITY_URL_INT_EXP_ASSEMBLE = "/gjc/IntExpAssembleActivity" //国际出港 出港组装
|
||||
|
||||
///////////////// 国际进港模块
|
||||
/**
|
||||
|
||||
5
module_base/src/main/res/drawable/bg_green_radius_4.xml
Normal file
5
module_base/src/main/res/drawable/bg_green_radius_4.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="#4CAF50" />
|
||||
<corners android:radius="4dp" />
|
||||
</shape>
|
||||
Reference in New Issue
Block a user