feat: 开始组装

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("-", "")}"
+
 }

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()

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" />
     </LinearLayout>