From 672c8308b81bd1b40f479064b029d74587607e48 Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Sat, 17 Jan 2026 18:53:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E5=87=BA=E6=B8=AF=20?=
 =?UTF-8?q?=E6=9D=BF=E7=AE=B1=E8=BF=87=E7=A3=85=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../viewModel/GjcBoxWeighingAddViewModel.kt   | 16 +++++++++++-----
 .../layout/activity_gjc_box_weighing_add.xml  | 19 ++++---------------
 2 files changed, 15 insertions(+), 20 deletions(-)

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 861143c..33b85e9 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
@@ -205,11 +205,17 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() {
      * 加载探板收口列表
      */
     private fun loadPiCloseList() {
-        // 探板收口选项（是/否）
-        piCloseList.value = listOf(
-            KeyValue("1", "是"),
-            KeyValue("0", "否")
-        )
+        launchCollect({
+            NetApply.api.getDictList("PICLOSE")
+        }) {
+            onSuccess = {
+                // 将 DictIdValueBean 转换为 KeyValue
+                // 显示和提交都使用 value 字段
+                piCloseList.value = (it.data ?: emptyList()).map { b ->
+                    KeyValue(b.value, b.value)
+                }
+            }
+        }
     }
 
     /**
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 0d51b05..c0bd130 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
@@ -75,6 +75,7 @@
                                     titleLength="@{5}"
                                     type="@{DataLayoutType.SPINNER}"
                                     value='@={viewModel.channel}'
+                                    required="@{true}"
                                     android:layout_width="0dp"
                                     android:layout_height="wrap_content"
                                     android:layout_marginStart="15dp"
@@ -342,33 +343,21 @@
 
                     </LinearLayout>
 
-                    <!-- 第7行：件数、备注、空 -->
+                    <!-- 第7行：备注 -->
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         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
                             hint='@{"请输入备注"}'
                             title='@{"备注"}'
                             titleLength="@{5}"
                             type="@{DataLayoutType.INPUT}"
                             value='@={viewModel.dataBean.remark}'
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="15dp"
-                            android:layout_weight="2" />
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
 
                     </LinearLayout>