From ff2649e0635fdebfb05f4fa3e67d4c04394db9b1 Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Sat, 24 Jan 2026 17:07:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20fix=20=E5=9B=BD=E9=99=85=E5=87=BA?= =?UTF-8?q?=E6=B8=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 1 - .../lukouguoji/module_base/bean/GjcUldUseBean.kt | 4 ++-- .../gjc/viewModel/GjcBoxWeighingAddViewModel.kt | 14 ++++++-------- .../res/layout/activity_gjc_box_weighing_add.xml | 6 +++--- .../layout/activity_gjc_box_weighing_details.xml | 14 ++------------ .../res/layout/activity_int_exp_out_handover.xml | 2 +- .../src/main/res/layout/item_gjc_query_storage.xml | 2 +- 7 files changed, 15 insertions(+), 28 deletions(-) diff --git a/gradle.properties b/gradle.properties index 89c22a0..855846c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,6 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -org.gradle.java.home=/Users/kid/.version-fox/cache/java/v-17.0.16+8-amzn/java-17.0.16+8-amzn kapt.use.worker.api=false kapt.include.compile.classpath=false # When configured, Gradle will run in incubating parallel mode. diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt index fdb99ed..ef6222e 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt @@ -53,8 +53,8 @@ class GjcUldUseBean { var height: String = "" // 高度 var passageway: String = "" // 通道号 var passagewayName: String = "" // 通道号(中文) - var piClose: String = "" // 探板/收口 - var piCloseSize: String = "" // 探板尺寸(CM) + var plClose: String = "" // 探板/收口 + var plCloseSize: String = "" // 探板尺寸(CM) var location: String = "" // 位置 var pieces: String = "" // 件数(字符串格式) var remark: String = "" // 备注 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt index 950113a..a2ce121 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt @@ -10,7 +10,6 @@ import com.lukouguoji.module_base.base.BaseViewModel import com.lukouguoji.module_base.bean.GjcUldUseBean import com.lukouguoji.module_base.common.Constant import com.lukouguoji.module_base.common.ConstantEvent -import com.lukouguoji.module_base.http.net.DiBangWeightModel import com.lukouguoji.module_base.http.net.NetApply import com.lukouguoji.module_base.impl.FlowBus import com.lukouguoji.module_base.ktx.formatDate @@ -24,7 +23,6 @@ import com.lukouguoji.module_base.ktx.verifyNullOrEmpty import com.lukouguoji.module_base.model.BluetoothDialogModel import com.lukouguoji.module_base.model.ScanModel import com.lukouguoji.module_base.util.Common -import com.lukouguoji.module_base.util.DictUtils import com.lukouguoji.module_base.util.PrinterUtils import dev.utils.app.info.KeyValue import kotlinx.coroutines.launch @@ -62,7 +60,7 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() { // 下拉选择数据源 val passagewayList = MutableLiveData>() // 通道号列表 - val piCloseList = MutableLiveData>() // 探板收口列表 + val plCloseList = MutableLiveData>() // 探板收口列表 // 打印挂签 val printTag = MutableLiveData(false) @@ -108,7 +106,7 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() { // 加载下拉列表数据 loadPassagewayList() - loadPiCloseList() + loadPlCloseList() // 初始化航班日期为今天 val today = Date().formatDate() @@ -207,14 +205,14 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() { /** * 加载探板收口列表 */ - private fun loadPiCloseList() { + private fun loadPlCloseList() { launchCollect({ NetApply.api.getDictList("PICLOSE") }) { onSuccess = { // 将 DictIdValueBean 转换为 KeyValue // 显示和提交都使用 value 字段 - piCloseList.value = (it.data ?: emptyList()).map { b -> + plCloseList.value = (it.data ?: emptyList()).map { b -> KeyValue(b.value, b.value) } } @@ -335,8 +333,8 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() { "dgrCode" to bean.dgrCode, "boardType" to bean.boardType, "height" to bean.height, - "piClose" to bean.piClose, - "piCloseSize" to bean.piCloseSize, + "plClose" to bean.plClose, + "plCloseSize" to bean.plCloseSize, "carWeight" to bean.carWeight, "uldWeight" to bean.uldWeight, "fdate" to bean.fdate, diff --git a/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml b/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml index c0bd130..b4588fa 100644 --- a/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml +++ b/module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml @@ -226,11 +226,11 @@ @@ -240,7 +240,7 @@ title='@{"探板尺寸"}' titleLength="@{5}" type="@{DataLayoutType.INPUT}" - value='@={viewModel.dataBean.piCloseSize}' + value='@={viewModel.dataBean.plCloseSize}' android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="15dp" diff --git a/module_gjc/src/main/res/layout/activity_gjc_box_weighing_details.xml b/module_gjc/src/main/res/layout/activity_gjc_box_weighing_details.xml index 617126b..ebdadf5 100644 --- a/module_gjc/src/main/res/layout/activity_gjc_box_weighing_details.xml +++ b/module_gjc/src/main/res/layout/activity_gjc_box_weighing_details.xml @@ -163,7 +163,7 @@ title='@{"探板收口"}' titleLength="@{5}" type="@{DataLayoutType.INPUT}" - value='@{viewModel.dataBean.piClose}' + value='@{viewModel.dataBean.plClose}' android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" /> @@ -173,7 +173,7 @@ title='@{"探板尺寸"}' titleLength="@{5}" type="@{DataLayoutType.INPUT}" - value='@{viewModel.dataBean.piCloseSize}' + value='@{viewModel.dataBean.plCloseSize}' android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" /> @@ -236,16 +236,6 @@ android:layout_marginTop="10dp" android:orientation="horizontal"> - - + android:text="配运" />