diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcWeighingBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcWeighingBean.kt index 0510a7d..43934c4 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcWeighingBean.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcWeighingBean.kt @@ -1,5 +1,9 @@ package com.lukouguoji.module_base.bean +import com.lukouguoji.module_base.ktx.noNull +import dev.utils.DevFinal +import dev.utils.common.DateUtils + /** * 国际出港待计重-列表数据Bean * 对应API: IntExpCheckIn/pageQuery @@ -91,4 +95,32 @@ class GjcWeighingBean { var haWbList: List? = null // 分单列表 var storageUseList: List? = null // 库位使用列表 var attachList: List? = null // 附件列表 + + /** + * 预计起飞时间 - 仅时分格式 (HH:mm) + */ + val scheduledTackOffHM: String + get() { + return DateUtils.parseString( + scheduledTackOff, + DevFinal.TIME.yyyyMMddHHmmss_HYPHEN, + "HH:mm" + ).noNull(scheduledTackOff) + } + + /** + * 验证预计起飞时间是否为次日 + */ + fun verifyScheduledTackOffNextDay(): Boolean { + if (fdate.isEmpty() || scheduledTackOff.isEmpty()) { + return false + } + return try { + val calendarFDate = DateUtils.getCalendar(fdate, DevFinal.TIME.yyyyMMdd_HYPHEN) + val calendarTakeOff = DateUtils.getCalendar(scheduledTackOff, DevFinal.TIME.yyyyMMddHHmmss_HYPHEN) + DateUtils.getDay(calendarTakeOff) > DateUtils.getDay(calendarFDate) + } catch (e: Exception) { + false + } + } } diff --git a/module_gjc/src/main/res/layout/item_gjc_weighing.xml b/module_gjc/src/main/res/layout/item_gjc_weighing.xml index b1e6f4d..b90d9b0 100644 --- a/module_gjc/src/main/res/layout/item_gjc_weighing.xml +++ b/module_gjc/src/main/res/layout/item_gjc_weighing.xml @@ -4,6 +4,8 @@ + + @@ -30,8 +32,8 @@ @@ -47,9 +49,9 @@ android:gravity="center_vertical"> + + @@ -224,9 +235,9 @@ android:gravity="center_vertical"> @@ -267,8 +281,8 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_gravity="center" - android:src="@drawable/img_pda_right" - android:layout_marginLeft="10dp" /> + android:layout_marginLeft="10dp" + android:src="@drawable/img_pda_right" />