feat: 板箱过磅列表筛选项目的站改为过磅状态
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -138,7 +138,8 @@
|
|||||||
"Bash(sed -i '' '/@Deprecated\\(\"旧版国内出港收运开始,使用 GncShouYunUnListActivity 替代\"\\)/d' /Users/kid/Development/Fusion/Projects/aerologic-app/module_gnc/src/main/java/com/lukouguoji/gnc/activity/GoutStartCotActivity.kt)",
|
"Bash(sed -i '' '/@Deprecated\\(\"旧版国内出港收运开始,使用 GncShouYunUnListActivity 替代\"\\)/d' /Users/kid/Development/Fusion/Projects/aerologic-app/module_gnc/src/main/java/com/lukouguoji/gnc/activity/GoutStartCotActivity.kt)",
|
||||||
"Bash(cp \"/Users/kid/Downloads/Desktop/进港舱单.png\" /Users/kid/Development/Fusion/Projects/aerologic-app/module_gjj/src/main/res/mipmap-mdpi/gjj_jin_gang_cang_dan_icon.png)",
|
"Bash(cp \"/Users/kid/Downloads/Desktop/进港舱单.png\" /Users/kid/Development/Fusion/Projects/aerologic-app/module_gjj/src/main/res/mipmap-mdpi/gjj_jin_gang_cang_dan_icon.png)",
|
||||||
"Bash(cp \"/Users/kid/Downloads/Desktop/原始舱单.png\" /Users/kid/Development/Fusion/Projects/aerologic-app/module_gjj/src/main/res/mipmap-mdpi/gjj_yuan_shi_cang_dan_icon.png)",
|
"Bash(cp \"/Users/kid/Downloads/Desktop/原始舱单.png\" /Users/kid/Development/Fusion/Projects/aerologic-app/module_gjj/src/main/res/mipmap-mdpi/gjj_yuan_shi_cang_dan_icon.png)",
|
||||||
"Bash(cp \"/Users/kid/Downloads/Desktop/提取记录.png\" /Users/kid/Development/Fusion/Projects/aerologic-app/module_gjj/src/main/res/mipmap-mdpi/gjj_ti_qu_ji_lu_icon.png)"
|
"Bash(cp \"/Users/kid/Downloads/Desktop/提取记录.png\" /Users/kid/Development/Fusion/Projects/aerologic-app/module_gjj/src/main/res/mipmap-mdpi/gjj_ti_qu_ji_lu_icon.png)",
|
||||||
|
"mcp__api-doc__get_project_overview"
|
||||||
],
|
],
|
||||||
"deny": [],
|
"deny": [],
|
||||||
"ask": []
|
"ask": []
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import com.lukouguoji.module_base.ktx.toRequestBody
|
|||||||
import com.lukouguoji.module_base.model.BluetoothDialogModel
|
import com.lukouguoji.module_base.model.BluetoothDialogModel
|
||||||
import com.lukouguoji.module_base.model.ScanModel
|
import com.lukouguoji.module_base.model.ScanModel
|
||||||
import com.lukouguoji.module_base.util.PrinterUtils
|
import com.lukouguoji.module_base.util.PrinterUtils
|
||||||
|
import dev.utils.app.info.KeyValue
|
||||||
import dev.utils.common.DateUtils
|
import dev.utils.common.DateUtils
|
||||||
import com.lukouguoji.module_base.ktx.formatDate
|
import com.lukouguoji.module_base.ktx.formatDate
|
||||||
|
|
||||||
@@ -28,7 +29,14 @@ class GjcBoxWeighingViewModel : BasePageViewModel() {
|
|||||||
// 搜索条件
|
// 搜索条件
|
||||||
val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate()) // 航班日期
|
val flightDate = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate()) // 航班日期
|
||||||
val flightNo = MutableLiveData("") // 航班号
|
val flightNo = MutableLiveData("") // 航班号
|
||||||
val dest = MutableLiveData("") // 目的站
|
val wtStatus = MutableLiveData("") // 过磅状态(""=全部 / "0"=未过磅 / "1"=已过磅)
|
||||||
|
val wtStatusList = MutableLiveData( // 过磅状态选项
|
||||||
|
listOf(
|
||||||
|
KeyValue("全部", ""),
|
||||||
|
KeyValue("未过磅", "0"),
|
||||||
|
KeyValue("已过磅", "1")
|
||||||
|
)
|
||||||
|
)
|
||||||
val carId = MutableLiveData("") // 架子车号
|
val carId = MutableLiveData("") // 架子车号
|
||||||
val uld = MutableLiveData("") // ULD编号
|
val uld = MutableLiveData("") // ULD编号
|
||||||
|
|
||||||
@@ -111,7 +119,7 @@ class GjcBoxWeighingViewModel : BasePageViewModel() {
|
|||||||
"pageSize" to pageModel.limit,
|
"pageSize" to pageModel.limit,
|
||||||
"fdate" to flightDate.value!!.ifEmpty { null },
|
"fdate" to flightDate.value!!.ifEmpty { null },
|
||||||
"fno" to flightNo.value!!.ifEmpty { null },
|
"fno" to flightNo.value!!.ifEmpty { null },
|
||||||
"fdest" to dest.value!!.ifEmpty { null },
|
"wtStatus" to wtStatus.value!!.ifEmpty { null },
|
||||||
"carId" to carId.value!!.ifEmpty { null },
|
"carId" to carId.value!!.ifEmpty { null },
|
||||||
"uld" to uld.value!!.ifEmpty { null },
|
"uld" to uld.value!!.ifEmpty { null },
|
||||||
).toRequestBody()
|
).toRequestBody()
|
||||||
@@ -120,7 +128,7 @@ class GjcBoxWeighingViewModel : BasePageViewModel() {
|
|||||||
val totalParams = mapOf(
|
val totalParams = mapOf(
|
||||||
"fdate" to flightDate.value!!.ifEmpty { null },
|
"fdate" to flightDate.value!!.ifEmpty { null },
|
||||||
"fno" to flightNo.value!!.ifEmpty { null },
|
"fno" to flightNo.value!!.ifEmpty { null },
|
||||||
"fdest" to dest.value!!.ifEmpty { null },
|
"wtStatus" to wtStatus.value!!.ifEmpty { null },
|
||||||
"carId" to carId.value!!.ifEmpty { null },
|
"carId" to carId.value!!.ifEmpty { null },
|
||||||
"uld" to uld.value!!.ifEmpty { null },
|
"uld" to uld.value!!.ifEmpty { null },
|
||||||
).toRequestBody()
|
).toRequestBody()
|
||||||
|
|||||||
@@ -49,14 +49,15 @@
|
|||||||
value="@={viewModel.flightNo}"
|
value="@={viewModel.flightNo}"
|
||||||
setUpperCaseAlphanumeric="@{true}" />
|
setUpperCaseAlphanumeric="@{true}" />
|
||||||
|
|
||||||
<!-- 目的站 -->
|
<!-- 过磅状态 -->
|
||||||
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
|
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
hint='@{"请输入目的站"}'
|
hint='@{"请选择过磅状态"}'
|
||||||
type="@{SearchLayoutType.INPUT}"
|
list="@{viewModel.wtStatusList}"
|
||||||
value="@={viewModel.dest}" />
|
type="@{SearchLayoutType.SPINNER}"
|
||||||
|
value="@={viewModel.wtStatus}" />
|
||||||
|
|
||||||
<!-- 架子车号 -->
|
<!-- 架子车号 -->
|
||||||
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
|
<com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
|
||||||
|
|||||||
Reference in New Issue
Block a user