diff --git a/.claude/settings.local.json b/.claude/settings.local.json index a643f00..bfa83c6 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -42,7 +42,13 @@ "Bash(vfox list:*)", "Bash(vf list:*)", "Bash(vfox use:*)", - "Bash(wait)" + "Bash(wait)", + "Bash(while read file)", + "Bash(do sed -i '' 's/MutableLiveData\\(DateUtils\\\\.getCurrentTime\\(\\)\\\\.formatDate\\(\\)\\)/MutableLiveData\\(DateUtils.getCurrentTime\\(\\).formatDate\\(\\)\\)/g' \"$file\" echo \"Modified: $file\" done)", + "Bash(xargs sed:*)", + "Bash(while IFS= read -r file)", + "Bash(do if ! grep -q \"import com.lukouguoji.module_base.ktx.formatDate\" \"$file\")", + "Bash(then sed -i '' '/import dev.utils.common.DateUtils/a\\\\\nimport com.lukouguoji.module_base.ktx.formatDate\n' \"$file\" echo \"Added formatDate import to: $file\" fi done)" ], "deny": [], "ask": [] diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleAllocateViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleAllocateViewModel.kt index 02bdaa2..90874c1 100644 --- 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(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val destAirport = MutableLiveData("") // 目的站 val assembler = MutableLiveData("") // 组装人 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt index 1c13771..3c844d5 100644 --- 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(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val dest = MutableLiveData("") // 目的站 val carId = MutableLiveData("") // 架子车号 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcInspectionViewModel.kt index 8727a34..0612773 100644 --- 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(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val agentId = MutableLiveData("") // 代理ID val auditStatus = MutableLiveData("") // 审核状态 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt index f831c3b..c45649d 100644 --- 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(DateUtils.getCurrentTime().formatDate()) // 航班日期起 val flightDateEnd = MutableLiveData("") // 航班日期止 val agentId = MutableLiveData("") // 代理ID val outStatus = MutableLiveData("") // 出库状态 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingRecordViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingRecordViewModel.kt index a348c8d..c1fa0a3 100644 --- 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(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val agentCode = MutableLiveData("") // 代理人 val spCode = MutableLiveData("") // 特码 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt index 9811fc7..02a2c96 100644 --- 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(DateUtils.getCurrentTime().formatDate()) // 地磅集成 val diBangModel = DiBangWeightModel() diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingViewModel.kt index 250d50e..9fd5212 100644 --- 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(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val agentCode = MutableLiveData("") // 代理人 val spCode = MutableLiveData("") // 特码 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt index 35a1b82..1ae415c 100644 --- 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(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val waybillNo = MutableLiveData("") // 运单号 val hno = MutableLiveData("") // 分单号 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleViewModel.kt index ee5c261..ed76da4 100644 --- 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(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val uldNo = MutableLiveData("") // ULD编号 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt index 1176951..c69e0a7 100644 --- 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(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val waybillNo = MutableLiveData("") // 运单号 val houseWaybillNo = MutableLiveData("") // 分单号 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpOutHandoverViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpOutHandoverViewModel.kt index e3b9e52..23181d6 100644 --- 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(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val fdest = MutableLiveData("") // 目的站 val uldNo = MutableLiveData("") // ULD编号 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt index 770cf31..16a77cb 100644 --- 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(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val waybillNo = MutableLiveData("") // 运单号 val houseWaybillNo = MutableLiveData("") // 分单号 diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestDetailsViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestDetailsViewModel.kt index d0e6c76..36ed84d 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestDetailsViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestDetailsViewModel.kt @@ -55,7 +55,7 @@ class GjjManifestDetailsViewModel : BaseViewModel(), IGetData { val remark = MutableLiveData("") // 时间 - val date = MutableLiveData(DateUtils.getCurrentTime().formatDate()) + val date = MutableLiveData(DateUtils.getCurrentTime().formatDate()) // 业务类型 列表 diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntArrAirManifestViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntArrAirManifestViewModel.kt index 29f89dd..04026ba 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntArrAirManifestViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntArrAirManifestViewModel.kt @@ -3,6 +3,8 @@ package com.lukouguoji.gjj.viewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.lukouguoji.gjj.R +import dev.utils.common.DateUtils +import com.lukouguoji.module_base.ktx.formatDate import com.lukouguoji.gjj.holder.IntArrAirManifestViewHolder import com.lukouguoji.module_base.base.BasePageViewModel import com.lukouguoji.module_base.bean.GjjAirManifest @@ -26,7 +28,7 @@ import kotlinx.coroutines.launch class IntArrAirManifestViewModel : BasePageViewModel() { // ========== 搜索条件 ========== - val flightDate = MutableLiveData("") + val flightDate = MutableLiveData(DateUtils.getCurrentTime().formatDate()) val flightNo = MutableLiveData("") val waybillNo = MutableLiveData("") val houseNo = MutableLiveData("") // 分单号 diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt index 3393fbd..ee7b0da 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt @@ -5,6 +5,8 @@ import androidx.appcompat.app.AlertDialog import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.lukouguoji.gjj.R +import dev.utils.common.DateUtils +import com.lukouguoji.module_base.ktx.formatDate import com.lukouguoji.gjj.activity.GjjManifestAddActivity import com.lukouguoji.gjj.holder.IntImpManifestViewHolder import com.lukouguoji.module_base.base.BasePageViewModel @@ -28,7 +30,7 @@ import kotlinx.coroutines.launch class IntImpManifestViewModel : BasePageViewModel() { // ========== 搜索条件 ========== - val flightDate = MutableLiveData("") // 航班日期 + val flightDate = MutableLiveData(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val fdep = MutableLiveData("") // 始发站 val waybillNo = MutableLiveData("") // 运单号 diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpMsgParseViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpMsgParseViewModel.kt index 3dfb97d..907f0d7 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpMsgParseViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpMsgParseViewModel.kt @@ -3,6 +3,8 @@ package com.lukouguoji.gjj.viewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.lukouguoji.gjj.R +import dev.utils.common.DateUtils +import com.lukouguoji.module_base.ktx.formatDate import com.lukouguoji.gjj.holder.IntImpMsgParseViewHolder import com.lukouguoji.module_base.base.BasePageViewModel import com.lukouguoji.module_base.bean.MsgReceivePool @@ -21,7 +23,7 @@ import kotlinx.coroutines.launch class IntImpMsgParseViewModel : BasePageViewModel() { // ========== 搜索条件 ========== - val flightDate = MutableLiveData("") // 航班日期 + val flightDate = MutableLiveData(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val sendAddress = MutableLiveData("") // 发站(择始发站) val receiveAddress = MutableLiveData("HFE") // 收报地址(目的站) diff --git a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpTallyViewModel.kt b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpTallyViewModel.kt index 9723ec0..bd12eda 100644 --- a/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpTallyViewModel.kt +++ b/module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpTallyViewModel.kt @@ -3,6 +3,8 @@ package com.lukouguoji.gjj.viewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.lukouguoji.gjj.R +import dev.utils.common.DateUtils +import com.lukouguoji.module_base.ktx.formatDate import com.lukouguoji.gjj.holder.IntImpTallyViewHolder import com.lukouguoji.module_base.base.BasePageViewModel import com.lukouguoji.module_base.bean.GjjImportTally @@ -24,7 +26,7 @@ import kotlinx.coroutines.launch class IntImpTallyViewModel : BasePageViewModel() { // ========== 搜索条件 ========== - val flightDate = MutableLiveData("") // 航班日期 + val flightDate = MutableLiveData(DateUtils.getCurrentTime().formatDate()) // 航班日期 val flightNo = MutableLiveData("") // 航班号 val waybillNo = MutableLiveData("") // 运单号 val hno = MutableLiveData("") // 分单号