From 644c9374761e1aea65e8dbfd2bec0dfa12c318ff Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Tue, 16 Dec 2025 15:36:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BC=80=E5=A7=8B=E7=BB=84=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lukouguoji/module_base/bean/AssembleWaybillBean.kt | 6 ++++++ .../gjc/viewModel/IntExpAssembleStartViewModel.kt | 4 ++++ module_gjc/src/main/res/layout/item_assemble_waybill.xml | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/AssembleWaybillBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/AssembleWaybillBean.kt index 0090ac0..74f2ae3 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/AssembleWaybillBean.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/AssembleWaybillBean.kt @@ -9,4 +9,10 @@ class AssembleWaybillBean { var weight: String = "" // 重量 var flight: String = "" // 配载航班 var isMarked: Boolean = false // 是否标记（红色显示） + var fno: String = "" + var fdate: String = "" + + val fLightInfo: String + get() = "$fno/${fdate.replace("-", "")}" + } 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 713b810..d9daa44 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 @@ -130,6 +130,8 @@ class IntExpAssembleStartViewModel : BaseViewModel() { pieces = warehouse.pc.toString() weight = String.format("%.1f", warehouse.weight) flight = warehouse.flight + fno = warehouse.fno + fdate = warehouse.fdate isMarked = false } }.toMutableList() @@ -164,6 +166,8 @@ class IntExpAssembleStartViewModel : BaseViewModel() { pieces = warehouse.pc.toString() weight = String.format("%.1f", warehouse.weight) flight = warehouse.flight + fno = warehouse.fno + fdate = warehouse.fdate isMarked = false } }.toMutableList() diff --git a/module_gjc/src/main/res/layout/item_assemble_waybill.xml b/module_gjc/src/main/res/layout/item_assemble_waybill.xml index cbfdb96..8821080 100644 --- a/module_gjc/src/main/res/layout/item_assemble_waybill.xml +++ b/module_gjc/src/main/res/layout/item_assemble_waybill.xml @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:layout_weight="1.2" android:gravity="center" - android:text="@{bean.flight}" + android:text="@{bean.fLightInfo}" android:textColor="@{bean.isMarked ? @color/text_red : @color/text_normal}" android:textSize="14sp" />