eric/aerologic-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 国际出港 板箱过磅 fix

Browse Source
This commit is contained in:
杨建宽
2026-01-17 18:53:38 +08:00
parent 9a327975bd
commit 672c8308b8
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt
View File

@@ -205,11 +205,17 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() {
* 加载探板收口列表 * 加载探板收口列表
*/ */
private fun loadPiCloseList() { private fun loadPiCloseList() {
// 探板收口选项（是/否） launchCollect({
piCloseList.value = listOf( NetApply.api.getDictList("PICLOSE")
KeyValue("1", "是"), }) {
KeyValue("0", "否") onSuccess = {
) // 将 DictIdValueBean 转换为 KeyValue
// 显示和提交都使用 value 字段
piCloseList.value = (it.data ?: emptyList()).map { b ->
KeyValue(b.value, b.value)
}
}
}
} }
/** /**

19
module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml
View File

@@ -75,6 +75,7 @@
titleLength="@{5}" titleLength="@{5}"
type="@{DataLayoutType.SPINNER}" type="@{DataLayoutType.SPINNER}"
value='@={viewModel.channel}' value='@={viewModel.channel}'
required="@{true}"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
@@ -342,33 +343,21 @@
</LinearLayout> </LinearLayout>
<!-- 第7行：件数、备注、空 --> <!-- 第7行：备注 -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:orientation="horizontal"> android:orientation="horizontal">
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
hint='@{"请输入件数"}'
title='@{"件数"}'
titleLength="@{5}"
type="@{DataLayoutType.INPUT}"
value='@={viewModel.dataBean.pieces}'
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
hint='@{"请输入备注"}' hint='@{"请输入备注"}'
title='@{"备注"}' title='@{"备注"}'
titleLength="@{5}" titleLength="@{5}"
type="@{DataLayoutType.INPUT}" type="@{DataLayoutType.INPUT}"
value='@={viewModel.dataBean.remark}' value='@={viewModel.dataBean.remark}'
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:layout_marginStart="15dp"
android:layout_weight="2" />
</LinearLayout> </LinearLayout>