diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt
index dceda1f..0d04d41 100644
--- a/module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt
@@ -4,10 +4,12 @@ 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 = "" // 状态
+ var uldNo: String = "" // ULD编号
+ var materialWeight: String = "" // 耗材重量
+ var uldStatus: String = "" // ULD状态
+ var planeType: String = "" // 机型
+ var weightLimit: String = "" // 限重
+ var totalPieces: String = "" // 总件数
+ var totalWeight: String = "" // 总重量
+ var status: String = "" // 状态(旧字段，保留兼容)
}
diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/WaybillInfoBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/WaybillInfoBean.kt
index 0db8f84..6a09b54 100644
--- a/module_base/src/main/java/com/lukouguoji/module_base/bean/WaybillInfoBean.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/WaybillInfoBean.kt
@@ -4,10 +4,15 @@ 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 = "" // 品名
+ var waybillNo: String = "" // 运单号
+ var waybillPieces: String = "" // 运单件数
+ var waybillWeight: String = "" // 运单重量
+ var assembleCount: String = "" // 组装件数
+ var assembleWeight: String = "" // 组装重量
+ var operator: String = "" // 操作人
+ var pieces: String = "" // 件数(旧字段，保留兼容)
+ var weight: String = "" // 重量(旧字段，保留兼容)
+ var destination: String = "" // 目的港
+ var specialCode: String = "" // 特码
+ var goodsName: String = "" // 品名
}
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt
index 4de9fd3..e1a6a22 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt
@@ -34,22 +34,19 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
// ========== ULD信息 ==========
val uldInfo = MutableLiveData(UldInfoBean().apply {
- uldNo = "AKE12345HK"
- planeType = "B777"
- weightLimit = "1500"
- totalPieces = "120"
- totalWeight = "2450.5"
- status = "进行中"
+ uldNo = "PMC12345MU"
+ materialWeight = ""
+ uldStatus = "正常"
})
// ========== 运单信息 ==========
val waybillInfo = MutableLiveData(WaybillInfoBean().apply {
- waybillNo = "99912345678"
- pieces = "25"
- weight = "350.5"
- destination = "LAX"
- specialCode = "GEN"
- goodsName = "ELECTRONICS"
+ waybillNo = "78112345678"
+ waybillPieces = "100"
+ waybillWeight = "200"
+ assembleCount = ""
+ assembleWeight = ""
+ operator = "张三"
})
/**
diff --git a/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml b/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml
index 4180053..8cdf28f 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml
@@ -150,21 +150,21 @@
android:layout_marginBottom="16dp"
android:background="@drawable/bg_white_radius_8"
android:orientation="vertical"
- android:padding="16dp">
+ android:padding="12dp">
@@ -188,12 +188,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- enable="@{false}"
- required="@{false}"
- title='@{"机型："}'
+ enable="@{true}"
+ required="@{true}"
+ title='@{"耗材重量："}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
- value="@={viewModel.uldInfo.planeType}" />
+ value="@={viewModel.uldInfo.materialWeight}" />
-
-
-
-
-
-
-
-
-
+ value="@={viewModel.uldInfo.uldStatus}" />
@@ -254,21 +214,21 @@
android:layout_height="wrap_content"
android:background="@drawable/bg_white_radius_8"
android:orientation="vertical"
- android:padding="16dp">
+ android:padding="12dp">
@@ -294,10 +254,10 @@
android:layout_weight="1"
enable="@{false}"
required="@{false}"
- title='@{"件数："}'
+ title='@{"运单件数："}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
- value="@={viewModel.waybillInfo.pieces}" />
+ value="@={viewModel.waybillInfo.waybillPieces}" />
+ value="@={viewModel.waybillInfo.waybillWeight}" />
+ value="@={viewModel.waybillInfo.assembleCount}" />
+
+
-
-
+ value="@={viewModel.waybillInfo.operator}" />
@@ -356,9 +316,9 @@