From ea7e7b4bc1cfbcc042aba869bc23be833b80dcd6 Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Fri, 21 Nov 2025 14:09:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9D=BF=E7=AE=B1=E8=BF=87=E7=A3=85=20?=
 =?UTF-8?q?v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/drawable/bg_data_layout_s.xml    |  1 +
 .../layout/activity_gjc_box_weighing_add.xml  | 24 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/module_base/src/main/res/drawable/bg_data_layout_s.xml b/module_base/src/main/res/drawable/bg_data_layout_s.xml
index 7d1eb61..5cfc857 100644
--- a/module_base/src/main/res/drawable/bg_data_layout_s.xml
+++ b/module_base/src/main/res/drawable/bg_data_layout_s.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/white"/>
+    <stroke android:width="1dp" android:color="#DDDDDD"/>
     <corners android:radius="4dp"/>
 </shape>
\ No newline at end of file
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 7f29698..453ebc3 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
@@ -55,6 +55,7 @@
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
+                                hint='@{"请输入架子车号"}'
                                 title='@{"架子车号："}'
                                 titleLength="@{5}"
                                 type="@{DataLayoutType.INPUT}"
@@ -65,9 +66,11 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="15dp"
                                 android:layout_weight="1"
+                                hint='@{"请选择通道号"}'
+                                list="@{viewModel.passagewayList}"
                                 title='@{"通道号："}'
                                 titleLength="@{4}"
-                                type="@{DataLayoutType.INPUT}"
+                                type="@{DataLayoutType.SPINNER}"
                                 value='@={viewModel.channel}' />
 
                         </LinearLayout>
@@ -83,6 +86,7 @@
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
+                                hint='@{"请输入ULD编号"}'
                                 title='@{"ULD编号："}'
                                 titleLength="@{6}"
                                 type="@{DataLayoutType.INPUT}"
@@ -93,6 +97,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="15dp"
                                 android:layout_weight="1"
+                                hint='@{"请输入IMP代码"}'
                                 title='@{"IMP代码："}'
                                 titleLength="@{6}"
                                 type="@{DataLayoutType.INPUT}"
@@ -126,7 +131,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:background="@drawable/bg_shouyun_dbzl"
-                            android:minHeight="120dp"
+                            android:minHeight="150dp"
                             android:padding="20dp">
 
                             <TextView
@@ -136,7 +141,7 @@
                                 android:layout_centerInParent="true"
                                 android:text="@{viewModel.totalWeight}"
                                 android:textColor="@color/text_red"
-                                android:textSize="50sp"
+                                android:textSize="45sp"
                                 android:textStyle="bold"
                                 tools:text="1655" />
 
@@ -148,7 +153,7 @@
                                 android:layout_toEndOf="@id/tvWeight"
                                 android:text="kg"
                                 android:textColor="@color/black"
-                                android:textSize="20sp" />
+                                android:textSize="18sp" />
 
                         </RelativeLayout>
 
@@ -167,6 +172,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        hint='@{"请输入板型"}'
                         title='@{"板型："}'
                         titleLength="@{3}"
                         type="@{DataLayoutType.INPUT}"
@@ -177,6 +183,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="15dp"
                         android:layout_weight="1"
+                        hint='@{"请输入高度"}'
                         title='@{"高度："}'
                         titleLength="@{3}"
                         type="@{DataLayoutType.INPUT}"
@@ -206,9 +213,11 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        hint='@{"请选择探板收口"}'
+                        list="@{viewModel.piCloseList}"
                         title='@{"探板收口："}'
                         titleLength="@{5}"
-                        type="@{DataLayoutType.INPUT}"
+                        type="@{DataLayoutType.SPINNER}"
                         value='@={viewModel.dataBean.piClose}' />
 
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayout
@@ -216,6 +225,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="15dp"
                         android:layout_weight="1"
+                        hint='@{"请输入探板尺寸"}'
                         title='@{"探板尺寸："}'
                         titleLength="@{5}"
                         type="@{DataLayoutType.INPUT}"
@@ -296,6 +306,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="15dp"
                         android:layout_weight="1"
+                        hint='@{"请输入航班号"}'
                         title='@{"航班号："}'
                         titleLength="@{4}"
                         type="@{DataLayoutType.INPUT}"
@@ -306,6 +317,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="15dp"
                         android:layout_weight="1"
+                        hint='@{"请输入目的港"}'
                         title='@{"目的港："}'
                         titleLength="@{4}"
                         type="@{DataLayoutType.INPUT}"
@@ -324,6 +336,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        hint='@{"请输入件数"}'
                         title='@{"件数："}'
                         titleLength="@{3}"
                         type="@{DataLayoutType.INPUT}"
@@ -334,6 +347,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="15dp"
                         android:layout_weight="1"
+                        hint='@{"请输入备注"}'
                         title='@{"备注："}'
                         titleLength="@{3}"
                         type="@{DataLayoutType.INPUT}"