diff --git a/module_base/src/main/java/com/lukouguoji/module_base/ui/weight/search/layout/SearchLayoutKtx.kt b/module_base/src/main/java/com/lukouguoji/module_base/ui/weight/search/layout/SearchLayoutKtx.kt
index 9c77c31..2b5193a 100644
--- a/module_base/src/main/java/com/lukouguoji/module_base/ui/weight/search/layout/SearchLayoutKtx.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/ui/weight/search/layout/SearchLayoutKtx.kt
@@ -8,6 +8,7 @@ import androidx.core.widget.doOnTextChanged
 import androidx.databinding.BindingAdapter
 import androidx.databinding.InverseBindingAdapter
 import androidx.databinding.InverseBindingListener
+import com.lukouguoji.module_base.ktx.UpperCaseAlphanumericInputFilter
 import dev.utils.app.EditTextUtils
 import dev.utils.app.info.KeyValue
 
@@ -288,4 +289,30 @@ fun setSearchLayoutNewInputWaybill(layout: PadSearchLayoutNew, isWaybill: Boolea
             }
         }
     }
+}
+
+///////////////////////////////////////////////////////////////////////////
+// 大写字母+数字输入限制 BindingAdapter
+///////////////////////////////////////////////////////////////////////////
+
+/**
+ * 为PadSearchLayout设置大写字母+数字输入限制
+ * 自动转换小写为大写，过滤中文、特殊符号、空格
+ */
+@BindingAdapter("setUpperCaseAlphanumeric", requireAll = false)
+fun setUpperCaseAlphanumeric(layout: PadSearchLayout, enabled: Boolean) {
+    if (enabled) {
+        layout.et.filters = arrayOf(UpperCaseAlphanumericInputFilter())
+    }
+}
+
+/**
+ * 为PadSearchLayoutNew设置大写字母+数字输入限制
+ * 自动转换小写为大写，过滤中文、特殊符号、空格
+ */
+@BindingAdapter("setUpperCaseAlphanumeric", requireAll = false)
+fun setSearchLayoutNewUpperCaseAlphanumeric(layout: PadSearchLayoutNew, enabled: Boolean) {
+    if (enabled) {
+        layout.et.filters = arrayOf(UpperCaseAlphanumericInputFilter())
+    }
 }
\ No newline at end of file
diff --git a/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml b/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml
index 7858dce..d981801 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_box_weighing.xml
@@ -46,7 +46,8 @@
                 android:layout_weight="1"
                 hint='@{"请输入航班号"}'
                 type="@{SearchLayoutType.INPUT}"
-                value="@={viewModel.flightNo}" />
+                value="@={viewModel.flightNo}"
+                setUpperCaseAlphanumeric="@{true}" />
 
             <!-- 目的站 -->
             <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml
index b245fcd..813d67f 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_list.xml
@@ -44,6 +44,7 @@
                 hint='@{"请输入航班号"}'
                 type="@{SearchLayoutType.INPUT}"
                 value="@={viewModel.flightNo}"
+                setUpperCaseAlphanumeric="@{true}"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1" />
diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_record_list.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_record_list.xml
index 45cbe51..8a413e3 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_weighing_record_list.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_record_list.xml
@@ -46,7 +46,8 @@
                 android:layout_weight="1"
                 hint='@{"请输入航班号"}'
                 type="@{SearchLayoutType.INPUT}"
-                value="@={viewModel.flightNo}" />
+                value="@={viewModel.flightNo}"
+                setUpperCaseAlphanumeric="@{true}" />
 
             <!-- 择代理 -->
             <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
diff --git a/module_gjc/src/main/res/layout/activity_int_exp_assemble.xml b/module_gjc/src/main/res/layout/activity_int_exp_assemble.xml
index cba37be..c938cb9 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_assemble.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_assemble.xml
@@ -46,7 +46,8 @@
                 android:layout_weight="1"
                 hint='@{"请输入航班号"}'
                 type="@{SearchLayoutType.INPUT}"
-                value="@={viewModel.flightNo}" />
+                value="@={viewModel.flightNo}"
+                setUpperCaseAlphanumeric="@{true}" />
 
             <!-- ULD编号 -->
             <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout