This commit is contained in:
2025-11-27 17:17:17 +08:00
parent 29b1875fa5
commit 0fbb9c3704
32 changed files with 1156 additions and 4 deletions

View File

@@ -0,0 +1,9 @@
package com.lukouguoji.module_base.bean
/**
* 组装信息Bean左侧列表
*/
class AssembleInfoBean {
var waybillNo: String = "" // 运单号
var pieces: String = "" // 件数
}

View File

@@ -0,0 +1,9 @@
package com.lukouguoji.module_base.bean
/**
* 组装位置Bean
*/
class AssemblePositionBean {
var positionName: String = "" // 位置名称
var isSelected: Boolean = false // 是否选中
}

View File

@@ -0,0 +1,11 @@
package com.lukouguoji.module_base.bean
/**
* 运单列表Bean右侧运单列表
*/
class AssembleWaybillBean {
var waybillNo: String = "" // 运单号
var pieces: String = "" // 件数
var weight: String = "" // 重量
var isMarked: Boolean = false // 是否标记(红色显示)
}

View File

@@ -54,5 +54,6 @@ class GjcUldUseBean {
// ========== 出港组装页面扩展字段 ==========
var isExpanded: Boolean = false // 展开状态
var isSelected: Boolean = false // 选中状态
var waybillDetails: MutableList<GjcWarehouse>? = null // 运单明细缓存
}

View File

@@ -0,0 +1,13 @@
package com.lukouguoji.module_base.bean
/**
* ULD信息Bean
*/
class UldInfoBean {
var uldNo: String = "" // ULD编号
var planeType: String = "" // 机型
var weightLimit: String = "" // 限重
var totalPieces: String = "" // 总件数
var totalWeight: String = "" // 总重量
var status: String = "" // 状态
}

View File

@@ -0,0 +1,13 @@
package com.lukouguoji.module_base.bean
/**
* 运单信息Bean
*/
class WaybillInfoBean {
var waybillNo: String = "" // 运单号
var pieces: String = "" // 件数
var weight: String = "" // 重量
var destination: String = "" // 目的港
var specialCode: String = "" // 特码
var goodsName: String = "" // 品名
}

View File

@@ -468,6 +468,22 @@ interface Api {
@POST("IntExpAssemble/queryAssembled")
suspend fun getIntExpAssembleWaybillDetails(@Body data: RequestBody): BaseResultBean<MutableList<GjcWarehouse>>
/**
* 国际出港组装-删除记录
* 接口路径: /IntExpAssemble/delete
* @param ids ULD使用记录ID多个用逗号分隔
*/
@POST("IntExpAssemble/delete")
suspend fun deleteIntExpAssemble(@Query("ids") ids: String): BaseResultBean<SimpleResultBean>
/**
* 国际出港组装-回填重量
* 接口路径: /IntExpAssemble/backfillWeight
* @param data 请求参数idsULD使用记录ID逗号分隔、weight重量
*/
@POST("IntExpAssemble/backfillWeight")
suspend fun backfillIntExpAssembleWeight(@Body data: RequestBody): BaseResultBean<SimpleResultBean>
/**
* 国际出港待计重-分页搜索
* 接口路径: /IntExpCheckIn/pageQuery

View File

@@ -137,6 +137,7 @@ object ARouterConstants {
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" //国际出港 出港组装
const val ACTIVITY_URL_INT_EXP_ASSEMBLE_START = "/gjc/IntExpAssembleStartActivity" //国际出港 开始组装
///////////////// 国际进港模块
/**

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#1C8CF5" />
<corners android:radius="4dp" />
</shape>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="#FFC107" />
</shape>

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#E8F5E9" />
<corners android:radius="4dp" />
</shape>

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#EA0553" />
<corners android:radius="4dp" />
</shape>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="#4CAF50"
android:pathData="M7.5,14.5L3,10L4.4,8.6L7.5,11.7L15.6,3.6L17,5L7.5,14.5Z"/>
</vector>

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#1C8CF5"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
</vector>

View File

@@ -35,5 +35,6 @@
<color name="color_bottom_layout">#5c6890</color>
<color name="color_f2">#F2F2F2</color>
<color name="line">#EEEEEE</color>
</resources>