diff --git a/CLAUDE.md b/CLAUDE.md
index d224524..780bb74 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -848,5 +848,10 @@ grep -A 5 "enum class DataLayoutType" module_base/src --include="*.kt"
 ---
 
 **签名配置**: `key.jks` / 密码: `123321` / 别名: `key`
-- 后面统一使用PadDataLayoutNew 而不是PadDataLayout 控件
-- 当使用PadDataLayoutNew 控件的时候，titleLength 通常设置为5
\ No newline at end of file
+- 当使用PadDataLayoutNew 控件的时候，titleLength 通常设置为5
+- 在每个页面布局时，我会给你截图，请务必尽可能还原图片上的页面设计，而不是推测、假想。如果有困难（例如图片看不清，不明白的地方）一律要询问我，禁止自己想象。
+- layout xml 最佳布局实践参考：
+  - module_gjc/src/main/res/layout/activity_gjc_weighing_record_details.xml
+  - module_gjc/src/main/res/layout/item_gjc_check_in_record.xml
+  - module_gjc/src/main/res/layout/activity_gjc_box_weighing_details.xml
+  - module_gjc/src/main/res/layout/activity_gjc_inspection.xml
\ No newline at end of file
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/holder/GjcCheckInRecordViewHolder.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/holder/GjcCheckInRecordViewHolder.kt
index d2024cd..562247f 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/holder/GjcCheckInRecordViewHolder.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/holder/GjcCheckInRecordViewHolder.kt
@@ -1,5 +1,7 @@
 package com.lukouguoji.gjc.holder
 
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.View
 import com.lukouguoji.gjc.databinding.ItemGjcCheckInRecordBinding
 import com.lukouguoji.module_base.base.BaseViewHolder
@@ -12,6 +14,8 @@ class GjcCheckInRecordViewHolder(view: View) :
     BaseViewHolder<GjcCheckInRecord, ItemGjcCheckInRecordBinding>(view) {
 
     private var isEditMode: Boolean = false
+    private var pcTextWatcher: TextWatcher? = null
+    private var weightTextWatcher: TextWatcher? = null
 
     fun updateEditMode(editMode: Boolean) {
         this.isEditMode = editMode
@@ -23,17 +27,29 @@ class GjcCheckInRecordViewHolder(view: View) :
         binding.isEditMode = isEditMode
         binding.position = position  // 传入位置用于显示序号
 
-        // 设置refreshCallBack来捕获用户输入的变化
-        if (isEditMode) {
-            binding.padPc.refreshCallBack = {
-                val pcStr = binding.padPc.value
-                record.pc = pcStr.toLongOrNull() ?: 0L
-            }
+        // 移除旧的监听器
+        pcTextWatcher?.let { binding.etPc.removeTextChangedListener(it) }
+        weightTextWatcher?.let { binding.etWeight.removeTextChangedListener(it) }
 
-            binding.padWeight.refreshCallBack = {
-                val weightStr = binding.padWeight.value
-                record.weight = weightStr.toDoubleOrNull() ?: 0.0
+        // 在编辑模式下监听EditText输入
+        if (isEditMode) {
+            pcTextWatcher = object : TextWatcher {
+                override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+                override fun afterTextChanged(s: Editable?) {
+                    record.pc = s?.toString()?.toLongOrNull() ?: 0L
+                }
             }
+            binding.etPc.addTextChangedListener(pcTextWatcher)
+
+            weightTextWatcher = object : TextWatcher {
+                override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+                override fun afterTextChanged(s: Editable?) {
+                    record.weight = s?.toString()?.toDoubleOrNull() ?: 0.0
+                }
+            }
+            binding.etWeight.addTextChangedListener(weightTextWatcher)
         }
 
         binding.executePendingBindings()
diff --git a/module_gjc/src/main/res/drawable/bg_circle_green.xml b/module_gjc/src/main/res/drawable/bg_circle_green.xml
new file mode 100644
index 0000000..b2cf3f3
--- /dev/null
+++ b/module_gjc/src/main/res/drawable/bg_circle_green.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#7FD16E" />
+    <size
+        android:width="40dp"
+        android:height="40dp" />
+</shape>
diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_record_details.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_record_details.xml
index de2cc1d..b712db1 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_weighing_record_details.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_record_details.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
@@ -30,159 +31,202 @@
             android:orientation="horizontal"
             android:padding="15dp">
 
-            <!-- 运单号（只读） -->
-            <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+            <!-- 运单号 -->
+            <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                enable="@{false}"
-                hint='@{``}'
-                title='@{`运单号：`}'
-                titleLength="@{5}"
-                type="@{DataLayoutType.INPUT}"
-                value='@{viewModel.waybillNo}' />
+                android:orientation="horizontal">
 
-            <!-- 预配件数（只读） -->
-            <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="运单号："
+                    android:textColor="@color/text_gray"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.waybillNo}"
+                    android:textColor="@color/text_normal"
+                    android:textSize="16sp" />
+            </LinearLayout>
+
+            <!-- 预配件数 -->
+            <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
                 android:layout_weight="1"
-                enable="@{false}"
-                hint='@{``}'
-                title='@{`预配件数：`}'
-                titleLength="@{5}"
-                type="@{DataLayoutType.INPUT}"
-                value='@{viewModel.prePc}' />
+                android:orientation="horizontal">
 
-            <!-- 预配重量（只读） -->
-            <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="预配件数："
+                    android:textColor="@color/text_gray"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.prePc}"
+                    android:textColor="@color/text_normal"
+                    android:textSize="16sp" />
+            </LinearLayout>
+
+            <!-- 预配重量 -->
+            <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
                 android:layout_weight="1"
-                enable="@{false}"
-                hint='@{``}'
-                title='@{`预配重量：`}'
-                titleLength="@{5}"
-                type="@{DataLayoutType.INPUT}"
-                value='@{viewModel.preWeight}' />
+                android:orientation="horizontal">
 
-            <!-- 品名（只读） -->
-            <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="预配重量："
+                    android:textColor="@color/text_gray"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.preWeight}"
+                    android:textColor="@color/text_normal"
+                    android:textSize="16sp" />
+            </LinearLayout>
+
+            <!-- 品名(中) -->
+            <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
                 android:layout_weight="1"
-                enable="@{false}"
-                hint='@{``}'
-                title='@{`品名：`}'
-                titleLength="@{3}"
-                type="@{DataLayoutType.INPUT}"
-                value='@{viewModel.goodsName}' />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="品名(中)："
+                    android:textColor="@color/text_gray"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.goodsName}"
+                    android:textColor="@color/text_normal"
+                    android:textSize="16sp" />
+            </LinearLayout>
 
         </LinearLayout>
 
+        <!-- 称重信息标题 -->
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginBottom="10dp"
+            android:text="称重信息"
+            android:textColor="@color/text_normal"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
         <!-- 第二部分：计重记录列表 -->
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
+            tools:listitem="@layout/item_gjc_check_in_record"
             android:paddingStart="15dp"
             android:paddingEnd="15dp" />
 
         <!-- 第三部分：底部统计与按钮区域 -->
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_white_radius_8"
             android:layout_margin="15dp"
-            android:orientation="vertical"
+            android:background="@drawable/bg_white_radius_8"
             android:padding="15dp">
 
-            <!-- 统计信息行 -->
+            <!-- 统计信息（左侧） -->
             <LinearLayout
-                android:layout_width="match_parent"
+                android:id="@+id/statsLayout"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
                 android:orientation="horizontal">
 
-                <!-- 总件数（只读） -->
-                <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                    android:layout_width="0dp"
+                <!-- 总件数 -->
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    enable="@{false}"
-                    hint='@{``}'
-                    title='@{`总件数：`}'
-                    titleLength="@{4}"
-                    type="@{DataLayoutType.INPUT}"
-                    value='@{viewModel.totalPc}' />
+                    android:text="@{`总件数:` + viewModel.totalPc}"
+                    android:textColor="@color/text_gray"
+                    android:textSize="16sp" />
 
-                <!-- 总重量（只读） -->
-                <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                    android:layout_width="0dp"
+                <!-- 总重量 -->
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_weight="1"
-                    enable="@{false}"
-                    hint='@{``}'
-                    title='@{`总重量：`}'
-                    titleLength="@{4}"
-                    type="@{DataLayoutType.INPUT}"
-                    value='@{viewModel.totalWeight}' />
+                    android:layout_marginStart="20dp"
+                    android:text="@{`总重量:` + viewModel.totalWeight}"
+                    android:textColor="@color/text_gray"
+                    android:textSize="16sp" />
 
-                <!-- 重量误差（只读） -->
-                <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                    android:layout_width="0dp"
+                <!-- 重量误差（红色） -->
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_weight="1"
-                    enable="@{false}"
-                    hint='@{``}'
-                    title='@{`重量误差：`}'
-                    titleLength="@{5}"
-                    type="@{DataLayoutType.INPUT}"
-                    value='@{viewModel.weightError}' />
+                    android:layout_marginStart="20dp"
+                    android:text="@{`重量误差: ` + viewModel.weightError}"
+                    android:textColor="@color/text_red"
+                    android:textSize="16sp" />
 
             </LinearLayout>
 
-            <!-- 按钮行 -->
+            <!-- 修改按钮（只读模式，右侧） -->
+            <TextView
+                android:id="@+id/btnModify"
+                style="@style/tv_bottom_btn"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:onClick="@{() -> viewModel.onModifyClick()}"
+                android:text="修改"
+                android:visibility="@{viewModel.isEditMode ? View.GONE : View.VISIBLE}" />
+
+            <!-- 取消+保存按钮组（编辑模式，居中） -->
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:gravity="end"
-                android:orientation="horizontal">
+                android:layout_centerInParent="true"
+                android:orientation="horizontal"
+                android:visibility="@{viewModel.isEditMode ? View.VISIBLE : View.GONE}">
 
-                <!-- 修改按钮（只读模式显示） -->
-                <TextView
-                    android:id="@+id/btnModify"
-                    style="@style/tv_bottom_btn"
-                    android:onClick="@{() -> viewModel.onModifyClick()}"
-                    android:text="修改"
-                    android:visibility="@{viewModel.isEditMode ? View.GONE : View.VISIBLE}" />
-
-                <!-- 取消按钮（编辑模式显示） -->
+                <!-- 取消按钮 -->
                 <TextView
                     android:id="@+id/btnCancel"
                     style="@style/tv_bottom_btn"
                     android:layout_marginEnd="10dp"
                     android:onClick="@{() -> viewModel.onCancelClick()}"
-                    android:text="取消"
-                    android:visibility="@{viewModel.isEditMode ? View.VISIBLE : View.GONE}" />
+                    android:text="取消" />
 
-                <!-- 保存按钮（编辑模式显示） -->
+                <!-- 保存按钮 -->
                 <TextView
                     android:id="@+id/btnSave"
                     style="@style/tv_bottom_btn"
                     android:onClick="@{() -> viewModel.onSaveClick()}"
-                    android:text="保存"
-                    android:visibility="@{viewModel.isEditMode ? View.VISIBLE : View.GONE}" />
+                    android:text="保存" />
 
             </LinearLayout>
 
-        </LinearLayout>
+        </RelativeLayout>
 
     </LinearLayout>
 </layout>
diff --git a/module_gjc/src/main/res/layout/item_gjc_check_in_record.xml b/module_gjc/src/main/res/layout/item_gjc_check_in_record.xml
index ebe7f39..77fb588 100644
--- a/module_gjc/src/main/res/layout/item_gjc_check_in_record.xml
+++ b/module_gjc/src/main/res/layout/item_gjc_check_in_record.xml
@@ -3,7 +3,7 @@
 
     <data>
 
-        <import type="com.lukouguoji.module_base.ui.weight.data.layout.DataLayoutType" />
+        <import type="android.view.View" />
 
         <variable
             name="record"
@@ -23,74 +23,144 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="15dp"
         android:background="@drawable/bg_white_radius_8"
+        android:gravity="center_vertical"
         android:orientation="horizontal"
         android:padding="15dp">
 
-        <!-- 序号（只读） -->
-        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            enable="@{false}"
-            hint='@{`序号`}'
-            title='@{`序号：`}'
-            titleLength="@{4}"
-            type="@{DataLayoutType.INPUT}"
-            value='@{String.valueOf(position + 1)}' />
+        <!-- 绿色圆圈序号 -->
+        <TextView
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:background="@drawable/bg_circle_green"
+            android:gravity="center"
+            android:text="@{String.valueOf(position + 1)}"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold" />
 
-        <!-- 件数（可编辑） -->
-        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-            android:id="@+id/padPc"
+        <!-- 件数字段 -->
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_weight="1"
-            enable="@{isEditMode}"
-            hint='@{`请输入件数`}'
-            title='@{`件数：`}'
-            titleLength="@{4}"
-            type="@{DataLayoutType.INPUT}"
-            value='@{String.valueOf(record.pc)}' />
+            android:orientation="horizontal">
 
-        <!-- 重量（可编辑） -->
-        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-            android:id="@+id/padWeight"
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="件数 "
+                android:textColor="@color/text_gray"
+                android:textSize="16sp" />
+
+            <!-- 非编辑模式：TextView -->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{String.valueOf(record.pc)}"
+                android:textColor="@color/text_normal"
+                android:textSize="16sp"
+                android:visibility="@{isEditMode ? View.GONE : View.VISIBLE}" />
+
+            <!-- 编辑模式：EditText -->
+            <EditText
+                android:id="@+id/etPc"
+                android:layout_width="80dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_white_radius_8"
+                android:hint="件数"
+                android:inputType="number"
+                android:padding="8dp"
+                android:text="@{String.valueOf(record.pc)}"
+                android:textColor="@color/text_normal"
+                android:textSize="16sp"
+                android:visibility="@{isEditMode ? View.VISIBLE : View.GONE}" />
+        </LinearLayout>
+
+        <!-- 重量字段 -->
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_weight="1"
-            enable="@{isEditMode}"
-            hint='@{`请输入重量`}'
-            title='@{`重量：`}'
-            titleLength="@{4}"
-            type="@{DataLayoutType.INPUT}"
-            value='@{String.valueOf(record.weight)}' />
+            android:orientation="horizontal">
 
-        <!-- 托盘自重（只读，固定显示0） -->
-        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="重量 "
+                android:textColor="@color/text_gray"
+                android:textSize="16sp" />
+
+            <!-- 非编辑模式：TextView -->
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{String.valueOf(record.weight)}"
+                android:textColor="@color/text_normal"
+                android:textSize="16sp"
+                android:visibility="@{isEditMode ? View.GONE : View.VISIBLE}" />
+
+            <!-- 编辑模式：EditText -->
+            <EditText
+                android:id="@+id/etWeight"
+                android:layout_width="80dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_white_radius_8"
+                android:hint="重量"
+                android:inputType="numberDecimal"
+                android:padding="8dp"
+                android:text="@{String.valueOf(record.weight)}"
+                android:textColor="@color/text_normal"
+                android:textSize="16sp"
+                android:visibility="@{isEditMode ? View.VISIBLE : View.GONE}" />
+        </LinearLayout>
+
+        <!-- 托盘自重字段（只读） -->
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_weight="1"
-            enable="@{false}"
-            hint='@{``}'
-            title='@{`托盘自重：`}'
-            titleLength="@{5}"
-            type="@{DataLayoutType.INPUT}"
-            value='@{`0`}' />
+            android:orientation="horizontal">
 
-        <!-- 计重时间（只读） -->
-        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="托盘自重 "
+                android:textColor="@color/text_gray"
+                android:textSize="16sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="100"
+                android:textColor="@color/text_normal"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <!-- 计重时间字段（只读） -->
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_weight="1.5"
-            enable="@{false}"
-            hint='@{``}'
-            title='@{`计重时间：`}'
-            titleLength="@{5}"
-            type="@{DataLayoutType.INPUT}"
-            value='@{record.opDate}' />
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="计重时间 "
+                android:textColor="@color/text_gray"
+                android:textSize="16sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{record.opDate}"
+                android:textColor="@color/text_normal"
+                android:textSize="16sp" />
+        </LinearLayout>
 
     </LinearLayout>
 </layout>