feat: fdate set now

2026-01-04 12:34:54 +08:00
parent 72a8c3107d
commit 0a27fed728
18 changed files with 54 additions and 18 deletions
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleAllocateViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleAllocateViewModel.kt
@@ -21,6 +21,8 @@ import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.util.CheckUtil
 import dev.utils.app.info.KeyValue
+import dev.utils.common.DateUtils
+import com.lukouguoji.module_base.ktx.formatDate
 import kotlinx.coroutines.launch

 /**
@@ -29,7 +31,7 @@ import kotlinx.coroutines.launch
 class GjcAssembleAllocateViewModel : BasePageViewModel() {

    // 搜索条件
-    val flightDate = MutableLiveData("")           // 航班日期
+    val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())           // 航班日期
    val flightNo = MutableLiveData("")             // 航班号
    val destAirport = MutableLiveData("")          // 目的站
    val assembler = MutableLiveData("")            // 组装人
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt
@@ -12,6 +12,8 @@ import com.lukouguoji.module_base.ktx.launchCollect
 import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
+import dev.utils.common.DateUtils
+import com.lukouguoji.module_base.ktx.formatDate

 /**
 * 国际出港板箱过磅 ViewModel
@@ -19,7 +21,7 @@ import com.lukouguoji.module_base.model.ScanModel
 class GjcBoxWeighingViewModel : BasePageViewModel() {

    // 搜索条件
-    val flightDate = MutableLiveData("")           // 航班日期
+    val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())           // 航班日期
    val flightNo = MutableLiveData("")             // 航班号
    val dest = MutableLiveData("")                 // 目的站
    val carId = MutableLiveData("")                // 架子车号
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionViewModel.kt
@@ -25,6 +25,7 @@ import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
 import com.lukouguoji.module_base.util.CheckUtil
 import dev.utils.app.info.KeyValue
+import dev.utils.common.DateUtils
 import kotlinx.coroutines.launch
 import java.util.Date

@@ -34,7 +35,7 @@ import java.util.Date
 class GjcInspectionViewModel : BasePageViewModel() {

    // 搜索条件
-    val flightDate = MutableLiveData("")           // 航班日期
+    val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())           // 航班日期
    val flightNo = MutableLiveData("")             // 航班号
    val agentId = MutableLiveData("")              // 代理ID
    val auditStatus = MutableLiveData("")          // 审核状态
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt
@@ -15,6 +15,8 @@ import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
 import dev.utils.app.info.KeyValue
+import dev.utils.common.DateUtils
+import com.lukouguoji.module_base.ktx.formatDate

 /**
 * 国际出港查询ViewModel
@@ -22,7 +24,7 @@ import dev.utils.app.info.KeyValue
 class GjcQueryViewModel : BasePageViewModel() {

    // ==================== 搜索条件 ====================
-    val flightDateStart = MutableLiveData("")     // 航班日期起
+    val flightDateStart = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())     // 航班日期起
    val flightDateEnd = MutableLiveData("")       // 航班日期止
    val agentId = MutableLiveData("")             // 代理ID
    val outStatus = MutableLiveData("")           // 出库状态
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingRecordViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingRecordViewModel.kt
@@ -14,6 +14,8 @@ import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
 import com.lukouguoji.module_base.util.DictUtils
 import dev.utils.app.info.KeyValue
+import dev.utils.common.DateUtils
+import com.lukouguoji.module_base.ktx.formatDate

 /**
 * 国际出港计重记录 ViewModel
@@ -21,7 +23,7 @@ import dev.utils.app.info.KeyValue
 class GjcWeighingRecordViewModel : BasePageViewModel() {

    // 搜索条件
-    val flightDate = MutableLiveData("")           // 航班日期
+    val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())           // 航班日期
    val flightNo = MutableLiveData("")             // 航班号
    val agentCode = MutableLiveData("")            // 代理人
    val spCode = MutableLiveData("")               // 特码
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt
@@ -26,6 +26,7 @@ import com.lukouguoji.module_base.model.ScanModel
 import com.lukouguoji.module_base.util.Common
 import com.lukouguoji.module_base.util.DictUtils
 import dev.utils.app.info.KeyValue
+import dev.utils.common.DateUtils
 import kotlinx.coroutines.launch
 import java.util.Calendar
 import java.util.Date
@@ -42,7 +43,7 @@ class GjcWeighingStartViewModel : BaseViewModel() {
    val maWbBean = MutableLiveData(GjcMaWb())

    // 航班日期（格式化为字符串用于DataBinding）
-    val flightDate = MutableLiveData("")
+    val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())

    // 地磅集成
    val diBangModel = DiBangWeightModel()
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt
@@ -12,11 +12,13 @@ import com.lukouguoji.module_base.common.Constant
 import com.lukouguoji.module_base.http.net.NetApply
 import com.lukouguoji.module_base.ktx.launchCollect
 import com.lukouguoji.module_base.ktx.launchLoadingCollect
+import com.lukouguoji.module_base.ktx.formatDate
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
 import com.lukouguoji.module_base.util.DictUtils
 import dev.utils.app.info.KeyValue
+import dev.utils.common.DateUtils

 /**
 * 国际出港计重 ViewModel
@@ -24,7 +26,7 @@ import dev.utils.app.info.KeyValue
 class GjcWeighingViewModel : BasePageViewModel() {

    // 搜索条件
-    val flightDate = MutableLiveData("")           // 航班日期
+    val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())           // 航班日期
    val flightNo = MutableLiveData("")             // 航班号
    val agentCode = MutableLiveData("")            // 代理人
    val spCode = MutableLiveData("")               // 特码
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt
@@ -18,6 +18,8 @@ import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
+import dev.utils.common.DateUtils
+import com.lukouguoji.module_base.ktx.formatDate
 import kotlinx.coroutines.launch

 /**
@@ -26,7 +28,7 @@ import kotlinx.coroutines.launch
 class IntExpArriveViewModel : BasePageViewModel() {

    // ========== 搜索条件 ==========
-    val flightDate = MutableLiveData("")        // 航班日期
+    val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())        // 航班日期
    val flightNo = MutableLiveData("")          // 航班号
    val waybillNo = MutableLiveData("")         // 运单号
    val hno = MutableLiveData("")               // 分单号
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleViewModel.kt
@@ -19,6 +19,8 @@ import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.ktx.verifyNullOrEmpty
 import com.lukouguoji.module_base.router.ARouterConstants
 import dev.utils.app.info.KeyValue
+import dev.utils.common.DateUtils
+import com.lukouguoji.module_base.ktx.formatDate
 import kotlinx.coroutines.launch

 /**
@@ -27,7 +29,7 @@ import kotlinx.coroutines.launch
 class IntExpAssembleViewModel : BasePageViewModel() {

    // ========== 搜索条件 ==========
-    val flightDate = MutableLiveData("")        // 航班日期
+    val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())        // 航班日期
    val flightNo = MutableLiveData("")          // 航班号
    val uldNo = MutableLiveData("")             // ULD编号

--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt
@@ -20,6 +20,8 @@ import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
 import dev.utils.app.info.KeyValue
+import dev.utils.common.DateUtils
+import com.lukouguoji.module_base.ktx.formatDate
 import kotlinx.coroutines.launch

 /**
@@ -28,7 +30,7 @@ import kotlinx.coroutines.launch
 class IntExpLoadViewModel : BasePageViewModel() {

    // ========== 搜索条件 ==========
-    val flightDate = MutableLiveData("")        // 航班日期
+    val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())        // 航班日期
    val flightNo = MutableLiveData("")          // 航班号
    val waybillNo = MutableLiveData("")         // 运单号
    val houseWaybillNo = MutableLiveData("")    // 分单号
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpOutHandoverViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpOutHandoverViewModel.kt
@@ -17,6 +17,8 @@ import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
+import dev.utils.common.DateUtils
+import com.lukouguoji.module_base.ktx.formatDate
 import kotlinx.coroutines.launch

 /**
@@ -25,7 +27,7 @@ import kotlinx.coroutines.launch
 class IntExpOutHandoverViewModel : BasePageViewModel() {

    // ========== 搜索条件 ==========
-    val flightDate = MutableLiveData("")        // 航班日期
+    val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())        // 航班日期
    val flightNo = MutableLiveData("")          // 航班号
    val fdest = MutableLiveData("")             // 目的站
    val uldNo = MutableLiveData("")             // ULD编号
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt
@@ -19,6 +19,8 @@ import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
+import dev.utils.common.DateUtils
+import com.lukouguoji.module_base.ktx.formatDate
 import kotlinx.coroutines.launch

 /**
@@ -27,7 +29,7 @@ import kotlinx.coroutines.launch
 class IntExpTallyViewModel : BasePageViewModel() {

    // ========== 搜索条件 ==========
-    val flightDate = MutableLiveData("")        // 航班日期
+    val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())        // 航班日期
    val flightNo = MutableLiveData("")          // 航班号
    val waybillNo = MutableLiveData("")         // 运单号
    val houseWaybillNo = MutableLiveData("")    // 分单号