feat: fix issues

.vfox/sdks/java

@@ -1 +1 @@
-/Users/kid/.version-fox/cache/java/v-17+35-amzn/java-17+35-amzn
+/Users/kid/.vfox/cache/java/v-17+35-amzn/java-17+35-amzn

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
         }
     }

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 = ""               // 品名

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
 
     /**
      * 获取国家代码

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<KeyValue>) -> Unit
     ) {
         launchCollect({
             NetApply.api
-                .getAreaTypeList()
+                .getCountryTypeList()
         }) {
             onSuccess = {
                 handleCallBack(it, checkedValue, addAll, callBack)

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}' />
 
                     </LinearLayout>
 

module_gjj/src/main/res/layout/item_int_imp_loading_list.xml

@@ -124,7 +124,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@{bean.ref}"
+                            android:text="@{bean.locationMft}"
                             android:textColor="@color/text_normal"
                             android:textSize="16sp" />
 

module_gjj/src/main/res/layout/item_int_imp_pick_up_dlv.xml

@@ -205,7 +205,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{bean.location}"
+                        android:text="@{bean.locationInStore}"
                         android:textSize="16sp" />
 
                 </androidx.appcompat.widget.LinearLayoutCompat>

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
         }
     }