diff --git a/.vfox/sdks/java b/.vfox/sdks/java index ee5ec11..66eae31 120000 --- a/.vfox/sdks/java +++ b/.vfox/sdks/java @@ -1 +1 @@ -/Users/kid/.version-fox/cache/java/v-17+35-amzn/java-17+35-amzn \ No newline at end of file +/Users/kid/.vfox/cache/java/v-17+35-amzn/java-17+35-amzn \ No newline at end of file diff --git a/app/src/main/java/com/lukouguoji/aerologic/page/flight/query/list/FlightQueryListViewModel.kt b/app/src/main/java/com/lukouguoji/aerologic/page/flight/query/list/FlightQueryListViewModel.kt index e73d1a7..0e158e1 100644 --- a/app/src/main/java/com/lukouguoji/aerologic/page/flight/query/list/FlightQueryListViewModel.kt +++ b/app/src/main/java/com/lukouguoji/aerologic/page/flight/query/list/FlightQueryListViewModel.kt @@ -24,7 +24,7 @@ class FlightQueryListViewModel : BasePageViewModel() { val serviceType = MutableLiveData("") val addressTypeList = MutableLiveData(listOf(KeyValue("全部", ""))).apply { - DictUtils.getAreaTypeList { + DictUtils.getCountryTypeList { value = it } } diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/IntImpPickUpDLVBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/IntImpPickUpDLVBean.kt index 96bab66..c51e8bc 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/IntImpPickUpDLVBean.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/IntImpPickUpDLVBean.kt @@ -23,6 +23,7 @@ class IntImpPickUpDLVBean : Serializable { var cashWeight: Double = 0.0 // 计费重量 var pkId: String = "" // 提货编号(提货单号) var location: String = "" // 库位 + var locationInStore: String = "" // 入库库位 var chargeTime: String = "" // 缴费时间(提取时间) var dlvTime: String = "" // 出库时间 var goods: String = "" // 品名 diff --git a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt index c68dc45..4f18e5e 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt @@ -300,7 +300,7 @@ interface Api { * 获取地区类型 */ @POST("typeCode/countryType") - suspend fun getAreaTypeList(): DictListBean + suspend fun getCountryTypeList(): DictListBean /** * 获取国家代码 diff --git a/module_base/src/main/java/com/lukouguoji/module_base/util/DictUtils.kt b/module_base/src/main/java/com/lukouguoji/module_base/util/DictUtils.kt index b713a41..f83375b 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/util/DictUtils.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/util/DictUtils.kt @@ -457,14 +457,14 @@ object DictUtils { /** * 地区类型 */ - fun getAreaTypeList( + fun getCountryTypeList( addAll: Boolean = true, checkedValue: String? = null, callBack: (List) -> Unit ) { launchCollect({ NetApply.api - .getAreaTypeList() + .getCountryTypeList() }) { onSuccess = { handleCallBack(it, checkedValue, addAll, callBack) diff --git a/module_gjj/src/main/res/layout/activity_int_imp_loading_list_edit.xml b/module_gjj/src/main/res/layout/activity_int_imp_loading_list_edit.xml index 7eb4d01..9603ed5 100644 --- a/module_gjj/src/main/res/layout/activity_int_imp_loading_list_edit.xml +++ b/module_gjj/src/main/res/layout/activity_int_imp_loading_list_edit.xml @@ -106,12 +106,11 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - enable="@{true}" - hint='@{"请输入库位号"}' + enable="@{false}" title='@{"库位号"}' titleLength="@{5}" type="@{DataLayoutType.INPUT}" - value='@={viewModel.location}' /> + value='@{viewModel.location}' /> diff --git a/module_gjj/src/main/res/layout/item_int_imp_loading_list.xml b/module_gjj/src/main/res/layout/item_int_imp_loading_list.xml index 5cb31a8..d7e3aaa 100644 --- a/module_gjj/src/main/res/layout/item_int_imp_loading_list.xml +++ b/module_gjj/src/main/res/layout/item_int_imp_loading_list.xml @@ -124,7 +124,7 @@ diff --git a/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml b/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml index a76c1e3..0f28deb 100644 --- a/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml +++ b/module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml @@ -205,7 +205,7 @@ diff --git a/module_hangban/src/main/java/com/lukouguoji/hangban/page/query/list/HbQueryListViewModel.kt b/module_hangban/src/main/java/com/lukouguoji/hangban/page/query/list/HbQueryListViewModel.kt index 2d31712..a7b0192 100644 --- a/module_hangban/src/main/java/com/lukouguoji/hangban/page/query/list/HbQueryListViewModel.kt +++ b/module_hangban/src/main/java/com/lukouguoji/hangban/page/query/list/HbQueryListViewModel.kt @@ -26,7 +26,7 @@ class HbQueryListViewModel : BasePageViewModel() { val serviceType = MutableLiveData("") val addressTypeList = MutableLiveData(listOf(KeyValue("全部", ""))).apply { - DictUtils.getAreaTypeList { + DictUtils.getCountryTypeList { value = it } }