feat: 出港组装 回填重量
This commit is contained in:
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit
|
||||
class MyApplication : Application() {
|
||||
|
||||
//ARouter debug开关:true-open;false-close
|
||||
private val isDebugARouter = true
|
||||
private val isDebugARouter = false
|
||||
|
||||
companion object {
|
||||
lateinit var context: Context
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
package com.lukouguoji.module_base.bean
|
||||
|
||||
import androidx.databinding.ObservableBoolean
|
||||
import java.io.Serializable
|
||||
|
||||
/**
|
||||
* 国际出港板箱过磅-ULD使用记录Bean
|
||||
* 对应API: IntExpWeighting/pageQuery
|
||||
*/
|
||||
class GjcUldUseBean {
|
||||
class GjcUldUseBean : Serializable {
|
||||
var useId: Long = 0 // 使用id
|
||||
var uld: String = "" // uld编号
|
||||
var carId: String = "" // 板车号
|
||||
|
||||
@@ -11,6 +11,10 @@ class GjcWarehouse {
|
||||
var wbNo: String = "" // 主运单编号
|
||||
var pc: Long = 0 // 件数
|
||||
var weight: Double = 0.0 // 重量
|
||||
set(value) {
|
||||
field = value
|
||||
onDataChanged?.invoke()
|
||||
}
|
||||
var volume: Double = 0.0 // 体积
|
||||
var agentCode: String = "" // 代理code
|
||||
var agentName: String = "" // 代理名称
|
||||
@@ -34,4 +38,21 @@ class GjcWarehouse {
|
||||
var checkInPc: Long = 0 // 入库件数
|
||||
var checkInWeight: Double = 0.0 // 入库重量
|
||||
var assembleCount: Int = 0 // 已经组装的数量
|
||||
|
||||
// ========== UI扩展字段 ==========
|
||||
|
||||
/**
|
||||
* 重量字符串(用于双向绑定EditText)
|
||||
*/
|
||||
var weightStr: String
|
||||
get() = if (weight == 0.0) "" else weight.toString()
|
||||
set(value) {
|
||||
weight = value.toDoubleOrNull() ?: 0.0
|
||||
}
|
||||
|
||||
/**
|
||||
* 数据变化回调(用于实时计算统计)
|
||||
*/
|
||||
@Transient
|
||||
var onDataChanged: (() -> Unit)? = null
|
||||
}
|
||||
|
||||
@@ -661,6 +661,14 @@ interface Api {
|
||||
@POST("IntExpAssemble/queryAssembledByUld")
|
||||
suspend fun getAssembledWaybillsByUld(@Body data: RequestBody): BaseResultBean<List<GjcWarehouse>>
|
||||
|
||||
/**
|
||||
* 国际出港组装 - 修改列表(批量更新运单重量)
|
||||
* 接口路径: /IntExpAssemble/update
|
||||
* @param data GjcWarehouse数组
|
||||
*/
|
||||
@POST("IntExpAssemble/update")
|
||||
suspend fun updateIntExpAssemble(@Body data: RequestBody): BaseResultBean<Boolean>
|
||||
|
||||
/**
|
||||
* 国际出港出库交接-分页查询
|
||||
* 接口路径: /IntExpOutHandover/pageQuery
|
||||
|
||||
@@ -147,6 +147,7 @@ object ARouterConstants {
|
||||
const val ACTIVITY_URL_INT_EXP_TALLY = "/gjc/IntExpTallyActivity" //国际出港 出港理货
|
||||
const val ACTIVITY_URL_INT_EXP_ARRIVE = "/gjc/IntExpArriveActivity" //国际出港 出港运抵
|
||||
const val ACTIVITY_URL_INT_EXP_STORAGE_USE = "/gjc/IntExpStorageUseActivity" //国际出港 仓库
|
||||
const val ACTIVITY_URL_GJC_ASSEMBLE_WEIGHT_EDIT = "/gjc/GjcAssembleWeightEditActivity" //国际出港 修改组装重量
|
||||
|
||||
///////////////// 国际进港模块
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user