feat: 国际出港开始组装新增 IMP代码、板型、BUP 输入项

- ULD 信息卡新增第二行：IMP代码（大写过滤）、板型（手输 + 下拉选择，箭头与 Spinner 同源）、BUP（否/是，默认否）
- 装货/卸货提交时 dgrCode、boardType、bupFlag 同时写入顶层参数与 useInfo，输入 ULD 后从 getUld 回填
- 板型选项走通用字典接口，字典 code 暂定 BOARDTYPE，测试环境返回为空时提示手动输入

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

app/src/main/AndroidManifest.xml

@@ -222,6 +222,12 @@
             android:configChanges="orientation|keyboardHidden"
             android:exported="false"
             android:screenOrientation="userLandscape" />
+        <!-- 国际出港-出港移库编辑/详情 -->
+        <activity
+            android:name="com.lukouguoji.gjc.page.move.IntExpMoveEditActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="false"
+            android:screenOrientation="userLandscape" />
         <activity
             android:name=".MineActivity"
             android:configChanges="orientation|keyboardHidden"

app/src/main/java/com/lukouguoji/aerologic/page/gnj/unload/add/GnjUnloadAddActivity.kt

@@ -19,7 +19,7 @@ class GnjUnloadAddActivity :
     override fun viewModelClass() = GnjUnloadAddViewModel::class.java
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国内进港开始卸机")
+        setBackArrow("进港开始卸机")
 
         binding.viewModel = viewModel
         viewModel.rv = binding.rv

app/src/main/java/com/lukouguoji/aerologic/page/gnj/unload/list/GnjUnloadListActivity.kt

@@ -24,7 +24,7 @@ class GnjUnloadListActivity :
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国内进港卸机")
+        setBackArrow("进港卸机")
         binding.viewModel = viewModel
         viewModel.pageModel.bindSmartRefreshLayout(
             binding.srl,

app/src/main/java/com/lukouguoji/aerologic/page/uld/edit/UldEditViewModel.kt

@@ -30,6 +30,14 @@ class UldEditViewModel : BaseViewModel() {
         )
     )
 
+    // 来源下拉列表
+    val sourceList = MutableLiveData<List<KeyValue>>(
+        listOf(
+            KeyValue("空运", "空运"),
+            KeyValue("陆运", "陆运"),
+        )
+    )
+
     // 所属航司下拉列表（数据源：POST /typeCode/intCarrier）
     val carrierList = MutableLiveData<List<KeyValue>>(emptyList())
 
@@ -40,7 +48,8 @@ class UldEditViewModel : BaseViewModel() {
         else if (modify) DetailsPageType.Modify else DetailsPageType.Details
 
         if (id.isEmpty()) {
-            // 新增：直接加载航司列表
+            // 新增：所在港默认 HFE，直接加载航司列表
+            uldBean.value = ULDBean(nowPort = "HFE")
             loadCarrierList(null)
         } else {
             getData()
@@ -79,7 +88,7 @@ class UldEditViewModel : BaseViewModel() {
         }) {
             onSuccess = {
                 showToast(it.msg.noNull(if (isAdd) "新增成功" else "修改成功"))
-                if (isAdd) uldBean.value = ULDBean() else getData()
+                if (isAdd) uldBean.value = ULDBean(nowPort = "HFE") else getData()
             }
         }
     }

app/src/main/res/layout/activity_uld_edit.xml

@@ -121,6 +121,49 @@
 
                     </LinearLayout>
 
+                    <!-- Row 3: 来源 / 入库时间 / 所在港 -->
+                    <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
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{viewModel.pageType != DetailsPageType.Details}"
+                            hint='@{"请选择来源"}'
+                            list="@{viewModel.sourceList}"
+                            title='@{"来源"}'
+                            titleLength="@{7}"
+                            type="@{DataLayoutType.SPINNER}"
+                            value='@={viewModel.uldBean.source}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{viewModel.pageType != DetailsPageType.Details}"
+                            hint='@{"请选择入库时间"}'
+                            title='@{"入库时间"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.DATETIME}"
+                            value='@={viewModel.uldBean.inStoreTime}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{viewModel.pageType != DetailsPageType.Details}"
+                            hint='@{"请输入所在港"}'
+                            title='@{"所在港"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.uldBean.nowPort}' />
+
+                    </LinearLayout>
+
                     <!-- 备注（全行，多行输入） -->
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         android:layout_width="match_parent"

app/src/main/res/layout/item_uld_list.xml

@@ -55,7 +55,7 @@
                             <androidx.appcompat.widget.LinearLayoutCompat
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1.5"
+                                android:layout_weight="1.0"
                                 android:gravity="center_vertical">
 
                                 <TextView
@@ -109,7 +109,7 @@
                                     android:layout_height="wrap_content"
                                     android:text="自重："
                                     android:textSize="15sp"
-                                    completeSpace="@{3}" />
+                                    completeSpace="@{4}" />
 
                                 <TextView
                                     android:layout_width="wrap_content"
@@ -165,7 +165,7 @@
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
-                        <!-- 第二行：最大载重 | 备注 -->
+                        <!-- 第二行：最大载重 | 来源 | 所在港 | 位置 | 入库时间 -->
                         <androidx.appcompat.widget.LinearLayoutCompat
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -175,7 +175,7 @@
                             <androidx.appcompat.widget.LinearLayoutCompat
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1.5"
+                                android:layout_weight="1.0"
                                 android:gravity="center_vertical">
 
                                 <TextView
@@ -193,24 +193,90 @@
 
                             </androidx.appcompat.widget.LinearLayoutCompat>
 
-                            <!-- 备注 -->
+                            <!-- 来源 -->
                             <androidx.appcompat.widget.LinearLayoutCompat
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="3.6"
+                                android:layout_weight="0.8"
                                 android:gravity="center_vertical">
 
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="备注："
+                                    android:text="来源："
                                     android:textSize="15sp"
                                     completeSpace="@{3}" />
 
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="@{bean.remark}"
+                                    android:text="@{bean.source}"
+                                    android:textSize="15sp" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                            <!-- 所在港 -->
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="0.8"
+                                android:gravity="center_vertical">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="所在港："
+                                    android:textSize="15sp"
+                                    completeSpace="@{4}" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{bean.nowPort}"
+                                    android:textSize="15sp" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                            <!-- 位置 -->
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="0.8"
+                                android:gravity="center_vertical">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="位置："
+                                    android:textSize="15sp"
+                                    completeSpace="@{5}" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{bean.nowPosition}"
+                                    android:textSize="15sp" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                            <!-- 入库时间 -->
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1.2"
+                                android:gravity="center_vertical">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="入库时间："
+                                    android:textSize="15sp"
+                                    completeSpace="@{7}" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{bean.inStoreTime}"
                                     android:textSize="15sp" />
 
                             </androidx.appcompat.widget.LinearLayoutCompat>

module_base/src/main/java/com/lukouguoji/module_base/bean/AssembleWaybillBean.kt

@@ -19,6 +19,27 @@ class AssembleWaybillBean {
     var originalPieces: String = ""  // 原始运单件数
     var originalWeight: String = ""  // 原始运单重量
 
+    // ========== 剩余／总数显示（开始组装页首次装货成功后切换） ==========
+    var checkInPieces: Long = 0        // 已组装件数（接口 checkInPc）
+    var checkInWeight: Double = 0.0    // 已组装重量（接口 checkInWeight）
+    var showRemaining: Boolean = false // 是否以“剩余/总数”形式显示
+
+    /** 件数列显示：首次装货成功前为总件数，之后为“剩余件数/总件数”（剩余 = pc − checkInPc） */
+    val piecesDisplay: String
+        get() {
+            if (!showRemaining) return pieces
+            val total = pieces.toLongOrNull() ?: return pieces
+            return "${total - checkInPieces}/$pieces"
+        }
+
+    /** 重量列显示：首次装货成功前为总重量，之后为“剩余重量/总重量”（剩余 = weight − checkInWeight） */
+    val weightDisplay: String
+        get() {
+            if (!showRemaining) return weight
+            val total = weight.toDoubleOrNull() ?: return weight
+            return String.format("%.1f", total - checkInWeight) + "/" + weight
+        }
+
     val fLightInfo: String
         get() = "$fno/${fdate.replace("-", "")}"
 

module_base/src/main/java/com/lukouguoji/module_base/bean/FlightBean.kt

@@ -234,7 +234,10 @@ class FlightBean : ICheck {
         return when (countryType) {
             "0" -> "国内"
             "1" -> "国际"
-            else -> ""
+            "2" -> "地区"
+            "3" -> "混合"
+            // 部分接口直接返回中文名，原样显示
+            else -> countryType
         }
     }
 

module_base/src/main/java/com/lukouguoji/module_base/bean/GjcCheckInRecord.kt

@@ -22,7 +22,9 @@ data class GjcCheckInRecord(
     var weight: Double = 0.0,      // 运抵重量
     var volume: Double = 0.0,      // 运抵体积
     var whId: Long = 0,            // GJC_WAREHOUSE.ID
-    var carWeight: String = ""     // 托盘自重
+    var carWeight: String = "",    // 托盘车重
+    var trayNumber: Int = 0,       // 托盘数量
+    var trayTotalWeight: Double = 0.0  // 托盘重量（托盘自重）
 ) : BaseObservable() {
 
     // 数据变化回调
@@ -53,4 +55,28 @@ data class GjcCheckInRecord(
                 onDataChanged?.invoke()
             }
         }
+
+    // 托盘自重编辑过程中的原始输入串（保持回显与输入一致，避免光标跳位）
+    // 不作为构造参数，data class copy 备份/恢复时自动丢弃，回退到 trayTotalWeight 显示
+    // @Transient：仅界面内部状态，不参与 Gson 序列化提交
+    @Transient
+    private var trayTotalWeightInput: String? = null
+
+    // 托盘自重的字符串表示（用于双向绑定）
+    // 业务规则：重量包含托盘自重，托盘自重编辑后，重量同步增减相同差值
+    @get:Bindable
+    var trayTotalWeightStr: String
+        get() = trayTotalWeightInput
+            ?: if (trayTotalWeight == 0.0) "" else trayTotalWeight.toString()
+        set(value) {
+            trayTotalWeightInput = value
+            val newTrayWeight = value.toDoubleOrNull() ?: 0.0
+            if (trayTotalWeight != newTrayWeight) {
+                weight = Math.round((weight + newTrayWeight - trayTotalWeight) * 100) / 100.0
+                trayTotalWeight = newTrayWeight
+                notifyPropertyChanged(BR.trayTotalWeightStr)
+                notifyPropertyChanged(BR.weightStr)
+                onDataChanged?.invoke()
+            }
+        }
 }

module_base/src/main/java/com/lukouguoji/module_base/bean/GjcMaWb.kt

@@ -44,6 +44,7 @@ data class GjcMaWb(
 
     // ==================== 货物信息 ====================
     var pc: Long? = null,              // 预配件数
+    var pcLabel: String? = null,       // 件数展示文本（国际进港仓库分页返回，如 0/8、44）
     var weight: Double? = null,        // 预配重量（KG）
     var volume: Double? = null,        // 预配体积（CBM）
     var goods: String? = null,         // 品名（英）
@@ -57,6 +58,8 @@ data class GjcMaWb(
     var arriveWeight: Double? = null,      // 运抵重量
     var arriveVolume: Double? = null,      // 运抵体积
     var arriveFlag: String? = null,        // 运抵状态（0：正常运抵，1：提前运抵）
+    var trayNumber: Int? = null,           // 托盘数量
+    var trayTotalWeight: Double? = null,   // 托盘重量（托盘数量 × 托盘自重）
 
     // ==================== 特码与收货人 ====================
     var spCode: String? = null,        // 特码
@@ -79,9 +82,11 @@ data class GjcMaWb(
     // ==================== 状态信息 ====================
     var checkIn: String? = null,           // 收运状态。0：待收运，1：已收运，2：收运中
     var declareStatus: String? = null,     // 申报状态
+    var cmdStatus: String? = null,         // 海关放行（命令状态）
     var reviewStatus: String? = null,      // 审核状态（0：未审核；1：通过；2：退回）
     var tranFlag: String? = null,          // 转运标志
     var clearNormal: String? = null,       // 清仓正常（0：否，1：是）
+    var allTally: String? = null,          // 运单理货申报全部通过（0：否；1：是），为 1 时才允许全选该主单下的分单
 
     // ==================== 操作信息 ====================
     var opDate: String? = null,          // 操作时间（入库时间）
@@ -91,6 +96,9 @@ data class GjcMaWb(
 
     // ==================== 备注与其他 ====================
     var remark: String? = null,        // 备注
+    var pic: String? = null,           // 交接图片缩略图路径（逗号分隔）
+    var originalPic: String? = null,   // 交接图片原图路径（逗号分隔）
+    var picNumber: String? = null,     // 交接图片数量
     var ffmMemo: String? = null,       // ffm备注
     var mftMemo: String? = null,       // mft备注
     var unNumber: String? = null,      // UN编号
@@ -126,6 +134,13 @@ data class GjcMaWb(
         get() = checked.get()
         set(value) = checked.set(value)
 
+    /**
+     * 是否允许全选该主单下的分单
+     * 主单存在分批申报（未全部申报完毕）时接口返回 allTally=0，此时不允许全选其分单
+     */
+    val canCheckAllHaWb: Boolean
+        get() = allTally == "1"
+
     // ==================== 状态转换扩展属性 ====================
     /**
      * 计重状态中文

module_base/src/main/java/com/lukouguoji/module_base/bean/GjcUldUseBean.kt

@@ -51,6 +51,7 @@ class GjcUldUseBean : Serializable {
     var uldFlag: String = ""            // uld分类
     var status: String = ""             // uld状态：0：正常，1：故障
     var dgrCode: String = ""            // IMP代码
+    var bupFlag: String = ""            // BUP选项（0：否；1：是）
     var height: String = ""             // 高度
     var passageway: String = ""         // 通道号
     var passagewayId: String = ""
@@ -65,6 +66,19 @@ class GjcUldUseBean : Serializable {
 
     var loadArea: String = ""           // 组装区
     var pc: Long = 0                    // 组装件数
+    var allowLoad: String = ""          // 允许装机（0：不允许；1：允许）
+
+    // 是否允许装机
+    val isAllowLoad: Boolean
+        get() = allowLoad == "1"
+
+    // 装机状态文本
+    val allowLoadText: String
+        get() = when (allowLoad) {
+            "1" -> "允许装机"
+            "0" -> "不允许装机"
+            else -> ""
+        }
     var fillWeightFlag: String = ""     // 回填状态：0-未回填，1-部分回填，2-已回填
 
     // 回填状态文本

module_base/src/main/java/com/lukouguoji/module_base/bean/GjjLoadingUld.kt

@@ -0,0 +1,36 @@
+package com.lukouguoji.module_base.bean
+
+import androidx.databinding.ObservableBoolean
+import com.lukouguoji.module_base.interfaces.ICheck
+import java.io.Serializable
+
+/**
+ * 国际进港装机单 ULD 主单 Bean
+ * 对应接口：/IntImpManifest/pageQueryAir 返回的列表项（按 ULD 分组，manifestList 为关联运单）
+ */
+data class GjjLoadingUld(
+    var uld: String? = null,                       // ULD 编号
+    var flight: String? = null,                    // 航班信息
+    var totalPc: Long? = null,                     // 总件数
+    var totalWeight: Double? = null,               // 总重量
+    var manifestList: List<GjjManifest>? = null,   // 关联运单列表
+
+    // 展开/收起状态
+    @Transient
+    val showMore: ObservableBoolean = ObservableBoolean(false),
+
+    // 选中状态
+    @Transient
+    val checked: ObservableBoolean = ObservableBoolean(false)
+) : Serializable, ICheck {
+
+    override fun getCheckObservable(): ObservableBoolean = checked
+
+    var isSelected: Boolean
+        get() = checked.get()
+        set(value) = checked.set(value)
+
+    /** 总重量显示（取整） */
+    val totalWeightText: String
+        get() = ((totalWeight ?: 0.0).toInt()).toString()
+}

module_base/src/main/java/com/lukouguoji/module_base/bean/GjjManifest.kt

@@ -12,6 +12,8 @@ data class GjjManifest(
     var no: String = "",                // 编号
     var prefix: String = "",            // 前缀
     var wbNo: String = "",              // 运单号
+    var fdate: String = "",             // 航班日期
+    var fno: String = "",               // 航班号
     var origin: String = "",            // 货源地（始发站）
     var dest: String = "",              // 目的站
     var fdep: String = "",              // 航班起始站
@@ -58,6 +60,7 @@ data class GjjManifest(
     var unNumber: String = "",          // 危险品编号
     var activeId: Long = 0,             // 活动ID
     var locationTally: String = "",     // 理货库位号
+    var locationTallyId: Long = 0,      // 理货库位ID
     var pic: String = "",               // 交接图片缩略图路径
     var originalPic: String = "",       // 交接图片原图地址
     var picNumber: String = ""          // 交接图片数量

module_base/src/main/java/com/lukouguoji/module_base/bean/ManifestTotalDto.kt

@@ -8,5 +8,6 @@ data class ManifestTotalDto(
     var wbNumber: Int = 0,          // 运单票数/总票数
     var totalPc: Long = 0,          // 总件数
     var totalWeight: Double = 0.0,  // 总重量
-    var cargoWeight: Double = 0.0   // 总货重
+    var cargoWeight: Double = 0.0,  // 总货重
+    var flightNumber: Int = 0       // 航班航次
 )

module_base/src/main/java/com/lukouguoji/module_base/bean/ULDBean.kt

@@ -19,6 +19,14 @@ data class ULDBean(
     var status: String = "",
     // 备注
     var remark: String = "",
+    // 来源（空运、陆运）
+    var source: String = "",
+    // 入库时间 yyyy-MM-dd HH:mm:ss
+    var inStoreTime: String = "",
+    // 所在港
+    var nowPort: String = "",
+    // 位置信息
+    var nowPosition: String = "",
 ){
     val checked = ObservableBoolean(false)
 

module_base/src/main/java/com/lukouguoji/module_base/bean/UldInfoBean.kt

@@ -13,4 +13,7 @@ class UldInfoBean {
     var totalWeight: String = ""        // 总重量
     var status: String = ""             // 状态(旧字段，保留兼容)
     var useId: Long? = null                 // ULD使用ID（来自getUld接口）
+    var dgrCode: String = ""            // IMP代码
+    var boardType: String = ""          // 板型（可下拉选择，也可手动输入）
+    var bupFlag: String = "0"           // BUP选项（0：否；1：是），默认否
 }

module_base/src/main/java/com/lukouguoji/module_base/common/Constant.kt

@@ -346,6 +346,9 @@ interface Constant {
 
         // 数据
         const val DATA = "data"
+
+        // 页面标题
+        const val TITLE = "title"
         const val POSITION = "position"
 
         // 单号

module_base/src/main/java/com/lukouguoji/module_base/http/net/Api.kt

@@ -56,6 +56,7 @@ import com.lukouguoji.module_base.bean.IntImpAccidentVisaBean
 import com.lukouguoji.module_base.bean.IntImpPickUpDLVBean
 import com.lukouguoji.module_base.bean.IntImpPickUpRecordBean
 import com.lukouguoji.module_base.bean.IntImpQueryBean
+import com.lukouguoji.module_base.bean.GjjLoadingUld
 import com.lukouguoji.module_base.bean.GjjManifest
 import com.lukouguoji.module_base.bean.GjjManifestBean
 import com.lukouguoji.module_base.bean.GjjPackTypeBean
@@ -147,6 +148,14 @@ interface Api {
     @POST
     suspend fun singleStringPost(@Url url: String): BaseResultBean<String>
 
+    /**
+     * 获取海关回执（国际进港原始舱单／进港理货／出港运抵／出港装载／出港理货 共用）
+     * url：XXX/getResponse，body 传 prefix、no 与拼接的 wbNo（后端实测按 prefix + no 匹配），
+     * 回执文本实测在 msg 字段、data 为 null，取值见 CustomsResponseKtx.showCustomsResponse
+     */
+    @POST
+    suspend fun getCustomsResponse(@Url url: String, @Body data: RequestBody): BaseResultBean<String>
+
     @GET
     suspend fun anyGetForId(@Url url: String, @Query("id") id: String): BaseResultBean<Any>
 
@@ -657,7 +666,8 @@ interface Api {
      * 国际出港组装 - 根据全ULD查询ULD状态和耗材重量
      * 接口路径: /IntExpAssemble/getUld
      * @param uld ULD编号
-     * @return ULD信息，包含status（0：正常，1：故障）和consumeWeight（耗材重量）
+     * @return ULD信息，包含status（0：正常，1：故障）、consumeWeight（耗材重量）、
+     *         dgrCode（IMP代码）、boardType（板型）、bupFlag（BUP选项 0：否；1：是）
      */
     @GET("IntExpAssemble/getUld")
     suspend fun getUldWithConsumeWeight(@Query("uld") uld: String): BaseResultBean<GjcUldUseBean>
@@ -666,7 +676,8 @@ interface Api {
      * 国际出港组装 - 卸货
      * 接口路径: /IntExpAssemble/drop
      * @param data 请求参数：abPc（组装件数）、abWeight（组装重量）、consumeWeight（耗材重量）、
-     *             ldId（组装人）、loadArea（组装区）、useInfo（ULD信息）、wbInfo（运单信息）、userId（用户ID）
+     *             ldId（组装人）、loadArea（组装区）、useInfo（ULD信息）、wbInfo（运单信息）、userId（用户ID）、
+     *             dgrCode（IMP代码）、boardType（板型）、bupFlag（BUP选项 0：否；1：是）
      */
     @POST("IntExpAssemble/drop")
     suspend fun assembleDropCargo(@Body data: RequestBody): BaseResultBean<GjcWarehouse>
@@ -675,7 +686,8 @@ interface Api {
      * 国际出港组装 - 装货
      * 接口路径: /IntExpAssemble/assemble
      * @param data 请求参数：abPc（组装件数）、abWeight（组装重量）、consumeWeight（耗材重量）、
-     *             ldId（组装人）、loadArea（组装区）、useInfo（ULD信息）、wbInfo（运单信息）、userId（用户ID）
+     *             ldId（组装人）、loadArea（组装区）、useInfo（ULD信息）、wbInfo（运单信息）、userId（用户ID）、
+     *             dgrCode（IMP代码）、boardType（板型）、bupFlag（BUP选项 0：否；1：是）
      */
     @POST("IntExpAssemble/assemble")
     suspend fun assembleLoadCargo(@Body data: RequestBody): BaseResultBean<GjcWarehouse>
@@ -737,6 +749,14 @@ interface Api {
     @POST("IntExpOutHandover/waitingTrans")
     suspend fun waitingTrans(@Body data: RequestBody): BaseResultBean<String>
 
+    /**
+     * 国际出港出库交接-允许装机
+     * 接口路径: /IntExpOutHandover/allow
+     * @param data 请求参数：选中的ULD列表（GjcUldUseBean 数组）
+     */
+    @POST("IntExpOutHandover/allow")
+    suspend fun allowLoading(@Body data: RequestBody): BaseResultBean<Boolean>
+
     /**
      * 国际出港-出港装载 分页查询
      * 接口路径: /IntExpLoad/pageQuery
@@ -872,6 +892,20 @@ interface Api {
     @POST("IntExpMove/move")
     suspend fun submitIntExpMove(@Body data: RequestBody): BaseResultBean<SimpleResultBean>
 
+    /**
+     * 国际出港移库-详情
+     * 接口路径: /IntExpMove/detail
+     */
+    @POST("IntExpMove/detail")
+    suspend fun getIntExpMoveDetail(@Query("maWbId") maWbId: Long): BaseResultBean<GjcMaWb>
+
+    /**
+     * 国际出港移库-编辑（仅更新备注与交接图片）
+     * 接口路径: /IntExpMove/update
+     */
+    @POST("IntExpMove/update")
+    suspend fun updateIntExpMove(@Body data: RequestBody): BaseResultBean<String>
+
     /**
      * 国际出港库位操作-清仓
      * 接口路径: /IntExpStorageUse/updateClear
@@ -1391,6 +1425,24 @@ interface Api {
     @POST("flt/listFlightDest")
     suspend fun listFlightDest(@Body data: RequestBody): BaseResultBean<List<String>>
 
+    /**
+     * 航班管理-新增航班
+     */
+    @POST("flt/saveFlight")
+    suspend fun saveFlight(@Body data: RequestBody): BaseResultBean<String>
+
+    /**
+     * 航班管理-修改航班
+     */
+    @POST("flt/updateFlight")
+    suspend fun updateFlight(@Body data: RequestBody): BaseResultBean<String>
+
+    /**
+     * 航班管理-删除航班（请求体为航班对象数组）
+     */
+    @POST("flt/delete")
+    suspend fun deleteFlightList(@Body data: RequestBody): BaseResultBean<String>
+
     /**
      * 新增或修航司屏蔽
      */
@@ -1891,6 +1943,14 @@ interface Api {
     @POST("IntImpManifest/pageQueryTotal")
     suspend fun getIntImpManifestTotal(@Body data: RequestBody): BaseResultBean<ManifestTotalDto>
 
+    /**
+     * 国际进港舱单-根据11位具体运单号查询运单信息
+     * 接口路径: /IntImpManifest/queryWbByNo
+     * @param wbNo 11位运单号
+     */
+    @POST("IntImpManifest/queryWbByNo")
+    suspend fun getIntImpManifestByWbNo(@Query("wbNo") wbNo: String): BaseResultBean<GjjManifest>
+
     /**
      * 国际进港舱单-获取主单下分单
      */
@@ -1916,10 +1976,10 @@ interface Api {
     suspend fun getMaWbMinusHaWb(@Body data: RequestBody): BaseResultBean<GjjHaWb>
 
     /**
-     * 国际进港舱单-分拣理货（装机单）-分页查询
+     * 国际进港舱单-分拣理货（装机单）-分页查询（按 ULD 分组，manifestList 为关联运单）
      */
     @POST("IntImpManifest/pageQueryAir")
-    suspend fun getIntImpLoadingList(@Body data: RequestBody): PageInfo<GjjManifest>
+    suspend fun getIntImpLoadingList(@Body data: RequestBody): PageInfo<GjjLoadingUld>
 
     /**
      * 国际进港舱单-分拣理货（装机单）-分页合计

module_base/src/main/java/com/lukouguoji/module_base/ktx/CustomsResponseKtx.kt

@@ -0,0 +1,53 @@
+package com.lukouguoji.module_base.ktx
+
+import com.lukouguoji.module_base.base.BaseViewModel
+import com.lukouguoji.module_base.http.net.NetApply
+import com.lukouguoji.module_base.ui.page.customs.CustomsResponseActivity
+
+/**
+ * 海关回执接口地址（各页面对应各自模块的 getResponse）
+ */
+object CustomsResponseUrl {
+    const val INT_IMP_AIR_MANIFEST = "IntImpAirManifest/getResponse"   // 国际进港原始舱单
+    const val INT_IMP_TALLY = "IntImpTally/getResponse"                // 国际进港理货
+    const val INT_EXP_ARRIVE = "IntExpArrive/getResponse"              // 国际出港运抵
+    const val INT_EXP_LOAD = "IntExpLoad/getResponse"                  // 国际出港装载
+    const val INT_EXP_TALLY = "IntExpTally/getResponse"                // 国际出港理货
+}
+
+/**
+ * 列表项侧滑「回执」按钮的 onItemClick type
+ * 现有取值为 0/1/2、101~103、1000~3000 及 view id，9001 与之均不冲突
+ */
+const val ITEM_CLICK_TYPE_CUSTOMS_RESPONSE = 9001
+
+/**
+ * 查询海关回执并跳转只读详情页
+ * - 带 Loading 调用 [url]，本期只查主单，不传 hno
+ * - 请求体同时传 prefix、no 与拼接后的 wbNo：测试环境实测后端按 prefix + no 匹配，
+ *   只传 wbNo 会查不到（与文档「运单号必填」描述不一致）
+ * - 回执文本实测放在 msg 字段（data 恒为 null），这里优先取 data、为空再取 msg，兼容两种返回
+ * - 回执为空时提示「暂无海关回执」，不跳转
+ * - 接口失败由 launchLoadingCollect 默认 Toast 错误信息
+ */
+fun BaseViewModel.showCustomsResponse(url: String, prefix: String?, no: String?, title: String) {
+    if (prefix.isNullOrEmpty() || no.isNullOrEmpty()) {
+        showToast("运单号为空")
+        return
+    }
+    val params = mapOf(
+        "wbNo" to prefix + no,
+        "prefix" to prefix,
+        "no" to no
+    ).toRequestBody()
+    launchLoadingCollect({ NetApply.api.getCustomsResponse(url, params) }) {
+        onSuccess = { result ->
+            val content = result.data?.ifEmpty { null } ?: result.msg ?: ""
+            if (content.isEmpty()) {
+                showToast("暂无海关回执")
+            } else {
+                CustomsResponseActivity.start(getTopActivity(), title, content)
+            }
+        }
+    }
+}

module_base/src/main/java/com/lukouguoji/module_base/router/ARouterConstants.kt

@@ -142,6 +142,7 @@ object ARouterConstants {
     const val ACTIVITY_URL_INT_EXP_ASSEMBLE = "/gjc/IntExpAssembleActivity"   //国际出港 出港组装
     const val ACTIVITY_URL_INT_EXP_ASSEMBLE_START = "/gjc/IntExpAssembleStartActivity"   //国际出港 开始组装
     const val ACTIVITY_URL_INT_EXP_MOVE = "/gjc/IntExpMoveActivity"   //国际出港 出港移库
+    const val ACTIVITY_URL_INT_EXP_MOVE_EDIT = "/gjc/IntExpMoveEditActivity"   //国际出港 出港移库编辑/详情
     const val ACTIVITY_URL_GJC_ASSEMBLE_ALLOCATE = "/gjc/GjcAssembleAllocateActivity"  //国际出港 组装分配
     const val ACTIVITY_URL_INT_EXP_OUT_HANDOVER = "/gjc/IntExpOutHandoverActivity"   //国际出港 出库交接
     const val ACTIVITY_URL_INT_EXP_LOAD = "/gjc/IntExpLoadActivity"   //国际出港 出港装载

module_base/src/main/java/com/lukouguoji/module_base/ui/page/customs/CustomsResponseActivity.kt

@@ -0,0 +1,46 @@
+package com.lukouguoji.module_base.ui.page.customs
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.lukouguoji.module_base.R
+import com.lukouguoji.module_base.base.BaseBindingActivity
+import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.databinding.ActivityCustomsResponseBinding
+import com.lukouguoji.module_base.impl.EmptyViewModel
+
+/**
+ * 海关回执详情页（只读）
+ * 回执文本由 Intent 传入，页面内不调接口；UI 参照国际进港电报详情页
+ */
+class CustomsResponseActivity :
+    BaseBindingActivity<ActivityCustomsResponseBinding, EmptyViewModel>() {
+
+    override fun layoutId() = R.layout.activity_customs_response
+
+    override fun viewModelClass() = EmptyViewModel::class.java
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        setBackArrow(intent.getStringExtra(Constant.Key.TITLE) ?: "海关回执")
+
+        binding.etContent.apply {
+            setText(intent.getStringExtra(Constant.Key.DATA) ?: "")
+            // 只读：不可输入、无光标，但仍可长按选择复制
+            keyListener = null
+            isFocusable = false
+            isFocusableInTouchMode = false
+            isCursorVisible = false
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        fun start(context: Context, title: String, content: String) {
+            context.startActivity(
+                Intent(context, CustomsResponseActivity::class.java)
+                    .putExtra(Constant.Key.TITLE, title)
+                    .putExtra(Constant.Key.DATA, content)
+            )
+        }
+    }
+}

module_base/src/main/java/com/lukouguoji/module_base/ui/weight/data/layout/PadDataLayout.kt

@@ -211,7 +211,7 @@ class PadDataLayout : FrameLayout {
                 setOnClickListener(null)
             }
 
-            DataLayoutType.DATE -> {
+            DataLayoutType.DATE, DataLayoutType.DATETIME -> {
                 tv.visibility = VISIBLE
                 et.visibility = GONE
                 spinner.visibility = GONE
@@ -258,4 +258,5 @@ enum class DataLayoutType {
     INPUT, // 文本
     SPINNER, // 下拉选择
     DATE, // 日期
+    DATETIME, // 日期时间（yyyy-MM-dd HH:mm:ss）
 }

module_base/src/main/java/com/lukouguoji/module_base/ui/weight/data/layout/PadDataLayoutNew.kt

@@ -25,6 +25,7 @@ import com.lukouguoji.module_base.adapter.visible
 import com.lukouguoji.module_base.interfaces.IOnFocusChangeListener
 import com.lukouguoji.module_base.interfaces.IOnSpinnerSelected
 import com.lukouguoji.module_base.ktx.formatDate
+import com.lukouguoji.module_base.ktx.formatDateTime
 import com.lukouguoji.module_base.ktx.getActivity
 import com.lukouguoji.module_base.ktx.loge
 import com.lukouguoji.module_base.util.Common
@@ -182,6 +183,18 @@ class PadDataLayoutNew : FrameLayout {
         }
     }
 
+    // 选择日期时间（yyyy-MM-dd HH:mm:ss）
+    private val dateTimeClick: (v: View) -> Unit = {
+        if (enable) {
+            Common.onYearMonthDayTime(context.getActivity(), value) { year, month, day, hour, minute, second ->
+                val calendar = Calendar.getInstance()
+                calendar.set(year, month - 1, day, hour, minute, second)
+                value = calendar.time.formatDateTime()
+                refreshCallBack?.invoke()
+            }
+        }
+    }
+
     init {
         initView()
     }
@@ -252,7 +265,7 @@ class PadDataLayoutNew : FrameLayout {
                 setOnClickListener(null)
             }
 
-            DataLayoutType.DATE -> {
+            DataLayoutType.DATE, DataLayoutType.DATETIME -> {
                 tv.visibility = VISIBLE
                 et.visibility = GONE
                 spinner.visibility = GONE
@@ -263,7 +276,7 @@ class PadDataLayoutNew : FrameLayout {
                 iv.layoutParams.width = dp20
                 iv.layoutParams.height = dp20
 
-                setOnClickListener(dateClick)
+                setOnClickListener(if (type == DataLayoutType.DATETIME) dateTimeClick else dateClick)
             }
         }
     }

module_base/src/main/java/com/lukouguoji/module_base/util/DictUtils.kt

@@ -625,6 +625,21 @@ object DictUtils {
         }
     }
 
+    /**
+     * 板型列表（国际出港组装-开始组装）
+     * 字典 code：BOARDTYPE；显示与提交均使用 value 字段
+     */
+    fun getBoardTypeList(callBack: (List<KeyValue>) -> Unit) {
+        launchCollect({
+            NetApply.api
+                .getDictList("BOARDTYPE")
+        }) {
+            onSuccess = {
+                callBack((it.data ?: emptyList()).map { b -> KeyValue(b.value, b.value) })
+            }
+        }
+    }
+
     // 报文类型
     fun getTelegramTypeList(callBack: (List<KeyValue>) -> Unit) {
         launchCollect({

module_base/src/main/java/com/lukouguoji/module_base/util/PrinterUtils.kt

@@ -27,7 +27,12 @@ import com.lukouguoji.module_base.ktx.permission
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.model.LoadingModel
 import dev.DevUtils
+import dev.utils.app.HandlerUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.withContext
 import okio.internal.commonToUtf8String
+import java.io.IOException
 
 
 object PrinterUtils {
@@ -315,6 +320,50 @@ object PrinterUtils {
      * 打印国际出港板箱过磅挂签（2列布局，支持合并单元格）
      */
     fun printGjcBoxWeighing(bean: GjcUldUseBean) {
+        printMergedGrid(buildGjcBoxWeighingRows(bean))
+    }
+
+    /**
+     * 批量打印国际出港板箱过磅挂签
+     * 逐张串行发送，张间节流，任一张发送失败即中止并提示已完成张数
+     */
+    suspend fun printGjcBoxWeighingBatch(beans: List<GjcUldUseBean>) = withContext(Dispatchers.IO) {
+        var printed = 0
+        loading.showLoading()
+        try {
+            for ((index, bean) in beans.withIndex()) {
+                // 连接断开（含上一张写入异常后 SDK 置为断开）则不再继续发送
+                if (portManager?.connectStatus != true) break
+                HandlerUtils.postRunnable {
+                    loading.setMessage("正在打印 ${index + 1}/${beans.size}")
+                }
+                val bytes = buildMergedGridBytes(buildGjcBoxWeighingRows(bean))
+                val ok = try {
+                    portManager?.writeDataImmediately(bytes) == true
+                } catch (e: IOException) {
+                    showLog("批量打印第 ${index + 1} 张写入异常 : ${e.message}")
+                    false
+                }
+                if (!ok) break
+                printed++
+                // 张间留出出纸时间，避免连续灌入导致打印机缓冲溢出
+                if (index < beans.lastIndex) delay(800)
+            }
+        } finally {
+            loading.dismissLoading()
+        }
+        if (printed == beans.size) {
+            showToast("${beans.size} 张挂签打印完成")
+        } else {
+            val failBean = beans[printed]
+            showToast("已打印 $printed 张，第 ${printed + 1} 张（ULD ${failBean.uld}）发送失败，请检查打印机后重试")
+        }
+    }
+
+    /**
+     * 组装板箱过磅挂签的表格行数据
+     */
+    private fun buildGjcBoxWeighingRows(bean: GjcUldUseBean): ArrayList<GridRow> {
         val rows = arrayListOf<GridRow>()
 
         // 第1行：日期 | 航班号
@@ -345,7 +394,7 @@ object PrinterUtils {
             merged = CellData("备注:", "NOTES:", bean.remark)
         ))
 
-        printMergedGrid(rows)
+        return rows
     }
 
     private fun printCommonGrid(rowItem: ArrayList<List<String>>) {
@@ -456,6 +505,13 @@ object PrinterUtils {
      * 打印支持合并单元格的表格
      */
     private fun printMergedGrid(rows: ArrayList<GridRow>) {
+        portManager?.writeDataImmediately(buildMergedGridBytes(rows))
+    }
+
+    /**
+     * 生成支持合并单元格的表格标签字节流（自包含一张完整标签的 TSPL 指令）
+     */
+    private fun buildMergedGridBytes(rows: ArrayList<GridRow>): ByteArray {
         val gridStartX = 30
         val titleTopMargin = 50      // 标题顶部间距
         val titleFontSize = 130      // 标题字体大小
@@ -536,7 +592,7 @@ object PrinterUtils {
             addPrint(1)
         }.bytes
 
-        portManager?.writeDataImmediately(bytes)
+        return bytes
     }
 
     /**

module_base/src/main/release/AndroidManifest.xml

@@ -34,6 +34,13 @@
             android:exported="false"
             android:screenOrientation="userLandscape" />
 
+        <!-- 海关回执（只读） -->
+        <activity
+            android:name=".ui.page.customs.CustomsResponseActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="false"
+            android:screenOrientation="userLandscape" />
+
         <!-- 屏幕适配 -->
         <meta-data
             android:name="design_width_in_dp"

module_base/src/main/res/drawable/bg_data_layout_new_dropdown.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 输入框边框 + 与 Spinner（bg_spinner_pda_new）完全一致的下拉箭头，用于“手动输入 + 下拉选择”组合输入框 -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_data_layout_new" />
+    <item
+        android:width="8.7dp"
+        android:height="6dp"
+        android:drawable="@drawable/img_sp_down"
+        android:gravity="center_vertical|right"
+        android:right="10dp" />
+</layer-list>

module_base/src/main/res/layout/activity_customs_response.xml

@@ -0,0 +1,35 @@
+<?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">
+
+    <data />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_f2"
+        android:orientation="vertical">
+
+        <!-- 标题栏 -->
+        <include layout="@layout/title_tool_bar" />
+
+        <!-- 回执内容区域（只读，可滚动、可长按复制） -->
+        <EditText
+            android:id="@+id/etContent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_margin="20dp"
+            android:background="@color/white"
+            android:gravity="top|start"
+            android:inputType="textMultiLine"
+            android:lineSpacingExtra="4dp"
+            android:overScrollMode="always"
+            android:padding="20dp"
+            android:scrollbars="vertical"
+            android:textColor="@color/black"
+            android:textSize="16sp" />
+
+    </LinearLayout>
+
+</layout>

module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcAssembleWeightEditActivity.kt

@@ -30,7 +30,7 @@ class GjcAssembleWeightEditActivity :
     override fun viewModelClass() = GjcAssembleWeightEditViewModel::class.java
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        setBackArrow("国际出港修改组装重量")
+        setBackArrow("国际出港重量回填")
 
         binding.viewModel = viewModel
 

module_gjc/src/main/java/com/lukouguoji/gjc/activity/GjcQueryActivity.kt

@@ -54,7 +54,7 @@ class GjcQueryActivity :
         }
 
         // 航班号：大写字母+数字
-        binding.filterPanel.filterFlightNo.et.setUpperCaseAlphanumericFilter()
+        binding.flightNoSearch.et.setUpperCaseAlphanumericFilter()
         // 目的港：仅大写字母
         binding.filterPanel.filterDest.et.setUpperCaseLetterFilter()
 

module_gjc/src/main/java/com/lukouguoji/gjc/activity/IntExpStorageUseActivity.kt

@@ -79,7 +79,8 @@ class IntExpStorageUseActivity :
         IntExpMoveClearDialogModel { dialog ->
             // 用户点击保存后，执行清仓操作
             val clearNormal = dialog.clearNormal.value ?: ""
-            viewModel.performClear(clearNormal, maWbListForClear)
+            val clearRemark = dialog.clearRemark.value ?: ""
+            viewModel.performClear(clearNormal, clearRemark, maWbListForClear)
         }.show(this)
     }
 

module_gjc/src/main/java/com/lukouguoji/gjc/dialog/IntExpMoveClearDialogModel.kt

@@ -18,6 +18,9 @@ class IntExpMoveClearDialogModel(
     // 清仓正常（存储的是 code："0" 或 "1"）
     val clearNormal = MutableLiveData("")
 
+    // 清仓备注（选填）
+    val clearRemark = MutableLiveData("")
+
     // 清仓正常选项列表
     val clearNormalList = MutableLiveData<List<KeyValue>>().apply {
         value = listOf(

module_gjc/src/main/java/com/lukouguoji/gjc/holder/IntExpArriveViewHolder.kt

@@ -9,6 +9,7 @@ import com.lukouguoji.module_base.common.ConstantEvent
 import com.lukouguoji.module_base.impl.FlowBus
 import com.lukouguoji.module_base.bean.GjcMaWb
 import com.lukouguoji.module_base.ktx.refresh
+import com.lukouguoji.module_base.ktx.ITEM_CLICK_TYPE_CUSTOMS_RESPONSE
 
 /**
  * 国际出港-出港运抵 列表项ViewHolder
@@ -22,6 +23,12 @@ class IntExpArriveViewHolder(view: View) :
         binding.position = position
         binding.executePendingBindings()
 
+        // 侧滑菜单 - 回执按钮（关闭侧滑后分发到 ViewModel）
+        binding.btnResponse.setOnClickListener {
+            binding.swipeMenu.quickClose()
+            clickListener?.onItemClick(position, ITEM_CLICK_TYPE_CUSTOMS_RESPONSE)
+        }
+
         // 添加图标点击事件 - 切换选择状态
         binding.ivIcon.setOnClickListener {
             bean.checked.set(!bean.checked.get())

module_gjc/src/main/java/com/lukouguoji/gjc/holder/IntExpLoadViewHolder.kt

@@ -6,6 +6,7 @@ import com.lukouguoji.module_base.base.BaseViewHolder
 import com.lukouguoji.module_base.common.ConstantEvent
 import com.lukouguoji.module_base.impl.FlowBus
 import com.lukouguoji.module_base.bean.GjcExportLoad
+import com.lukouguoji.module_base.ktx.ITEM_CLICK_TYPE_CUSTOMS_RESPONSE
 
 /**
  * 国际出港-出港装载 列表项ViewHolder
@@ -19,6 +20,12 @@ class IntExpLoadViewHolder(view: View) :
         binding.position = position
         binding.executePendingBindings()
 
+        // 侧滑菜单 - 回执按钮（关闭侧滑后分发到 ViewModel）
+        binding.btnResponse.setOnClickListener {
+            binding.swipeMenu.quickClose()
+            clickListener?.onItemClick(position, ITEM_CLICK_TYPE_CUSTOMS_RESPONSE)
+        }
+
         // 添加图标点击事件 - 切换选择状态
         binding.ivIcon.setOnClickListener {
             // 反转checked状态

module_gjc/src/main/java/com/lukouguoji/gjc/holder/IntExpMoveViewHolder.kt

@@ -2,6 +2,7 @@ package com.lukouguoji.gjc.holder
 
 import android.view.View
 import com.lukouguoji.gjc.databinding.ItemIntExpMoveBinding
+import com.lukouguoji.gjc.page.move.IntExpMoveEditActivity
 import com.lukouguoji.module_base.base.BaseViewHolder
 import com.lukouguoji.module_base.bean.GjcMove
 import com.lukouguoji.module_base.common.ConstantEvent
@@ -31,6 +32,17 @@ class IntExpMoveViewHolder(view: View) :
             }
         }
 
+        // 点击列表项进入移库详情
+        binding.ll.setOnClickListener {
+            IntExpMoveEditActivity.startForDetails(itemView.context, bean.maWbId)
+        }
+
+        // 侧滑菜单 - 编辑按钮
+        binding.btnEdit.setOnClickListener {
+            binding.swipeMenu.quickClose()
+            IntExpMoveEditActivity.startForEdit(itemView.context, bean.maWbId)
+        }
+
         binding.executePendingBindings()
     }
 }

module_gjc/src/main/java/com/lukouguoji/gjc/holder/IntExpTallySubViewHolder.kt

@@ -4,6 +4,8 @@ import android.view.View
 import com.lukouguoji.gjc.databinding.ItemIntExpTallySubBinding
 import com.lukouguoji.module_base.base.BaseViewHolder
 import com.lukouguoji.module_base.bean.GjcHaWb
+import com.lukouguoji.module_base.common.ConstantEvent
+import com.lukouguoji.module_base.impl.FlowBus
 
 /**
  * 国际出港-出港理货 子订单(分单) ViewHolder
@@ -20,6 +22,8 @@ class IntExpTallySubViewHolder(view: View) :
         // checkbox点击切换选择状态
         binding.ivCheckbox.setOnClickListener {
             bean.checked.set(!bean.checked.get())
+            // 通知页面刷新分单全选状态
+            FlowBus.with<String>(ConstantEvent.EVENT_CHECK_CHANGED).tryEmit("check_changed")
             binding.executePendingBindings()
         }
     }

module_gjc/src/main/java/com/lukouguoji/gjc/holder/IntExpTallyViewHolder.kt

@@ -9,6 +9,7 @@ import com.lukouguoji.module_base.common.ConstantEvent
 import com.lukouguoji.module_base.impl.FlowBus
 import com.lukouguoji.module_base.bean.GjcMaWb
 import com.lukouguoji.module_base.ktx.refresh
+import com.lukouguoji.module_base.ktx.ITEM_CLICK_TYPE_CUSTOMS_RESPONSE
 
 /**
  * 国际出港-出港理货 ViewHolder
@@ -22,6 +23,12 @@ class IntExpTallyViewHolder(view: View) :
         binding.position = position
         binding.executePendingBindings()
 
+        // 侧滑菜单 - 回执按钮（关闭侧滑后分发到 ViewModel）
+        binding.btnResponse.setOnClickListener {
+            binding.swipeMenu.quickClose()
+            clickListener?.onItemClick(position, ITEM_CLICK_TYPE_CUSTOMS_RESPONSE)
+        }
+
         // 图标点击切换选择状态（主单和分单独立，互不干扰）
         binding.ivIcon.setOnClickListener {
             bean.checked.set(!bean.checked.get())

module_gjc/src/main/java/com/lukouguoji/gjc/page/assemble/IntExpAssembleStartActivity.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.lukouguoji.gjc.R
@@ -66,8 +67,17 @@ class IntExpAssembleStartActivity :
         setBackArrow("国际出港开始组装")
         binding.viewModel = viewModel
 
-        // 为ULD编号添加大写字母和数字的输入限制
+        // 为ULD编号、IMP代码添加大写字母和数字的输入限制
         binding.uldNoInput.et.setUpperCaseAlphanumericFilter()
+        binding.impCodeInput.et.setUpperCaseAlphanumericFilter()
+
+        // 板型：手动输入 + 下拉选择组合框。箭头复用 Spinner 同款背景绘制（同资源、同尺寸、同边距），
+        // 图标位不放图片，仅作为覆盖在箭头上的透明点击区域（点击事件由布局 setOnIconClickListener 绑定）
+        binding.boardTypeInput.apply {
+            ll.setBackgroundResource(com.lukouguoji.module_base.R.drawable.bg_data_layout_new_dropdown)
+            iv.setImageDrawable(null)
+            iv.visibility = View.VISIBLE
+        }
 
         // 初始化列表
         initRecyclerViews()
@@ -81,6 +91,9 @@ class IntExpAssembleStartActivity :
         // 加载组装人列表
         viewModel.loadAssemblerList()
 
+        // 加载板型选项列表
+        viewModel.loadBoardTypeList()
+
         // 监听登出事件，清空缓存
         FlowBus.with<Any>(ConstantEvent.LOGOUT).observe(this) {
             viewModel.clearCachedOperator()

module_gjc/src/main/java/com/lukouguoji/gjc/page/move/IntExpMoveEditActivity.kt

@@ -0,0 +1,68 @@
+package com.lukouguoji.gjc.page.move
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.lukouguoji.gjc.R
+import com.lukouguoji.gjc.databinding.ActivityIntExpMoveEditBinding
+import com.lukouguoji.gjc.viewModel.IntExpMoveEditViewModel
+import com.lukouguoji.module_base.base.BaseBindingActivity
+import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.common.DetailsPageType
+import com.lukouguoji.module_base.ktx.addOnItemClickListener
+import com.lukouguoji.module_base.ktx.commonAdapter
+import com.lukouguoji.module_base.router.ARouterConstants
+
+/**
+ * 国际出港移库编辑/详情页
+ * 编辑模式仅支持拍照上传与备注修改
+ */
+@Route(path = ARouterConstants.ACTIVITY_URL_INT_EXP_MOVE_EDIT)
+class IntExpMoveEditActivity :
+    BaseBindingActivity<ActivityIntExpMoveEditBinding, IntExpMoveEditViewModel>() {
+
+    override fun layoutId() = R.layout.activity_int_exp_move_edit
+
+    override fun viewModelClass() = IntExpMoveEditViewModel::class.java
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        viewModel.initOnCreated(intent)
+
+        when (viewModel.pageType.value) {
+            DetailsPageType.Modify -> setBackArrow("国际出港移库编辑")
+            else -> setBackArrow("国际出港移库详情")
+        }
+
+        binding.viewModel = viewModel
+
+        // 绑定图片 RecyclerView 引用
+        viewModel.rvImages = binding.rvImages
+
+        // 绑定图片列表点击事件（编辑模式下可删除图片）
+        binding.rvImages.addOnItemClickListener(viewModel)
+
+        // 监听图片列表变化并更新 adapter
+        viewModel.imageList.observe(this) { images ->
+            binding.rvImages.commonAdapter()?.refresh(images)
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        fun startForEdit(context: Context, maWbId: Long?) {
+            val starter = Intent(context, IntExpMoveEditActivity::class.java)
+                .putExtra(Constant.Key.PAGE_TYPE, DetailsPageType.Modify.name)
+                .putExtra(Constant.Key.ID, maWbId?.toString() ?: "")
+            context.startActivity(starter)
+        }
+
+        @JvmStatic
+        fun startForDetails(context: Context, maWbId: Long?) {
+            val starter = Intent(context, IntExpMoveEditActivity::class.java)
+                .putExtra(Constant.Key.PAGE_TYPE, DetailsPageType.Details.name)
+                .putExtra(Constant.Key.ID, maWbId?.toString() ?: "")
+            context.startActivity(starter)
+        }
+    }
+}

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcAssembleWeightEditViewModel.kt

@@ -38,6 +38,7 @@ class GjcAssembleWeightEditViewModel : BaseViewModel() {
     val totalPc = MutableLiveData("")         // 总件数
     val totalWeight = MutableLiveData("")     // 总重量
     val cargoWeight = MutableLiveData("")     // 货重
+    val consumeWeight = MutableLiveData("")   // 耗材重量
 
     ///////////////////////////////////////////////////////////////////////////
     // 底部统计字段
@@ -74,6 +75,7 @@ class GjcAssembleWeightEditViewModel : BaseViewModel() {
             totalPc.value = it.pc.toString()
             totalWeight.value = it.totalWeight.toString()
             cargoWeight.value = it.cargoWeight.toString()
+            consumeWeight.value = it.consumeWeight.toString()
 
             // 保存参数用于API调用
             useId = it.useId

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

@@ -20,6 +20,7 @@ import com.lukouguoji.module_base.ktx.noNull
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.ktx.verifyNullOrEmpty
+import com.lukouguoji.module_base.db.perference.SharedPreferenceUtil
 import com.lukouguoji.module_base.model.BluetoothDialogModel
 import com.lukouguoji.module_base.model.ScanModel
 import com.lukouguoji.module_base.util.Common
@@ -34,6 +35,11 @@ import java.util.Date
  */
 class GjcBoxWeighingAddViewModel : BaseViewModel() {
 
+    companion object {
+        // 记录上一次称重完成时使用的通道号，后续称重默认选中
+        private const val KEY_LAST_PASSAGEWAY_ID = "gjc_box_weighing_last_passageway_id"
+    }
+
     // 数据Bean
     val dataBean = MutableLiveData(GjcUldUseBean())
 
@@ -51,6 +57,7 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() {
     val totalWeight = MutableLiveData("0")      // 总重（红色）
     val netWeight = MutableLiveData("0")        // 装机重（蓝色）
     val cargoWeight = MutableLiveData("0")      // 货重（绿色）
+    val consumeWeight = MutableLiveData("0")    // 耗材重量（只读，随 ULD 记录带出）
 
     // 需要自动查询的独立字段（用于监听输入变化）
     val carId = MutableLiveData("")             // 架子车号
@@ -116,7 +123,9 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() {
             loadPassagewayList(editBean.passagewayId)
             loadPlCloseList(editBean.plClose)
         } else {
-            loadPassagewayList(null)
+            // 新增模式：默认选中上一次称重使用的通道号
+            val lastPassagewayId = SharedPreferenceUtil.getString(KEY_LAST_PASSAGEWAY_ID)
+            loadPassagewayList(lastPassagewayId.ifEmpty { null })
             loadPlCloseList(null)
         }
     }
@@ -138,6 +147,7 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() {
         totalWeight.value = bean.totalWeight.toString()
         netWeight.value = bean.netWeight.toString()
         cargoWeight.value = bean.cargoWeight.toString()
+        consumeWeight.value = bean.consumeWeight.toString()
         diBangWeight.value = bean.totalWeight.toString()
 
         // 通道号 Spinner 绑定到 channel（KeyValue.value 即 passagewayId）
@@ -273,15 +283,16 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() {
     /**
      * 计算重量字段
      * 装机重 = 总重 - 架子车自重
-     * 货重 = 装机重 - ULD自重
+     * 货重 = 装机重 - ULD自重 - 耗材自重
      */
     private fun calculateWeights() {
         val total = totalWeight.value?.toDoubleOrNull() ?: 0.0
         val carW = dataBean.value?.carWeight ?: 0.0
         val uldW = dataBean.value?.uldWeight ?: 0.0
+        val consumeW = consumeWeight.value?.toDoubleOrNull() ?: 0.0
 
         val net = total - carW
-        val cargo = net - uldW
+        val cargo = net - uldW - consumeW
 
         netWeight.value = if (net > 0) net.toString() else "0"
         cargoWeight.value = if (cargo > 0) cargo.toString() else "0"
@@ -334,7 +345,8 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() {
         totalWeight.value = "0"
         netWeight.value = "0"
         cargoWeight.value = "0"
-        channel.value = ""
+        consumeWeight.value = "0"
+        // 通道号不清空：保留当前选择，与 Spinner 显示保持一致，后续称重沿用上一次的通道号
         printTag.value = false
 
         // 重置独立字段
@@ -437,6 +449,11 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() {
                 if (result.verifySuccess()) {
                     showToast("完成复磅")
 
+                    // 记住本次使用的通道号，后续称重默认选中
+                    if (bean.passagewayId.isNotEmpty()) {
+                        SharedPreferenceUtil.addString(KEY_LAST_PASSAGEWAY_ID, bean.passagewayId)
+                    }
+
                     // 如果勾选了打印挂签，则执行打印
                     if (printTag.value == true) {
                         executePrint()
@@ -519,6 +536,9 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() {
                 if (usingData != null && usingData.useId > 0) {
                     // 保存返回的数据，用于提交时传递
                     usingUldData = usingData
+                    // 耗材重量随该记录带回，需要重新参与货重计算
+                    consumeWeight.value = usingData.consumeWeight.toString()
+                    calculateWeights()
                 } else {
                     // 没有 useId，说明未组装，不可复磅
                     usingUldData = null

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingViewModel.kt

@@ -3,6 +3,7 @@ package com.lukouguoji.gjc.viewModel
 import android.app.Activity
 import android.content.Intent
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
 import com.lukouguoji.gjc.R
 import com.lukouguoji.gjc.holder.GjcBoxWeighingViewHolder
 import com.lukouguoji.module_base.base.BasePageViewModel
@@ -20,6 +21,7 @@ import com.lukouguoji.module_base.util.PrinterUtils
 import dev.utils.app.info.KeyValue
 import dev.utils.common.DateUtils
 import com.lukouguoji.module_base.ktx.formatDate
+import kotlinx.coroutines.launch
 
 /**
  * 国际出港板箱过磅 ViewModel
@@ -96,16 +98,19 @@ class GjcBoxWeighingViewModel : BasePageViewModel() {
             return
         }
 
-        // 校验多选
+        if (selectedItems.size == 1) {
-        if (selectedItems.size > 1) {
+            // 单条：保持原有打印路径
-            showToast("只能选择一条记录进行打印")
+            val bean = selectedItems.first()
-            return
+            BluetoothDialogModel().showCallBack {
-        }
+                PrinterUtils.printGjcBoxWeighing(bean)
-
+            }
-        // 执行打印
+        } else {
-        val bean = selectedItems.first()
+            // 多条：逐张串行批量打印
-        BluetoothDialogModel().showCallBack {
+            BluetoothDialogModel().showCallBack {
-            PrinterUtils.printGjcBoxWeighing(bean)
+                viewModelScope.launch {
+                    PrinterUtils.printGjcBoxWeighingBatch(selectedItems)
+                }
+            }
         }
     }
 

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcQueryViewModel.kt

@@ -25,13 +25,22 @@ import com.lukouguoji.module_base.ktx.formatDate
 class GjcQueryViewModel : BasePageViewModel() {
 
     // ==================== 搜索条件 ====================
+    val dateState = MutableLiveData("0")          // 日期类型（0：入库，1：离港）
     val flightDateStart = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())     // 航班日期起
     val flightDateEnd = MutableLiveData("")       // 航班日期止
     val agentId = MutableLiveData("")             // 代理ID
-    val outStatus = MutableLiveData("")           // 出库状态
+    val flightNo = MutableLiveData("")            // 航班号
     val waybillNo = MutableLiveData("")           // 运单号
 
     // ==================== 下拉列表 ====================
+    // 日期类型下拉列表（对应接口 dateState）
+    val dateStateList = MutableLiveData(
+        listOf(
+            KeyValue("入库", "0"),
+            KeyValue("离港", "1")
+        )
+    )
+
     // 代理下拉列表（从API获取）
     val agentList = MutableLiveData(listOf(KeyValue("全部", "")))
 
@@ -49,9 +58,10 @@ class GjcQueryViewModel : BasePageViewModel() {
     val itemLayoutId = R.layout.item_gjc_query
 
     // ==================== 统计数据 ====================
-    val totalCount = MutableLiveData("0")      // 合计票数
+    val totalCount = MutableLiveData("0")          // 合计票数
-    val totalPc = MutableLiveData("0")         // 总件数
+    val totalPc = MutableLiveData("0")             // 总件数
-    val totalWeight = MutableLiveData("0")     // 总重量
+    val totalWeight = MutableLiveData("0")         // 总重量
+    val totalFlightNumber = MutableLiveData("0")   // 航班航次
 
     // ==================== 筛选面板 ====================
     val filterVisible = MutableLiveData(false)
@@ -70,7 +80,7 @@ class GjcQueryViewModel : BasePageViewModel() {
 
     // ==================== 筛选条件 ====================
     val spCode = MutableLiveData("")           // 特码
-    val flightNo = MutableLiveData("")         // 航班号
+    val outStatus = MutableLiveData("")        // 出库状态
     val dest = MutableLiveData("")             // 目的港
     val awbType = MutableLiveData("")          // 运单类型
     val businessType = MutableLiveData("")     // 业务类型
@@ -79,11 +89,11 @@ class GjcQueryViewModel : BasePageViewModel() {
     // 是否有筛选条件（任意一个非空则为 true，用于筛选按钮红点）
     val hasFilter: MediatorLiveData<Boolean> = MediatorLiveData<Boolean>().apply {
         val update = { _: Any? ->
-            value = listOf(spCode, flightNo, dest, awbType, businessType, goodsCn)
+            value = listOf(spCode, outStatus, dest, awbType, businessType, goodsCn)
                 .any { !it.value.isNullOrEmpty() }
         }
         addSource(spCode, update)
-        addSource(flightNo, update)
+        addSource(outStatus, update)
         addSource(dest, update)
         addSource(awbType, update)
         addSource(businessType, update)
@@ -127,7 +137,7 @@ class GjcQueryViewModel : BasePageViewModel() {
      */
     fun resetFilter() {
         spCode.value = ""
-        flightNo.value = ""
+        outStatus.value = ""
         dest.value = ""
         awbType.value = ""
         businessType.value = ""
@@ -160,39 +170,32 @@ class GjcQueryViewModel : BasePageViewModel() {
      * 核心方法：调用API获取数据并转换PageInfo为BaseListBean
      */
     override fun getData() {
+        // 公共查询条件（列表与统计接口共用）
+        val commonParams = mapOf(
+            // 日期类型（0：入库，1：离港）+ 日期范围
+            "dateState" to dateState.value?.ifEmpty { null }?.toIntOrNull(),
+            "beginDate" to flightDateStart.value?.ifEmpty { null },
+            "endDate" to flightDateEnd.value?.ifEmpty { null },
+            "agentCode" to agentId.value?.ifEmpty { null },
+            "fno" to flightNo.value?.ifEmpty { null },
+            "wbNo" to waybillNo.value?.ifEmpty { null },
+            // 筛选面板条件
+            "spCode" to spCode.value?.ifEmpty { null },
+            "outState" to outStatus.value?.ifEmpty { null }?.toIntOrNull(),
+            "dest" to dest.value?.ifEmpty { null },
+            "awbType" to awbType.value?.ifEmpty { null },
+            "businessType" to businessType.value?.ifEmpty { null },
+            "goodsCn" to goodsCn.value?.ifEmpty { null }
+        )
+
         // 构建查询参数（列表接口）
-        val listParams = mapOf(
+        val listParams = (commonParams + mapOf(
             "pageNum" to pageModel.page,
-            "pageSize" to pageModel.limit,
+            "pageSize" to pageModel.limit
-            "beginDate" to flightDateStart.value!!.ifEmpty { null },
+        )).toRequestBody()
-            "endDate" to flightDateEnd.value!!.ifEmpty { null },
-            "agentCode" to agentId.value!!.ifEmpty { null },
-            "outState" to outStatus.value!!.ifEmpty { null },
-            "wbNo" to waybillNo.value!!.ifEmpty { null },
-            // 筛选条件（暂未使用）
-            "spCode" to spCode.value!!.ifEmpty { null },
-            "fno" to flightNo.value!!.ifEmpty { null },
-            "dest" to dest.value!!.ifEmpty { null },
-            "awbType" to awbType.value!!.ifEmpty { null },
-            "businessType" to businessType.value!!.ifEmpty { null },
-            "goodsCn" to goodsCn.value!!.ifEmpty { null }
-        ).toRequestBody()
 
         // 构建查询参数（统计接口 - 使用相同的搜索条件）
-        val totalParams = mapOf(
+        val totalParams = commonParams.toRequestBody()
-            "beginDate" to flightDateStart.value!!.ifEmpty { null },
-            "endDate" to flightDateEnd.value!!.ifEmpty { null },
-            "agentCode" to agentId.value!!.ifEmpty { null },
-            "outState" to outStatus.value!!.ifEmpty { null },
-            "wbNo" to waybillNo.value!!.ifEmpty { null },
-            // 筛选条件
-            "spCode" to spCode.value!!.ifEmpty { null },
-            "fno" to flightNo.value!!.ifEmpty { null },
-            "dest" to dest.value!!.ifEmpty { null },
-            "awbType" to awbType.value!!.ifEmpty { null },
-            "businessType" to businessType.value!!.ifEmpty { null },
-            "goodsCn" to goodsCn.value!!.ifEmpty { null }
-        ).toRequestBody()
 
         // 获取列表数据（显示loading）
         launchLoadingCollect({
@@ -213,6 +216,7 @@ class GjcQueryViewModel : BasePageViewModel() {
                 totalCount.value = (data?.wbNumber ?: 0).toString()
                 totalPc.value = (data?.totalPc ?: 0).toString()
                 totalWeight.value = (data?.totalWeight ?: 0.0).toString()
+                totalFlightNumber.value = (data?.flightNumber ?: 0).toString()
             }
         }
     }

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcWeighingStartViewModel.kt

@@ -66,6 +66,10 @@ class GjcWeighingStartViewModel : BaseViewModel() {
 
     val pageRemark = MutableLiveData("")    // 备注
 
+    // 托盘信息（运抵重量 = 地磅称重 - 托盘数量 × 托盘自重）
+    val trayNumber = MutableLiveData("")     // 托盘数量
+    val trayWeight = MutableLiveData("18")   // 托盘自重（默认18，可编辑）
+
     // 下拉选择数据源
     val channelList = MutableLiveData<List<KeyValue>>()        // 通道号列表
     val agentList = MutableLiveData<List<KeyValue>>()          // 代理人列表
@@ -82,11 +86,10 @@ class GjcWeighingStartViewModel : BaseViewModel() {
         // 获取传入的运单ID
         maWbId = intent.getLongExtra(Constant.Key.MAWB_ID, 0)
 
-        // 监听地磅称重输入，单向同步到运抵重量
+        // 监听地磅称重、托盘数量、托盘自重输入，自动计算运抵重量
-        diBangWeight.observe(activity as LifecycleOwner) { weight ->
+        diBangWeight.observe(activity as LifecycleOwner) { recalculateArriveWeight() }
-            // 同步到运抵重量（单向，不做反向同步）
+        trayNumber.observe(activity as LifecycleOwner) { recalculateArriveWeight() }
-            arriveWeight.value = weight ?: "0"
+        trayWeight.observe(activity as LifecycleOwner) { recalculateArriveWeight() }
-        }
 
         // 监听运抵重量变化，自动计算运抵体积
         arriveWeight.observe(activity as LifecycleOwner) { weightStr ->
@@ -113,6 +116,32 @@ class GjcWeighingStartViewModel : BaseViewModel() {
         }
     }
 
+    /**
+     * 自动计算运抵重量：地磅称重 - (托盘数量 × 托盘自重)
+     */
+    private fun recalculateArriveWeight() {
+        val gross = diBangWeight.value?.toDoubleOrNull() ?: 0.0
+        val trayTotal = getTrayTotalWeight()
+        val net = gross - trayTotal
+        arriveWeight.value = if (net > 0) formatWeight(net) else "0"
+    }
+
+    /**
+     * 托盘总重量 = 托盘数量 × 托盘自重
+     */
+    private fun getTrayTotalWeight(): Double {
+        val num = trayNumber.value?.toIntOrNull() ?: 0
+        val weight = trayWeight.value?.toDoubleOrNull() ?: 0.0
+        return num * weight
+    }
+
+    /**
+     * 重量格式化：最多保留两位小数，去掉多余的0
+     */
+    private fun formatWeight(value: Double): String {
+        return String.format("%.2f", value).trimEnd('0').trimEnd('.')
+    }
+
     /**
      * 加载通道号列表 (国际出港专用)
      */
@@ -391,6 +420,10 @@ class GjcWeighingStartViewModel : BaseViewModel() {
             passageWay = this@GjcWeighingStartViewModel.channelList.value?.firstOrNull{ it.value == channel.value }?.key ?: ""
             passageWayId = this@GjcWeighingStartViewModel.channel.value
 
+            // 托盘信息
+            trayNumber = this@GjcWeighingStartViewModel.trayNumber.value?.toIntOrNull()
+            trayTotalWeight = getTrayTotalWeight()
+
             remark = pageRemark.value
         }
 
@@ -417,6 +450,8 @@ class GjcWeighingStartViewModel : BaseViewModel() {
                     arrivePc.value = ""
                     arriveWeight.value = ""
                     arriveVolume.value = ""
+                    trayNumber.value = ""
+                    trayWeight.value = "18"
 
                     pageRemark.value = ""
 
@@ -499,6 +534,8 @@ class GjcWeighingStartViewModel : BaseViewModel() {
             "goodsCn" to bean.goodsCn,
             "businessType" to bean.businessType,
             "carId" to bean.carId,
+            "trayNumber" to trayNumber.value?.toIntOrNull(),
+            "trayTotalWeight" to getTrayTotalWeight(),
             "remark" to pageRemark.value,
             "checkIn" to "1",  // 收运状态设置为已收运
             "passageWayId" to channel.value,  // 通道号参数

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpArriveViewModel.kt

@@ -15,11 +15,15 @@ import com.lukouguoji.module_base.common.ConstantEvent
 import com.lukouguoji.module_base.http.net.NetApply
 import com.lukouguoji.module_base.impl.FlowBus
 import com.lukouguoji.module_base.ktx.commonAdapter
+import com.lukouguoji.module_base.ktx.CustomsResponseUrl
+import com.lukouguoji.module_base.ktx.ITEM_CLICK_TYPE_CUSTOMS_RESPONSE
+import com.lukouguoji.module_base.ktx.showCustomsResponse
 import com.lukouguoji.module_base.ktx.launchCollect
 import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
+import dev.utils.app.info.KeyValue
 import dev.utils.common.DateUtils
 import com.lukouguoji.module_base.ktx.formatDate
 import kotlinx.coroutines.launch
@@ -34,6 +38,16 @@ class IntExpArriveViewModel : BasePageViewModel() {
     val flightNo = MutableLiveData("")          // 航班号
     val waybillNo = MutableLiveData("")         // 运单号
     val hno = MutableLiveData("")               // 分单号
+    val arrivalStatus = MutableLiveData("")     // 运抵状态（0：未运抵，1：已运抵）
+
+    // 运抵状态下拉列表
+    val arrivalStatusList = MutableLiveData(
+        listOf(
+            KeyValue("全部", ""),
+            KeyValue("已运抵", "1"),
+            KeyValue("未运抵", "0")
+        )
+    )
 
     // ========== 统计信息 ==========
     val totalCount = MutableLiveData("0")       // 合计票数
@@ -301,7 +315,8 @@ class IntExpArriveViewModel : BasePageViewModel() {
             "fdate" to flightDate.value?.ifEmpty { null },
             "fno" to flightNo.value?.ifEmpty { null },
             "wbNo" to waybillNo.value?.ifEmpty { null },
-            "hno" to hno.value?.ifEmpty { null }
+            "hno" to hno.value?.ifEmpty { null },
+            "arrivalStatus" to arrivalStatus.value?.ifEmpty { null }
         )
 
         // 列表参数 (含分页)
@@ -332,4 +347,14 @@ class IntExpArriveViewModel : BasePageViewModel() {
             }
         }
     }
+
+    /**
+     * 列表项点击分发：侧滑「回执」按钮 → 查询海关回执并跳转只读详情页
+     */
+    override fun onItemClick(position: Int, type: Int) {
+        val bean = pageModel.rv?.commonAdapter()?.getItem(position) as? GjcMaWb ?: return
+        if (type == ITEM_CLICK_TYPE_CUSTOMS_RESPONSE) {
+            showCustomsResponse(CustomsResponseUrl.INT_EXP_ARRIVE, bean.prefix, bean.no, "出港运抵回执")
+        }
+    }
 }

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt

@@ -2,6 +2,7 @@ package com.lukouguoji.gjc.viewModel
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import com.alibaba.fastjson.JSONArray
 import com.lukouguoji.gjc.R
 import com.lukouguoji.gjc.holder.AssembleInfoViewHolder
 import com.lukouguoji.gjc.holder.AssemblePositionViewHolder
@@ -16,8 +17,11 @@ import com.lukouguoji.module_base.impl.FlowBus
 import com.lukouguoji.module_base.ktx.launchCollect
 import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.showToast
+import com.lukouguoji.module_base.ktx.toJson
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
+import com.lukouguoji.module_base.util.Common
+import com.lukouguoji.module_base.util.DictUtils
 import dev.utils.app.info.KeyValue
 import kotlinx.coroutines.launch
 
@@ -75,6 +79,12 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
     // ========== 组装人列表 ==========
     val assemblerList = MutableLiveData<List<KeyValue>>(emptyList())
 
+    // ========== BUP选项（0：否；1：是），默认否 ==========
+    val bupFlagList = listOf(KeyValue("否", "0"), KeyValue("是", "1"))
+
+    // ========== 板型选项（字典；支持下拉选择，也支持手动输入）==========
+    val boardTypeList = MutableLiveData<List<KeyValue>>(emptyList())
+
     // ========== 标记位，避免重复查询 ==========
     private var lastQueriedUldNo = ""
 
@@ -107,6 +117,12 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
      */
     val isLoadEnabled = MutableLiveData(true)
 
+    /**
+     * 本页面是否已至少一次装货成功
+     * 首次装货成功前，运单列表件数/重量列显示总数；成功后显示“剩余/总数”
+     */
+    val hasLoadedOnce = MutableLiveData(false)
+
     /**
      * 卸货按钮启用状态（编辑模式时启用）
      */
@@ -274,6 +290,27 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
         ScanModel.startScan(getTopActivity(), Constant.RequestCode.WAYBILL)
     }
 
+    /**
+     * 待组装运单接口数据转右侧运单列表 Bean
+     * 同时带上已组装件数/重量与“剩余/总数”显示开关（首次装货成功后生效）
+     */
+    private fun GjcWarehouse.toAssembleWaybillBean(): AssembleWaybillBean {
+        val warehouse = this
+        return AssembleWaybillBean().apply {
+            waybillNo = warehouse.wbNo
+            pieces = warehouse.pc.toString()
+            weight = String.format("%.1f", warehouse.weight)
+            flight = warehouse.flight
+            fno = warehouse.fno
+            fdate = warehouse.fdate
+            whId = warehouse.whId  // 运单ID（用于接口调用）
+            isMarked = false
+            checkInPieces = warehouse.checkInPc
+            checkInWeight = warehouse.checkInWeight
+            showRemaining = hasLoadedOnce.value == true
+        }
+    }
+
     /**
      * 加载待组装运单列表
      */
@@ -285,18 +322,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
             onSuccess = { result ->
                 // 数据转换: GjcWarehouse -> AssembleWaybillBean
                 val warehouseList = result.data ?: mutableListOf()
-                val waybillBeanList = warehouseList.map { warehouse ->
+                val waybillBeanList = warehouseList.map { it.toAssembleWaybillBean() }.toMutableList()
-                    AssembleWaybillBean().apply {
-                        waybillNo = warehouse.wbNo
-                        pieces = warehouse.pc.toString()
-                        weight = String.format("%.1f", warehouse.weight)
-                        flight = warehouse.flight
-                        fno = warehouse.fno
-                        fdate = warehouse.fdate
-                        whId = warehouse.whId  // 添加运单ID
-                        isMarked = false
-                    }
-                }.toMutableList()
 
                 // 更新列表
                 waybillList.value = waybillBeanList
@@ -335,18 +361,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
         launchLoadingCollect({ NetApply.api.queryWaitingAssemble("") }) {
             onSuccess = { result ->
                 val warehouseList = result.data ?: mutableListOf()
-                val waybillBeanList = warehouseList.map { warehouse ->
+                val waybillBeanList = warehouseList.map { it.toAssembleWaybillBean() }.toMutableList()
-                    AssembleWaybillBean().apply {
-                        waybillNo = warehouse.wbNo
-                        pieces = warehouse.pc.toString()
-                        weight = String.format("%.1f", warehouse.weight)
-                        flight = warehouse.flight
-                        fno = warehouse.fno
-                        fdate = warehouse.fdate
-                        whId = warehouse.whId  // 添加运单ID
-                        isMarked = false
-                    }
-                }.toMutableList()
 
                 waybillList.value = waybillBeanList
 
@@ -399,6 +414,37 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
     }
 
 
+    /**
+     * 加载板型选项列表（字典）
+     */
+    fun loadBoardTypeList() {
+        DictUtils.getBoardTypeList { boardTypeList.value = it }
+    }
+
+    /**
+     * 板型下拉图标点击：弹出选项列表，选中后回填到板型输入框（回填后仍可手动修改）
+     */
+    fun onBoardTypeSelectClick() {
+        val list = boardTypeList.value ?: emptyList()
+        if (list.isEmpty()) {
+            showToast("暂无板型选项，请手动输入")
+            return
+        }
+        val jsonArray = JSONArray.parseArray(
+            list.map { mapOf("name" to it.key, "code" to it.value) }.toJson(false)
+        )
+        Common.singleSelect(
+            getTopActivity(),
+            "选择板型",
+            jsonArray,
+            uldInfo.value?.boardType
+        ) { position, _ ->
+            uldInfo.value = uldInfo.value?.apply {
+                boardType = list.getOrNull(position)?.value ?: ""
+            }
+        }
+    }
+
     /**
      * ULD编号输入完成时调用
      */
@@ -433,6 +479,10 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
                         }
                         // 保存useId（用于装货/卸货接口）
                         useId = uldBean.useId
+                        // 回填 IMP代码 / 板型 / BUP：服务端有值时覆盖（修改模式回显），为空时保留当前输入
+                        if (!uldBean.dgrCode.isNullOrEmpty()) dgrCode = uldBean.dgrCode
+                        if (!uldBean.boardType.isNullOrEmpty()) boardType = uldBean.boardType
+                        if (!uldBean.bupFlag.isNullOrEmpty()) bupFlag = uldBean.bupFlag
                     }
 
                     // 【新增】从ULD信息提取航班信息
@@ -601,9 +651,17 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
 
         val loadAreaId = selectedPosition.value?.positionCode?.trim() ?: ""
 
+        // IMP代码 / 板型 / BUP（接口新增字段，useInfo 与顶层参数均需携带）
+        val dgrCode = uldInfo.value?.dgrCode?.trim() ?: ""
+        val boardType = uldInfo.value?.boardType?.trim() ?: ""
+        val bupFlag = uldInfo.value?.bupFlag?.ifEmpty { "0" } ?: "0"
+
         // 2. 构建useInfo（ULD信息）
         val useInfo = mapOf(
             "uld" to uldNo,
+            "dgrCode" to dgrCode.ifEmpty { null },
+            "boardType" to boardType.ifEmpty { null },
+            "bupFlag" to bupFlag,
             "consumeWeight" to materialWeight.toDoubleOrNull(),
             "status" to when (uldInfo.value?.uldStatus) {
                 "正常" -> "0"
@@ -688,6 +746,9 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
             "ldId" to operatorValue,
             "loadArea" to loadArea,
             "loadAreaId" to loadAreaId.ifEmpty { null },  // 组装位置ID
+            "dgrCode" to dgrCode.ifEmpty { null },        // IMP代码
+            "boardType" to boardType.ifEmpty { null },    // 板型
+            "bupFlag" to bupFlag,                         // BUP选项（0：否；1：是）
             "useInfo" to useInfo,
             "wbInfo" to wbInfo,
             "userId" to SharedPreferenceUtil.getString(Constant.Share.account)
@@ -724,6 +785,11 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
     ) {
         showToast("${operationName}成功")
 
+        // 首次装货成功后，运单列表件数/重量列切换为“剩余/总数”显示
+        if (isLoad) {
+            hasLoadedOnce.value = true
+        }
+
         // 发送刷新事件，通知出港组装列表页面更新数据
         viewModelScope.launch {
             FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
@@ -780,18 +846,7 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
         launchLoadingCollect({ NetApply.api.queryWaitingAssemble(wbNo) }) {
             onSuccess = { result ->
                 val warehouseList = result.data ?: mutableListOf()
-                val waybillBeanList = warehouseList.map { warehouse ->
+                val waybillBeanList = warehouseList.map { it.toAssembleWaybillBean() }.toMutableList()
-                    AssembleWaybillBean().apply {
-                        waybillNo = warehouse.wbNo
-                        pieces = warehouse.pc.toString()
-                        weight = String.format("%.1f", warehouse.weight)
-                        flight = warehouse.flight
-                        fno = warehouse.fno
-                        fdate = warehouse.fdate
-                        whId = warehouse.whId
-                        isMarked = false
-                    }
-                }.toMutableList()
 
                 waybillList.value = waybillBeanList
             }

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt

@@ -15,6 +15,9 @@ import com.lukouguoji.module_base.common.ConstantEvent
 import com.lukouguoji.module_base.http.net.NetApply
 import com.lukouguoji.module_base.impl.FlowBus
 import com.lukouguoji.module_base.ktx.commonAdapter
+import com.lukouguoji.module_base.ktx.CustomsResponseUrl
+import com.lukouguoji.module_base.ktx.ITEM_CLICK_TYPE_CUSTOMS_RESPONSE
+import com.lukouguoji.module_base.ktx.showCustomsResponse
 import com.lukouguoji.module_base.ktx.launchCollect
 import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.noNull
@@ -310,4 +313,14 @@ class IntExpLoadViewModel : BasePageViewModel() {
             }
         }
     }
+
+    /**
+     * 列表项点击分发：侧滑「回执」按钮 → 查询海关回执并跳转只读详情页
+     */
+    override fun onItemClick(position: Int, type: Int) {
+        val bean = pageModel.rv?.commonAdapter()?.getItem(position) as? GjcExportLoad ?: return
+        if (type == ITEM_CLICK_TYPE_CUSTOMS_RESPONSE) {
+            showCustomsResponse(CustomsResponseUrl.INT_EXP_LOAD, bean.prefix, bean.no, "出港装载回执")
+        }
+    }
 }

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpMoveEditViewModel.kt

@@ -0,0 +1,164 @@
+package com.lukouguoji.gjc.viewModel
+
+import android.content.Intent
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import androidx.recyclerview.widget.RecyclerView
+import com.lukouguoji.gjc.R
+import com.lukouguoji.module_base.base.BaseViewModel
+import com.lukouguoji.module_base.bean.FileBean
+import com.lukouguoji.module_base.bean.GjcMaWb
+import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.common.ConstantEvent
+import com.lukouguoji.module_base.common.DetailsPageType
+import com.lukouguoji.module_base.http.net.NetApply
+import com.lukouguoji.module_base.impl.FlowBus
+import com.lukouguoji.module_base.impl.ImageSelectNewViewHolder
+import com.lukouguoji.module_base.interfaces.IOnItemClickListener
+import com.lukouguoji.module_base.ktx.commonAdapter
+import com.lukouguoji.module_base.ktx.launchLoadingCollect
+import com.lukouguoji.module_base.ktx.showToast
+import com.lukouguoji.module_base.ktx.toRequestBody
+import com.lukouguoji.module_base.util.MediaUtil
+import com.lukouguoji.module_base.util.UploadUtil
+import kotlinx.coroutines.launch
+
+/**
+ * 国际出港移库编辑/详情 ViewModel
+ * 编辑模式仅支持修改备注与交接图片
+ */
+class IntExpMoveEditViewModel : BaseViewModel(), IOnItemClickListener {
+
+    val pageType = MutableLiveData(DetailsPageType.Details)
+    private var maWbId: Long = 0L
+
+    val dataBean = MutableLiveData(GjcMaWb())
+
+    // 备注单独用 LiveData 双向绑定，避免修改 data class 属性后需重新赋值
+    val remark = MutableLiveData("")
+
+    // 图片列表
+    val imageList = MutableLiveData<MutableList<FileBean>>(mutableListOf())
+
+    // 图片适配器配置
+    val imageItemLayoutId = R.layout.item_image_select_new
+    val imageItemViewHolder = ImageSelectNewViewHolder::class.java
+
+    // 详情模式下无图片时显示占位提示
+    val showNoImage = MutableLiveData(false)
+
+    // 图片 RecyclerView 引用（用于从 adapter 实时获取图片）
+    var rvImages: RecyclerView? = null
+
+    fun initOnCreated(intent: Intent) {
+        pageType.value = DetailsPageType.valueOf(
+            intent.getStringExtra(Constant.Key.PAGE_TYPE) ?: DetailsPageType.Details.name
+        )
+        maWbId = intent.getStringExtra(Constant.Key.ID)?.toLongOrNull() ?: 0L
+        loadData()
+    }
+
+    private fun loadData() {
+        launchLoadingCollect({ NetApply.api.getIntExpMoveDetail(maWbId) }) {
+            onSuccess = {
+                val bean = it.data ?: GjcMaWb()
+                // 详情接口 wbNo 可能为空，回退为 前缀 + 运单号
+                if (bean.wbNo.isNullOrEmpty()) {
+                    bean.wbNo = (bean.prefix ?: "") + (bean.no ?: "")
+                }
+                dataBean.value = bean
+                remark.value = bean.remark ?: ""
+
+                // 处理图片列表（同时保留缩略图和原图信息，确保二次编辑时不丢失）
+                val picList = (bean.pic ?: "").split(",").filter { p -> p.isNotEmpty() }
+                val originalPicList = (bean.originalPic ?: "").split(",").filter { p -> p.isNotEmpty() }
+                val images = if (picList.isNotEmpty()) {
+                    picList.mapIndexed { index, picUrl ->
+                        val originalUrl = originalPicList.getOrElse(index) { picUrl }
+                        FileBean(
+                            path = MediaUtil.fillUrl(originalUrl),
+                            url = picUrl,
+                            originalPic = originalUrl
+                        )
+                    }.toMutableList()
+                } else {
+                    originalPicList.map { url ->
+                        FileBean(path = MediaUtil.fillUrl(url), url = url, originalPic = url)
+                    }.toMutableList()
+                }
+
+                // 编辑模式添加空 FileBean 用于显示“添加照片”按钮
+                if (pageType.value == DetailsPageType.Modify) {
+                    images.add(FileBean())
+                }
+
+                imageList.value = images
+
+                // 详情模式下无图片时显示占位提示
+                showNoImage.value = pageType.value == DetailsPageType.Details && images.isEmpty()
+            }
+        }
+    }
+
+    /**
+     * 提交保存（只保存备注和图片）
+     */
+    fun submit() {
+        // 从 adapter 实时获取所有非空图片（ViewHolder 新增图片直接操作 adapter items）
+        val allItems = (rvImages?.commonAdapter()?.items as? List<*>)
+            ?.filterIsInstance<FileBean>() ?: imageList.value!!
+        val images = allItems.filter { it.path.isNotEmpty() }
+
+        if (images.size > 7) {
+            showToast("最多上传7张图片")
+            return
+        }
+
+        launchLoadingCollect({
+            // 上传本地新图片；已上传的图片保持原有 url 与 originalPic
+            images.forEach { fileBean ->
+                if (fileBean.url.isEmpty()) {
+                    // UploadUtil 返回：newName=原图(较大)，zipFileName=缩略图(较小)
+                    // FileBean.url 用作缩略图标识，FileBean.originalPic 用作原图标识
+                    val data = UploadUtil.upload(fileBean.path).data
+                    fileBean.url = data?.zipFileName ?: ""
+                    fileBean.originalPic = data?.newName ?: ""
+                }
+            }
+
+            val params = mapOf(
+                "maWbId" to maWbId,
+                "remark" to (remark.value ?: ""),
+                "picNumber" to images.size.toString(),
+                "pic" to images.joinToString(",") { MediaUtil.removeUrl(it.url) },
+                "originalPic" to images.joinToString(",") { MediaUtil.removeUrl(it.originalPic) },
+            ).toRequestBody(removeEmptyOrNull = true)
+
+            NetApply.api.updateIntExpMove(params)
+        }) {
+            onSuccess = {
+                showToast("保存成功")
+                viewModelScope.launch {
+                    FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                }
+                getTopActivity().finish()
+            }
+        }
+    }
+
+    fun cancel() {
+        getTopActivity().finish()
+    }
+
+    /**
+     * 处理图片删除点击事件
+     */
+    override fun onItemClick(position: Int, type: Int) {
+        if (type == R.id.iv_delete) {
+            val adapter = rvImages?.commonAdapter() ?: return
+            if (position < adapter.items.size) {
+                adapter.removeItem(position)
+            }
+        }
+    }
+}

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpOutHandoverViewModel.kt

@@ -106,6 +106,36 @@ class IntExpOutHandoverViewModel : BasePageViewModel() {
         }
     }
 
+    /**
+     * 允许装机（多选，批量操作）
+     */
+    fun allowLoadClick() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjcUldUseBean> ?: return
+        val selectedItems = list.filter { it.isSelected }
+
+        if (selectedItems.isEmpty()) {
+            showToast("请选择要允许装机的ULD")
+            return
+        }
+
+        if (selectedItems.all { it.isAllowLoad }) {
+            showToast("所选ULD均已允许装机")
+            return
+        }
+
+        val requestData = selectedItems.toRequestBody()
+
+        launchLoadingCollect({ NetApply.api.allowLoading(requestData) }) {
+            onSuccess = {
+                showToast("允许装机成功")
+                viewModelScope.launch {
+                    FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                }
+                refresh()
+            }
+        }
+    }
+
     /**
      * 待配运按钮点击
      */

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpStorageUseViewModel.kt

@@ -140,9 +140,10 @@ class IntExpStorageUseViewModel : BasePageViewModel() {
     /**
      * 执行清仓操作
      * @param clearNormal 清仓正常（"0"或"1"）
+     * @param clearRemark 清仓备注（选填）
      * @param maWbListForClear 包含选中子列表项的主列表数据
      */
-    fun performClear(clearNormal: String, maWbListForClear: List<GjcMaWb>) {
+    fun performClear(clearNormal: String, clearRemark: String, maWbListForClear: List<GjcMaWb>) {
         if (maWbListForClear.isEmpty()) {
             showToast("请至少选择一个库位")
             return
@@ -151,6 +152,7 @@ class IntExpStorageUseViewModel : BasePageViewModel() {
         // 构建请求参数：完整的主子列表结构
         val params = mapOf(
             "clearNormal" to clearNormal,
+            "clearRemark" to clearRemark.ifEmpty { null },
             "maWbList" to maWbListForClear
         ).toRequestBody()
 

module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt

@@ -16,6 +16,9 @@ import com.lukouguoji.module_base.common.ConstantEvent
 import com.lukouguoji.module_base.http.net.NetApply
 import com.lukouguoji.module_base.impl.FlowBus
 import com.lukouguoji.module_base.ktx.commonAdapter
+import com.lukouguoji.module_base.ktx.CustomsResponseUrl
+import com.lukouguoji.module_base.ktx.ITEM_CLICK_TYPE_CUSTOMS_RESPONSE
+import com.lukouguoji.module_base.ktx.showCustomsResponse
 import com.lukouguoji.module_base.ktx.launchCollect
 import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.showToast
@@ -42,7 +45,8 @@ class IntExpTallyViewModel : BasePageViewModel() {
     val totalWeight = MutableLiveData("0")      // 总重量
 
     // ========== 全选状态 ==========
-    val isAllChecked = MutableLiveData(false)
+    val isAllChecked = MutableLiveData(false)        // 主单全选状态
+    val isAllHaWbChecked = MutableLiveData(false)    // 分单全选状态（仅统计允许全选的主单下的分单）
 
     fun onItemCheckChanged() {
         updateCheckAllStatus()
@@ -51,6 +55,10 @@ class IntExpTallyViewModel : BasePageViewModel() {
     fun updateCheckAllStatus() {
         val list = pageModel.rv?.commonAdapter()?.items as? List<GjcMaWb> ?: return
         isAllChecked.value = list.isNotEmpty() && list.all { it.checked.get() }
+
+        // 分单全选状态：只看允许全选的主单下的分单
+        val eligibleHaWbList = list.filter { it.canCheckAllHaWb }.flatMap { it.haWbList ?: emptyList() }
+        isAllHaWbChecked.value = eligibleHaWbList.isNotEmpty() && eligibleHaWbList.all { it.checked.get() }
     }
 
     // ========== 全局展开状态 ==========
@@ -86,6 +94,43 @@ class IntExpTallyViewModel : BasePageViewModel() {
         pageModel.rv?.commonAdapter()?.notifyDataSetChanged()
     }
 
+    /**
+     * 分单全选按钮点击 (只切换分单的选中状态，主单选择独立)
+     * 规则：主单存在分批申报（接口 allTally=0）时，不允许选中该主单下的分单；
+     * 只有主单全部申报完毕（allTally=1）才允许全选其分单。
+     */
+    fun checkAllHaWbClick() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjcMaWb> ?: return
+
+        val shouldCheckAll = !isAllHaWbChecked.value!!
+        var eligibleCount = 0   // 允许全选的分单数
+        var skippedMaWbCount = 0 // 因未全部申报而跳过的主单数
+
+        list.forEach { maWb ->
+            val haWbList = maWb.haWbList
+            if (haWbList.isNullOrEmpty()) return@forEach
+            if (maWb.canCheckAllHaWb) {
+                eligibleCount += haWbList.size
+                haWbList.forEach { it.checked.set(shouldCheckAll) }
+            } else if (shouldCheckAll) {
+                // 主单未全部申报完毕，跳过其分单（保持原有选中状态不变）
+                skippedMaWbCount++
+            }
+        }
+
+        isAllHaWbChecked.value = shouldCheckAll && eligibleCount > 0
+
+        if (shouldCheckAll) {
+            if (eligibleCount == 0) {
+                showToast("暂无可全选的分单，主单需全部申报完毕后才可全选其分单")
+            } else if (skippedMaWbCount > 0) {
+                showToast("有${skippedMaWbCount}票主单未全部申报完毕，其分单未选中")
+            }
+        }
+
+        pageModel.rv?.commonAdapter()?.notifyDataSetChanged()
+    }
+
     /**
      * 切换全局展开/收起状态
      */
@@ -344,4 +389,14 @@ class IntExpTallyViewModel : BasePageViewModel() {
             }
         }
     }
+
+    /**
+     * 列表项点击分发：侧滑「回执」按钮 → 查询海关回执并跳转只读详情页
+     */
+    override fun onItemClick(position: Int, type: Int) {
+        val bean = pageModel.rv?.commonAdapter()?.getItem(position) as? GjcMaWb ?: return
+        if (type == ITEM_CLICK_TYPE_CUSTOMS_RESPONSE) {
+            showCustomsResponse(CustomsResponseUrl.INT_EXP_TALLY, bean.prefix, bean.no, "出港理货回执")
+        }
+    }
 }

module_gjc/src/main/res/layout/activity_gjc_assemble_weight_edit.xml

@@ -139,6 +139,29 @@
                         android:textSize="16sp" />
                 </LinearLayout>
 
+                <!-- 耗材重量 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_weight="1"
+                    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.consumeWeight}"
+                        android:textColor="@color/text_normal"
+                        android:textSize="16sp" />
+                </LinearLayout>
+
             </LinearLayout>
         </LinearLayout>
 

module_gjc/src/main/res/layout/activity_gjc_box_weighing_add.xml

@@ -259,7 +259,7 @@
 
                     </LinearLayout>
 
-                    <!-- 第5行：架子车自重、ULD自重、货重（绿色只读） -->
+                    <!-- 第5行：架子车自重、ULD自重、耗材重量（只读） -->
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -289,10 +289,10 @@
 
                         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                             enable="@{false}"
-                            title='@{"货重"}'
+                            title='@{"耗材重量"}'
                             titleLength="@{5}"
                             type="@{DataLayoutType.INPUT}"
-                            value='@{viewModel.cargoWeight}'
+                            value='@{viewModel.consumeWeight}'
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="15dp"
@@ -300,7 +300,7 @@
 
                     </LinearLayout>
 
-                    <!-- 第6行：航班日期、航班号、目的港 -->
+                    <!-- 第6行：航班日期、航班号、货重（绿色只读） -->
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -331,11 +331,11 @@
                             android:layout_weight="1" />
 
                         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                            hint='@{"请输入目的港"}'
+                            enable="@{false}"
-                            title='@{"目的港"}'
+                            title='@{"货重"}'
                             titleLength="@{5}"
                             type="@{DataLayoutType.INPUT}"
-                            value='@={viewModel.dataBean.fdest}'
+                            value='@{viewModel.cargoWeight}'
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="15dp"
@@ -343,7 +343,32 @@
 
                     </LinearLayout>
 
-                    <!-- 第7行：备注 -->
+                    <!-- 第7行：目的港（占 1/3 宽度） -->
+                    <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.fdest}'
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+
+                        <!-- 占位：保持目的港与上方各行第一列同宽 -->
+                        <Space
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:layout_weight="2" />
+
+                    </LinearLayout>
+
+                    <!-- 第8行：备注（整行） -->
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"

module_gjc/src/main/res/layout/activity_gjc_query.xml

@@ -42,6 +42,16 @@
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
+                    <!-- 日期类型（入库/离港） -->
+                    <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.7"
+                        hint='@{"请选择日期类型"}'
+                        list="@{viewModel.dateStateList}"
+                        type="@{SearchLayoutType.SPINNER}"
+                        value="@={viewModel.dateState}" />
+
                     <!-- 航班日期起 -->
                     <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
                         android:layout_width="0dp"
@@ -72,15 +82,15 @@
                         type="@{SearchLayoutType.SPINNER}"
                         value="@={viewModel.agentId}" />
 
-                    <!-- 出库状态 -->
+                    <!-- 航班号 -->
                     <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                        android:id="@+id/flight_no_search"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        hint='@{"请选择出库状态"}'
+                        hint='@{"请输入航班号"}'
-                        list="@{viewModel.outStatusList}"
+                        type="@{SearchLayoutType.INPUT}"
-                        type="@{SearchLayoutType.SPINNER}"
+                        value="@={viewModel.flightNo}" />
-                        value="@={viewModel.outStatus}" />
 
                     <!-- 运单号 -->
                     <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
@@ -204,6 +214,16 @@
                             android:textStyle="bold"
                             tools:text="总重量：100" />
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="20dp"
+                            android:text='@{`航班航次：` + viewModel.totalFlightNumber}'
+                            android:textColor="@color/bottom_tool_tips_text_color"
+                            android:textSize="16sp"
+                            android:textStyle="bold"
+                            tools:text="航班航次：2" />
+
                     </LinearLayout>
 
                 </LinearLayout>

module_gjc/src/main/res/layout/activity_gjc_weighing_start.xml

@@ -313,7 +313,45 @@
 
                     </LinearLayout>
 
-                    <!-- 第6行：运抵件数、运抵重量、运抵体积 -->
+                    <!-- 第6行：托盘数量、托盘自重（用于自动计算运抵重量） -->
+                    <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='@{"请输入托盘数量"}'
+                            inputType="@{android.text.InputType.TYPE_CLASS_NUMBER}"
+                            title='@{"托盘数量"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.trayNumber}'
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            hint='@{"请输入托盘自重"}'
+                            inputType="@{android.text.InputType.TYPE_CLASS_NUMBER | android.text.InputType.TYPE_NUMBER_FLAG_DECIMAL}"
+                            title='@{"托盘自重"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.trayWeight}'
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_weight="1" />
+
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="15dp"
+                            android:layout_weight="1" />
+
+                    </LinearLayout>
+
+                    <!-- 第7行：运抵件数、运抵重量、运抵体积 -->
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -356,7 +394,7 @@
 
                     </LinearLayout>
 
-                    <!-- 第7行：托盘车号、托盘车自重、业务类型 -->
+                    <!-- 第8行：平板车、平板车自重、业务类型 -->
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -364,9 +402,9 @@
                         android:orientation="horizontal">
 
                         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                            hint='@{"请输入托盘车号"}'
+                            hint='@{"请输入平板车号"}'
                             setRefreshCallBack="@{viewModel::onCarIdInputComplete}"
-                            title='@{"托盘车号"}'
+                            title='@{"平 板 车"}'
                             titleLength="@{5}"
                             type="@{DataLayoutType.INPUT}"
                             value='@={viewModel.maWbBean.carId}'
@@ -376,7 +414,7 @@
 
                         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                             enable="@{false}"
-                            title='@{"托盘车自重"}'
+                            title='@{"平板车自重"}'
                             titleLength="@{5}"
                             type="@{DataLayoutType.INPUT}"
                             value='@{viewModel.carWeight}'
@@ -399,7 +437,7 @@
 
                     </LinearLayout>
 
-                    <!-- 第8行：备注 -->
+                    <!-- 第9行：备注 -->
                     <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
                         hint='@{"请输入备注"}'
                         inputHeight="@{80}"

module_gjc/src/main/res/layout/activity_int_exp_arrive.xml

@@ -79,6 +79,16 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1" />
 
+            <!-- 运抵状态 -->
+            <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                hint='@{"请选择运抵状态"}'
+                list="@{viewModel.arrivalStatusList}"
+                type="@{SearchLayoutType.SPINNER}"
+                value="@={viewModel.arrivalStatus}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
             <!-- 搜索按钮 -->
             <LinearLayout
                 android:layout_width="0dp"
@@ -151,7 +161,7 @@
 
                 <ImageView
                     android:id="@+id/checkIcon"
-                    setIVCheckAllImage="@{viewModel.isAllChecked}"
+                    setIVCheckAllImage="@{viewModel.isAllChecked}"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginEnd="5dp"

module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml

@@ -190,7 +190,7 @@
                             android:layout_width="120dp"
                             android:layout_height="wrap_content"
                             android:gravity="center"
-                            android:text="件数"
+                            android:text='@{viewModel.hasLoadedOnce ? "剩余件数/总件数" : "件数"}'
                             android:textColor="@color/text_normal"
                             android:textSize="13sp" />
 
@@ -199,7 +199,7 @@
                             android:layout_width="120dp"
                             android:layout_height="wrap_content"
                             android:gravity="center"
-                            android:text="重量"
+                            android:text='@{viewModel.hasLoadedOnce ? "剩余重量/总重量" : "重量"}'
                             android:textColor="@color/text_normal"
                             android:textSize="13sp" />
 
@@ -293,6 +293,54 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1" />
                     </LinearLayout>
+
+                    <!-- 第二行：IMP代码、板型（下拉选择 + 手动输入）、BUP -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:id="@+id/impCodeInput"
+                            enable="@{true}"
+                            hint='@{"请输入IMP代码"}'
+                            required="@{false}"
+                            title='@{"IMP代码："}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value="@={viewModel.uldInfo.dgrCode}"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:id="@+id/boardTypeInput"
+                            enable="@{true}"
+                            hint='@{"请输入或选择"}'
+                            required="@{false}"
+                            setOnIconClickListener="@{(v) -> viewModel.onBoardTypeSelectClick()}"
+                            setTextAllCaps="@{true}"
+                            title='@{"板型："}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value="@={viewModel.uldInfo.boardType}"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            enable="@{true}"
+                            list="@{viewModel.bupFlagList}"
+                            required="@{false}"
+                            title='@{"BUP："}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.SPINNER}"
+                            value="@={viewModel.uldInfo.bupFlag}"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+                    </LinearLayout>
                 </LinearLayout>
 
                 <!-- 运单信息卡片 -->

module_gjc/src/main/res/layout/activity_int_exp_move_edit.xml

@@ -0,0 +1,259 @@
+<?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">
+
+    <data>
+
+        <import type="com.lukouguoji.module_base.ui.weight.data.layout.DataLayoutType" />
+
+        <import type="com.lukouguoji.module_base.common.DetailsPageType" />
+
+        <import type="android.view.View" />
+
+        <variable
+            name="viewModel"
+            type="com.lukouguoji.gjc.viewModel.IntExpMoveEditViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_f2"
+        android:orientation="vertical">
+
+        <include layout="@layout/title_tool_bar" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="15dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_white_radius_8"
+                    android:orientation="vertical"
+                    android:padding="15dp">
+
+                    <!-- 第一行：运单号、件数、重量（均只读） -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"运单号"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.wbNo}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"件数"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.pc == null ? "" : String.valueOf(viewModel.dataBean.pc)}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"重量"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.weight == null ? "" : String.valueOf(viewModel.dataBean.weight)}' />
+
+                    </LinearLayout>
+
+                    <!-- 第二行：特码、代理人、品名（均只读） -->
+                    <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
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"特码"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.spCode}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"代理人"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.agentCode}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"品名"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.goodsCn == null || viewModel.dataBean.goodsCn.isEmpty() ? viewModel.dataBean.goods : viewModel.dataBean.goodsCn}' />
+
+                    </LinearLayout>
+
+                    <!-- 第三行：出港航班、出运路径、运单类型（均只读） -->
+                    <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
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"出港航班"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.flightInfo}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"出运路径"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.rangeText}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"运单类型"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.awbName}' />
+
+                    </LinearLayout>
+
+                    <!-- 第四行：承运人（只读）、备注（编辑模式可编辑） -->
+                    <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
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            enable="@{false}"
+                            title='@{"承运人"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@{viewModel.dataBean.by1}' />
+
+                        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="2"
+                            enable="@{viewModel.pageType != DetailsPageType.Details}"
+                            hint='@{"请输入备注"}'
+                            title='@{"备注"}'
+                            titleLength="@{5}"
+                            type="@{DataLayoutType.INPUT}"
+                            value='@={viewModel.remark}' />
+
+                    </LinearLayout>
+
+                    <!-- 交接图片区域：label 在左，图片在右 -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="15dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text="交接图片"
+                            android:textColor="@color/text_gray"
+                            completeSpace="@{5}" />
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/rv_images"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:overScrollMode="never"
+                            itemLayoutId="@{viewModel.imageItemLayoutId}"
+                            viewHolder="@{viewModel.imageItemViewHolder}"
+                            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                            app:spanCount="9" />
+
+                    </LinearLayout>
+
+                    <!-- 详情模式下无图片时的占位提示 -->
+                    <TextView
+                        android:id="@+id/tv_no_image"
+                        android:layout_width="match_parent"
+                        android:layout_height="60dp"
+                        android:gravity="center"
+                        android:text="暂无图片"
+                        android:textColor="@color/text_gray"
+                        android:textSize="14sp"
+                        android:visibility="@{viewModel.showNoImage ? View.VISIBLE : View.GONE}" />
+
+                </LinearLayout>
+
+                <!-- 底部按钮（详情模式不显示） -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:layout_marginBottom="15dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:visibility="@{viewModel.pageType != DetailsPageType.Details ? View.VISIBLE : View.GONE}">
+
+                    <TextView
+                        style="@style/tv_bottom_btn"
+                        android:layout_width="120dp"
+                        android:onClick="@{()-> viewModel.cancel()}"
+                        android:text="取消" />
+
+                    <TextView
+                        style="@style/tv_bottom_btn"
+                        android:layout_width="120dp"
+                        android:onClick="@{()-> viewModel.submit()}"
+                        android:text="保存" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+        </ScrollView>
+
+    </LinearLayout>
+</layout>

module_gjc/src/main/res/layout/activity_int_exp_out_handover.xml

@@ -173,6 +173,12 @@
 
             </LinearLayout>
 
+            <!-- 允许装机按钮（多选） -->
+            <TextView
+                style="@style/tv_bottom_btn"
+                android:onClick="@{()-> viewModel.allowLoadClick()}"
+                android:text="允许装机" />
+
             <!-- 待配运按钮 -->
             <TextView
                 style="@style/tv_bottom_btn"

module_gjc/src/main/res/layout/activity_int_exp_tally.xml

@@ -167,6 +167,32 @@
 
             </LinearLayout>
 
+            <!-- 分单全选按钮（仅选中已全部申报完毕的主单下的分单） -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="5dp"
+                android:gravity="center_vertical"
+                android:onClick="@{()-> viewModel.checkAllHaWbClick()}"
+                android:orientation="horizontal">
+
+                <ImageView
+                    setIVCheckAllImage="@{viewModel.isAllHaWbChecked}"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="5dp"
+                    android:src="@drawable/img_check_all_unchecked" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="分单全选"
+                    android:textColor="@color/color_66"
+                    android:textSize="18sp" />
+
+            </LinearLayout>
+
             <!-- 统计信息 -->
             <LinearLayout
                 android:layout_width="0dp"

module_gjc/src/main/res/layout/dialog_int_exp_move_clear.xml

@@ -61,6 +61,32 @@
 
             </LinearLayout>
 
+            <!-- 备注 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    completeSpace="@{5}"
+                    android:text="备注："
+                    android:textColor="@color/text_normal"
+                    android:textSize="16sp" />
+
+                <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    hint='@{"请输入备注"}'
+                    type="@{SearchLayoutType.INPUT}"
+                    value="@={model.clearRemark}" />
+
+            </LinearLayout>
+
         </LinearLayout>
 
         <!-- 底部按钮 -->

module_gjc/src/main/res/layout/item_assemble_waybill.xml

@@ -55,7 +55,7 @@
                 android:layout_width="120dp"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="@{bean.pieces}"
+                android:text="@{bean.piecesDisplay}"
                 android:textColor="@{bean.isMarked ? @color/text_red : @color/text_normal}"
                 android:textSize="14sp" />
 
@@ -64,7 +64,7 @@
                 android:layout_width="120dp"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="@{bean.weight}"
+                android:text="@{bean.weightDisplay}"
                 android:textColor="@{bean.isMarked ? @color/text_red : @color/text_normal}"
                 android:textSize="14sp" />
 

module_gjc/src/main/res/layout/item_gjc_check_in_record.xml

@@ -67,17 +67,19 @@
             type="@{DataLayoutType.INPUT}"
             value="@={record.weightStr}" />
 
-        <!-- 托盘自重字段（只读） -->
+        <!-- 托盘自重字段（取托盘重量 trayTotalWeight，可编辑） -->
         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_weight="1"
-            enable="@{false}"
+            enable="@{isEditMode}"
+            hint="@{`托盘自重`}"
+            inputType="@{android.text.InputType.TYPE_CLASS_NUMBER | android.text.InputType.TYPE_NUMBER_FLAG_DECIMAL}"
             title="@{`托盘自重`}"
             titleLength="@{4}"
             type="@{DataLayoutType.INPUT}"
-            value="@{record.carWeight}" />
+            value="@={record.trayTotalWeightStr}" />
 
         <!-- 计重时间字段（只读） -->
         <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew

module_gjc/src/main/res/layout/item_int_exp_arrive.xml

@@ -22,6 +22,12 @@
         android:layout_marginTop="10dp"
         android:orientation="vertical">
 
+        <!-- 侧滑布局：白色卡片（含展开按钮）+ 侧滑菜单 -->
+        <com.mcxtzhang.swipemenulib.SwipeMenuLayout
+            android:id="@+id/swipe_menu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
         <!-- 白色卡片 -->
         <LinearLayout
             android:layout_width="match_parent"
@@ -198,7 +204,7 @@
 
                     </LinearLayout>
 
-                    <!-- 第二行：航程、计重状态、运抵状态、运单类型、分单数 -->
+                    <!-- 第二行：航程、海关放行、运抵状态、运单类型、分单数 -->
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -231,7 +237,7 @@
 
                         </LinearLayout>
 
-                        <!-- 计重状态 -->
+                        <!-- 海关放行 -->
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -243,20 +249,16 @@
                                 completeSpace="@{5}"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="计重状态："
+                                android:text="海关放行："
                                 android:textColor="@color/text_normal"
                                 android:textSize="15sp" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:background="@{`1`.equals(bean.checkIn) ? @drawable/tag_status_green : (`2`.equals(bean.checkIn) ? @drawable/tag_status_blue : @drawable/tag_status_gray)}"
+                                android:text="@{bean.cmdStatus}"
-                                android:paddingHorizontal="8dp"
+                                android:textColor="@color/text_normal"
-                                android:paddingVertical="2dp"
+                                android:textSize="15sp" />
-                                android:text="@{bean.checkInText}"
-                                android:textColor="@{`1`.equals(bean.checkIn) ? @color/text_green : (`2`.equals(bean.checkIn) ? @color/colorPrimary : @color/text_gray)}"
-                                android:textSize="14sp"
-                                android:visibility="@{bean.checkIn != null &amp;&amp; !bean.checkIn.isEmpty() ? View.VISIBLE : View.GONE}" />
 
                         </LinearLayout>
 
@@ -357,6 +359,23 @@
 
         </LinearLayout>
 
+        <!-- 侧滑菜单区 -->
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <!-- 回执按钮 -->
+            <TextView
+                android:id="@+id/btnResponse"
+                style="@style/tv_item_action"
+                android:background="@color/colorPrimary"
+                android:text="回执" />
+
+        </LinearLayout>
+
+        </com.mcxtzhang.swipemenulib.SwipeMenuLayout>
+
         <!-- 子订单列表容器（白色圆角卡片，圆角同主单） -->
         <LinearLayout
             visible="@{bean.showMore}"
@@ -439,6 +458,16 @@
                     android:textSize="14sp"
                     android:textStyle="bold" />
 
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.9"
+                    android:gravity="center"
+                    android:text="海关放行"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"

module_gjc/src/main/res/layout/item_int_exp_arrive_sub.xml

@@ -90,6 +90,16 @@
 
             </LinearLayout>
 
+            <!-- 海关放行 -->
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.9"
+                android:gravity="center"
+                android:text="@{bean.cmdStatus ?? ``}"
+                android:textColor="@color/text_normal"
+                android:textSize="14sp" />
+
             <!-- 品名（中） -->
             <TextView
                 android:layout_width="0dp"

module_gjc/src/main/res/layout/item_int_exp_load.xml

@@ -20,11 +20,23 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="10dp"
         android:layout_marginTop="10dp"
-        android:background="@drawable/bg_white_radius_8"
+        android:orientation="vertical">
-        android:gravity="center_vertical"
+
-        android:orientation="horizontal"
+        <!-- 侧滑布局：白色卡片 + 侧滑菜单 -->
-        android:paddingVertical="20dp"
+        <com.mcxtzhang.swipemenulib.SwipeMenuLayout
-        android:paddingHorizontal="10dp">
+            android:id="@+id/swipe_menu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <!-- 白色卡片 -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_white_radius_8"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingVertical="20dp"
+            android:paddingHorizontal="10dp">
         <!-- 选中图标 (飞机图标，根据选择状态切换图片) -->
         <ImageView
             android:id="@+id/iv_icon"
@@ -298,6 +310,25 @@
 
         </LinearLayout>
 
+        </LinearLayout>
+
+        <!-- 侧滑菜单区 -->
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <!-- 回执按钮 -->
+            <TextView
+                android:id="@+id/btnResponse"
+                style="@style/tv_item_action"
+                android:background="@color/colorPrimary"
+                android:text="回执" />
+
+        </LinearLayout>
+
+        </com.mcxtzhang.swipemenulib.SwipeMenuLayout>
+
     </LinearLayout>
 
 </layout>

module_gjc/src/main/res/layout/item_int_exp_move.xml

@@ -21,8 +21,15 @@
         android:layout_marginTop="10dp"
         android:orientation="vertical">
 
+        <!-- 侧滑布局 -->
+        <com.mcxtzhang.swipemenulib.SwipeMenuLayout
+            android:id="@+id/swipe_menu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
         <!-- 白色卡片 -->
         <LinearLayout
+            android:id="@+id/ll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/bg_white_radius_8"
@@ -312,8 +319,33 @@
 
             </LinearLayout>
 
+            <!-- 右侧箭头 -->
+            <ImageView
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/img_pda_right" />
+
         </LinearLayout>
 
+        <!-- 侧滑菜单区域 -->
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <!-- 编辑按钮 -->
+            <TextView
+                android:id="@+id/btn_edit"
+                style="@style/tv_item_action"
+                android:background="@color/colorPrimary"
+                android:text="编辑" />
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </com.mcxtzhang.swipemenulib.SwipeMenuLayout>
+
     </LinearLayout>
 
 </layout>

module_gjc/src/main/res/layout/item_int_exp_out_handover.xml

@@ -54,7 +54,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.1"
+                    android:layout_weight="1.0"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -77,7 +77,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="0.8"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -100,7 +100,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="0.7"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -123,7 +123,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="0.75"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -146,7 +146,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1.3"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -165,9 +165,33 @@
 
                 </LinearLayout>
 
+                <!-- 装机状态（允许装机绿色，不允许装机红色） -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.0"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        completeSpace="@{5}"
+                        android:text="装机状态："
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{bean.allowLoadText}"
+                        android:textColor="@{bean.isAllowLoad() ? @color/text_green : @color/text_red}"
+                        android:textSize="15sp" />
+
+                </LinearLayout>
+
             </LinearLayout>
 
-            <!-- 第二行：目的港、库位号、复磅状态、交接人、交接时间 -->
+            <!-- 第二行：目的港、库位号、IMP代码、交接人、交接时间 -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -179,7 +203,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.1"
+                    android:layout_weight="1.0"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -202,7 +226,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="0.8"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -221,11 +245,11 @@
 
                 </LinearLayout>
 
-                <!-- 复磅状态 -->
+                <!-- IMP代码（非空且不是 ELI/ELM 时标红） -->
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="0.7"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -233,14 +257,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         completeSpace="@{5}"
-                        android:text="复磅状态："
+                        android:text="IMP代码："
                         android:textSize="15sp" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{bean.wtDate != null &amp;&amp; !bean.wtDate.isEmpty() ? `已复磅` : `未复磅`}"
+                        android:text="@{bean.dgrCode}"
-                        android:textColor="@{bean.wtDate != null &amp;&amp; !bean.wtDate.isEmpty() ? @color/text_green : @color/text_normal}"
+                        android:textColor="@{bean.dgrCode != null &amp;&amp; !bean.dgrCode.isEmpty() &amp;&amp; !bean.dgrCode.equals(`ELI`) &amp;&amp; !bean.dgrCode.equals(`ELM`) ? @color/text_red : @color/text_normal}"
                         android:textSize="15sp" />
 
                 </LinearLayout>
@@ -249,7 +273,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.8"
+                    android:layout_weight="0.75"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -272,7 +296,7 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.2"
+                    android:layout_weight="1.3"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
@@ -291,6 +315,12 @@
 
                 </LinearLayout>
 
+                <!-- 占位（与第一行装机状态列等宽，保持列对齐） -->
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1.0" />
+
             </LinearLayout>
 
         </LinearLayout>

module_gjc/src/main/res/layout/item_int_exp_tally.xml

@@ -7,6 +7,12 @@
   </data>
   <!-- 主列表项容器 -->
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="10dp" android:layout_marginTop="10dp" android:orientation="vertical">
+    <!-- 侧滑布局：白色卡片（含展开按钮）+ 侧滑菜单 -->
+    <com.mcxtzhang.swipemenulib.SwipeMenuLayout
+        android:id="@+id/swipe_menu"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
     <!-- 白色卡片主要内容区域 -->
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_white_radius_8" android:orientation="vertical">
       <!-- 主要内容区域 -->
@@ -83,6 +89,23 @@
           android:scaleType="center"
           android:src="@mipmap/img_down" />
     </LinearLayout>
+
+    <!-- 侧滑菜单区 -->
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <!-- 回执按钮 -->
+        <TextView
+            android:id="@+id/btnResponse"
+            style="@style/tv_item_action"
+            android:background="@color/colorPrimary"
+            android:text="回执" />
+
+    </LinearLayout>
+
+    </com.mcxtzhang.swipemenulib.SwipeMenuLayout>
     <!-- 子订单列表容器（在白色卡片外面） -->
     <LinearLayout visible="@{bean.showMore}" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:background="@drawable/bg_white_radius_8" android:orientation="vertical" android:visibility="gone">
       <!-- 暂无数据提示 -->

module_gjc/src/main/res/layout/layout_gjc_query_filter.xml

@@ -67,17 +67,17 @@
                     type="@{DataLayoutType.INPUT}"
                     value='@={viewModel.spCode}' />
 
-                <!-- 航班号 -->
+                <!-- 出库状态 -->
                 <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                    android:id="@+id/filter_flight_no"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="10dp"
-                    hint='@{"请输入航班号"}'
+                    hint='@{"请选择出库状态"}'
-                    title='@{"航班号"}'
+                    list="@{viewModel.outStatusList}"
+                    title='@{"出库状态"}'
                     titleLength="@{4}"
-                    type="@{DataLayoutType.INPUT}"
+                    type="@{DataLayoutType.SPINNER}"
-                    value='@={viewModel.flightNo}' />
+                    value='@={viewModel.outStatus}' />
 
                 <!-- 目的港 -->
                 <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew

module_gjj/src/main/java/com/lukouguoji/gjj/activity/GjjManifestAddActivity.kt

@@ -10,6 +10,7 @@ import com.lukouguoji.gjj.viewModel.GjjManifestAddViewModel
 import com.lukouguoji.module_base.base.BaseBindingActivity
 import com.lukouguoji.module_base.common.Constant
 import com.lukouguoji.module_base.common.DetailsPageType
+import com.lukouguoji.module_base.ktx.addOnItemClickListener
 import com.lukouguoji.module_base.ktx.noNull
 import com.lukouguoji.module_base.ktx.setUpperCaseAlphanumericFilter
 
@@ -31,6 +32,10 @@ class GjjManifestAddActivity :
         binding.actualWeightInput.inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL
         binding.billingWeightInput.inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL
 
+        // 交接图片列表
+        viewModel.rv = binding.rvPic
+        binding.rvPic.addOnItemClickListener(viewModel)
+
         viewModel.initOnCreated(intent)
 
         // 动态设置标题（必须在 initOnCreated 之后，pageType 已从 Intent 解析）

module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpAccidentVisaEditActivity.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.InputType
+import androidx.core.widget.doOnTextChanged
 import com.lukouguoji.gjj.R
 import com.lukouguoji.gjj.databinding.ActivityIntImpAccidentVisaEditBinding
 import com.lukouguoji.gjj.viewModel.IntImpAccidentVisaEditViewModel
@@ -29,6 +30,10 @@ class IntImpAccidentVisaEditActivity :
         binding.fnoInput.et.setUpperCaseAlphanumericFilter()
         // 运单号：纯数字11位
         binding.wbNoInput.et.inputType = InputType.TYPE_CLASS_NUMBER
+        // 运单号满11位后自动查询舱单信息带出表单数据（覆盖手输、联想填充、弹窗选择）
+        binding.wbNoInput.et.doOnTextChanged { text, _, _, _ ->
+            viewModel.onWbNoChanged(text?.toString()?.trim() ?: "")
+        }
 
         viewModel.rv = binding.rv
         binding.rv.addOnItemClickListener(viewModel)

module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpLoadingListActivity.kt

@@ -10,13 +10,11 @@ import com.lukouguoji.gjj.dialog.IntImpInStorageDialogModel
 import com.lukouguoji.gjj.dialog.IntImpModifyStorageDialogModel
 import com.lukouguoji.gjj.viewModel.IntImpLoadingListViewModel
 import com.lukouguoji.module_base.base.BaseBindingActivity
-import com.lukouguoji.module_base.bean.GjjManifest
 import com.lukouguoji.module_base.common.Constant
 import com.lukouguoji.module_base.common.ConstantEvent
 import com.lukouguoji.module_base.impl.FlowBus
 import com.lukouguoji.module_base.impl.observe
 import com.lukouguoji.module_base.ktx.addOnItemClickListener
-import com.lukouguoji.module_base.ktx.commonAdapter
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.router.ARouterConstants
 
@@ -43,7 +41,7 @@ class IntImpLoadingListActivity :
 
         // 监听刷新事件
         FlowBus.with<String>(ConstantEvent.EVENT_CHECK_CHANGED).observe(this) { viewModel.onItemCheckChanged() }
-
+
         FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).observe(this) {
             viewModel.refresh()
         }
@@ -78,8 +76,7 @@ class IntImpLoadingListActivity :
      * 显示入库操作对话框
      */
     fun showInStorageDialog() {
-        val list = viewModel.pageModel.rv?.commonAdapter()?.items as? List<*> ?: return
+        val selectedItems = viewModel.getSelectedManifests()
-        val selectedItems = list.filterIsInstance<GjjManifest>().filter { it.isSelected }
 
         if (selectedItems.isEmpty()) {
             showToast("请选择要入库的记录")
@@ -97,8 +94,7 @@ class IntImpLoadingListActivity :
      * 显示修改库位对话框
      */
     fun showModifyStorageDialog() {
-        val list = viewModel.pageModel.rv?.commonAdapter()?.items as? List<*> ?: return
+        val selectedItems = viewModel.getSelectedManifests()
-        val selectedItems = list.filterIsInstance<GjjManifest>().filter { it.isSelected }
 
         if (selectedItems.isEmpty()) {
             showToast("请选择要修改库位的记录")

module_gjj/src/main/java/com/lukouguoji/gjj/activity/IntImpQueryActivity.kt

@@ -55,8 +55,8 @@ class IntImpQueryActivity :
             if (visible) showFilterPanel() else hideFilterPanel()
         }
 
-        // 航班号：大写字母+数字
+        // 航班号（顶部搜索区）：大写字母+数字
-        binding.filterPanel.filterFlightNo.et.setUpperCaseAlphanumericFilter()
+        binding.flightNoSearch.et.setUpperCaseAlphanumericFilter()
         // 始发港：仅大写字母
         binding.filterPanel.filterOrigin.et.setUpperCaseLetterFilter()
 

module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntArrAirManifestViewHolder.kt

@@ -9,6 +9,7 @@ import com.lukouguoji.module_base.common.ConstantEvent
 import com.lukouguoji.module_base.impl.FlowBus
 import com.lukouguoji.module_base.bean.GjjAirManifest
 import com.lukouguoji.module_base.ktx.refresh
+import com.lukouguoji.module_base.ktx.ITEM_CLICK_TYPE_CUSTOMS_RESPONSE
 
 /**
  * 国际进港原始舱单 ViewHolder
@@ -25,6 +26,12 @@ class IntArrAirManifestViewHolder(view: View) :
         binding.position = position
         binding.executePendingBindings()
 
+        // 侧滑菜单 - 回执按钮（关闭侧滑后分发到 ViewModel）
+        binding.btnResponse.setOnClickListener {
+            binding.swipeMenu.quickClose()
+            clickListener?.onItemClick(position, ITEM_CLICK_TYPE_CUSTOMS_RESPONSE)
+        }
+
         // 整卡点击 - 跳转详情页
         notifyItemClick(position, binding.ll)
 

module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpLoadingListSubViewHolder.kt

@@ -0,0 +1,26 @@
+package com.lukouguoji.gjj.holder
+
+import android.view.View
+import com.lukouguoji.gjj.activity.IntImpLoadingListEditActivity
+import com.lukouguoji.gjj.databinding.ItemIntImpLoadingListSubBinding
+import com.lukouguoji.module_base.base.BaseViewHolder
+import com.lukouguoji.module_base.bean.GjjManifest
+
+/**
+ * 国际进港装机单 关联运单(子单) ViewHolder
+ */
+class IntImpLoadingListSubViewHolder(view: View) :
+    BaseViewHolder<GjjManifest, ItemIntImpLoadingListSubBinding>(view) {
+
+    override fun onBind(item: Any?, position: Int) {
+        val bean = getItemBean(item) ?: return
+        binding.bean = bean
+        binding.position = position + 1
+        binding.executePendingBindings()
+
+        // 点击运单行进入装机单编辑
+        binding.llRow.setOnClickListener {
+            IntImpLoadingListEditActivity.start(itemView.context, bean)
+        }
+    }
+}

module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpLoadingListViewHolder.kt

@@ -1,17 +1,20 @@
 package com.lukouguoji.gjj.holder
 
 import android.view.View
+import com.lukouguoji.gjj.R
 import com.lukouguoji.gjj.databinding.ItemIntImpLoadingListBinding
+import com.lukouguoji.module_base.adapter.setCommonAdapter
 import com.lukouguoji.module_base.base.BaseViewHolder
-import com.lukouguoji.module_base.common.ConstantEvent
+import com.lukouguoji.module_base.bean.GjjLoadingUld
-import com.lukouguoji.module_base.impl.FlowBus
+import com.lukouguoji.module_base.common.ConstantEvent
-import com.lukouguoji.module_base.bean.GjjManifest
+import com.lukouguoji.module_base.impl.FlowBus
+import com.lukouguoji.module_base.ktx.refresh
 
 /**
- * 国际进港装机单 ViewHolder
+ * 国际进港装机单 ULD 主单 ViewHolder
  */
 class IntImpLoadingListViewHolder(view: View) :
-    BaseViewHolder<GjjManifest, ItemIntImpLoadingListBinding>(view) {
+    BaseViewHolder<GjjLoadingUld, ItemIntImpLoadingListBinding>(view) {
 
     override fun onBind(item: Any?, position: Int) {
         val bean = getItemBean(item) ?: return
@@ -26,10 +29,35 @@ class IntImpLoadingListViewHolder(view: View) :
             binding.executePendingBindings()
         }
 
-        // 侧滑菜单 - 编辑按钮
+        // 展开/收起关联运单
-        binding.btnEdit.setOnClickListener {
+        binding.ivShow.setOnClickListener {
-            binding.swipeMenu.quickClose()
+            bean.showMore.set(!bean.showMore.get())
-            clickListener?.onItemClick(position, 2000)
+        }
+
+        // 初始化子列表 RecyclerView
+        setCommonAdapter(
+            binding.rvSub,
+            IntImpLoadingListSubViewHolder::class.java,
+            R.layout.item_int_imp_loading_list_sub
+        )
+
+        // 刷新子列表数据
+        val subList = bean.manifestList ?: emptyList()
+        binding.rvSub.refresh(subList)
+        updateSubListVisibility(subList.isNotEmpty())
+    }
+
+    private fun updateSubListVisibility(hasData: Boolean) {
+        if (hasData) {
+            binding.llHeader.visibility = View.VISIBLE
+            binding.dividerHeader.visibility = View.VISIBLE
+            binding.rvSub.visibility = View.VISIBLE
+            binding.tvEmpty.visibility = View.GONE
+        } else {
+            binding.llHeader.visibility = View.GONE
+            binding.dividerHeader.visibility = View.GONE
+            binding.rvSub.visibility = View.GONE
+            binding.tvEmpty.visibility = View.VISIBLE
         }
     }
 }

module_gjj/src/main/java/com/lukouguoji/gjj/holder/IntImpTallyViewHolder.kt

@@ -13,6 +13,7 @@ import com.google.gson.Gson
 import com.lukouguoji.module_base.http.net.NetApply
 import com.lukouguoji.module_base.ktx.launchCollect
 import com.lukouguoji.module_base.ktx.refresh
+import com.lukouguoji.module_base.ktx.ITEM_CLICK_TYPE_CUSTOMS_RESPONSE
 import com.lukouguoji.module_base.ktx.toRequestBody
 
 /**
@@ -27,6 +28,12 @@ class IntImpTallyViewHolder(view: View) :
         binding.position = position
         binding.executePendingBindings()
 
+        // 侧滑菜单 - 回执按钮（关闭侧滑后分发到 ViewModel）
+        binding.btnResponse.setOnClickListener {
+            binding.swipeMenu.quickClose()
+            clickListener?.onItemClick(position, ITEM_CLICK_TYPE_CUSTOMS_RESPONSE)
+        }
+
         // 选中图标点击 - 切换选择状态（独立选择，不联动分单）
         binding.ivIcon.setOnClickListener {
             bean.checked.set(!bean.checked.get())

module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/GjjManifestAddViewModel.kt

@@ -5,26 +5,45 @@ import android.view.View
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import androidx.recyclerview.widget.RecyclerView
+import com.lukouguoji.gjj.R
 import com.lukouguoji.module_base.base.BaseViewModel
+import com.lukouguoji.module_base.bean.FileBean
 import com.lukouguoji.module_base.common.Constant
 import com.lukouguoji.module_base.common.ConstantEvent
 import com.lukouguoji.module_base.common.DetailsPageType
 import com.lukouguoji.module_base.http.net.NetApply
 import com.lukouguoji.module_base.impl.FlowBus
+import com.lukouguoji.module_base.impl.ImageSelectNewViewHolder
+import com.lukouguoji.module_base.interfaces.IOnItemClickListener
+import com.lukouguoji.module_base.ktx.commonAdapter
 import com.lukouguoji.module_base.ktx.finish
 import com.lukouguoji.module_base.ktx.formatDate
 import com.lukouguoji.module_base.ktx.launchCollect
 import com.lukouguoji.module_base.ktx.launchLoadingCollect
+import com.lukouguoji.module_base.ktx.loadMore
 import com.lukouguoji.module_base.ktx.noNull
 import com.lukouguoji.module_base.ktx.showToast
 import com.lukouguoji.module_base.ktx.toRequestBody
 import com.lukouguoji.module_base.ktx.verifyNullOrEmpty
 import com.lukouguoji.module_base.util.DictUtils
+import com.lukouguoji.module_base.util.MediaUtil
+import com.lukouguoji.module_base.util.UploadUtil
 import dev.utils.app.info.KeyValue
 import dev.utils.common.DateUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.asFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 
-class GjjManifestAddViewModel : BaseViewModel() {
+class GjjManifestAddViewModel : BaseViewModel(), IOnItemClickListener {
 
     // 页面类型（必须用LiveData）
     val pageType = MutableLiveData(DetailsPageType.Add)
@@ -167,6 +186,11 @@ class GjjManifestAddViewModel : BaseViewModel() {
     val waybillTypeList = MutableLiveData<List<KeyValue>>()
     val waybillType = MutableLiveData("")
 
+    // ========== 交接图片 ==========
+    val itemLayoutId = R.layout.item_image_select_new
+    val itemViewHolder = ImageSelectNewViewHolder::class.java
+    var rv: RecyclerView? = null
+
     /**
      * 初始化（从Intent获取参数）
      */
@@ -205,6 +229,9 @@ class GjjManifestAddViewModel : BaseViewModel() {
             }
         }
 
+        // 交接图片：末尾追加空白占位项作为添加按钮
+        rv?.post { rv?.commonAdapter()?.addItem(FileBean()) }
+
         // 加载下拉列表（在编辑数据加载之后，以便使用 checkedValue 将选中项置顶）
         loadDictLists()
     }
@@ -302,6 +329,21 @@ class GjjManifestAddViewModel : BaseViewModel() {
         businessType.value = manifest.businessType
         goodsType.value = manifest.cargoType
         waybillType.value = manifest.awbType
+
+        // 回填交接图片：path 取原图 URL 确保预览清晰，url 取缩略图用于提交
+        val picList = manifest.pic.noNull().split(",").filter { it.isNotEmpty() }
+        val originalList = manifest.originalPic.noNull().split(",").filter { it.isNotEmpty() }
+        if (picList.isNotEmpty()) {
+            val images = picList.mapIndexed { index, picUrl ->
+                val originalUrl = originalList.getOrElse(index) { picUrl }
+                FileBean(
+                    path = MediaUtil.fillUrl(originalUrl),
+                    url = picUrl,
+                    originalPic = originalUrl
+                )
+            }
+            rv?.loadMore(images)
+        }
     }
 
     /**
@@ -411,30 +453,82 @@ class GjjManifestAddViewModel : BaseViewModel() {
             paramsMap["prefix"] = prefix
         }
 
-        val params = paramsMap.toRequestBody()
+        // 先上传本地新增的交接图片，全部完成后再组装三字段提交表单
-
+        var uploadFailed = false
-        launchLoadingCollect({
+        (rv?.commonAdapter()?.items ?: emptyList())
-            if (isModify) {
+            .asFlow()
-                NetApply.api.gjjManifestUpdate(params)
+            .map { it as FileBean }
-            } else {
+            .filter { it.path.isNotEmpty() && it.url.isEmpty() }
-                NetApply.api.gjjManifestInsert(params)
+            .onEach {
+                val data = UploadUtil.upload(it.path).data
+                // UploadUtil 返回：newName=原图(较大)，zipFileName=缩略图(较小)
+                // FileBean.url 用作缩略图标识，FileBean.originalPic 用作原图标识
+                it.url = data?.zipFileName ?: ""
+                it.originalPic = data?.newName ?: ""
             }
-        }) {
+            .flowOn(Dispatchers.IO)
-            onSuccess = {
+            .onStart { showLoading() }
-                if (it.verifySuccess()) {
+            .catch {
-                    val successMsg = if (isModify) "修改成功" else "保存成功"
+                uploadFailed = true
-                    showToast(successMsg)
+                showToast(it.message.noNull("上传图片失败"))
+                dismissLoading()
+            }
+            .onCompletion {
+                if (uploadFailed) return@onCompletion
 
-                    // 发送刷新事件
+                // 交接图片三字段：pic=缩略图、originalPic=原图、picNumber=数量
-                    viewModelScope.launch {
+                val picBeans = (rv?.commonAdapter()?.items ?: emptyList())
-                        FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                    .filterIsInstance<FileBean>()
+                    .filter { it.path.isNotEmpty() }
+                paramsMap["picNumber"] = picBeans.size.toString()
+                paramsMap["pic"] = picBeans.joinToString(",") { MediaUtil.removeUrl(it.url) }
+                paramsMap["originalPic"] =
+                    picBeans.joinToString(",") { MediaUtil.removeUrl(it.originalPic) }
+
+                val params = paramsMap.toRequestBody()
+
+                launchLoadingCollect({
+                    if (isModify) {
+                        NetApply.api.gjjManifestUpdate(params)
+                    } else {
+                        NetApply.api.gjjManifestInsert(params)
                     }
+                }) {
+                    onSuccess = {
+                        if (it.verifySuccess()) {
+                            val successMsg = if (isModify) "修改成功" else "保存成功"
+                            showToast(successMsg)
 
-                    view.context.finish()
+                            // 发送刷新事件
-                } else {
+                            viewModelScope.launch {
-                    showToast(it.msg.noNull("保存失败"))
+                                FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                            }
+
+                            view.context.finish()
+                        } else {
+                            showToast(it.msg.noNull("保存失败"))
+                        }
+                    }
                 }
             }
+            .launchIn(viewModelScope)
+    }
+
+    /**
+     * 交接图片列表点击回调
+     * 长按图片（R.id.rl）切换删除按钮显隐，点击删除按钮（R.id.iv_delete）移除该图片
+     */
+    override fun onItemClick(position: Int, type: Int) {
+        val adapter = rv?.commonAdapter() ?: return
+        val bean = adapter.getItem(position) as? FileBean ?: return
+        when (type) {
+            R.id.rl -> {
+                bean.canDelete.set(!bean.canDelete.get())
+            }
+            R.id.iv_delete -> {
+                adapter.removeItem(position)
+            }
+            else -> {}
         }
     }
 

module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntArrAirManifestViewModel.kt

@@ -16,6 +16,9 @@ import com.lukouguoji.gjj.dialog.IntImpTallyResetDialogModel
 import com.lukouguoji.module_base.http.net.NetApply
 import com.lukouguoji.module_base.impl.FlowBus
 import com.lukouguoji.module_base.ktx.commonAdapter
+import com.lukouguoji.module_base.ktx.CustomsResponseUrl
+import com.lukouguoji.module_base.ktx.ITEM_CLICK_TYPE_CUSTOMS_RESPONSE
+import com.lukouguoji.module_base.ktx.showCustomsResponse
 import com.lukouguoji.module_base.ktx.launchCollect
 import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.showToast
@@ -293,10 +296,19 @@ class IntArrAirManifestViewModel : BasePageViewModel() {
         // 获取主单数据
         val manifest = airManifest.maWb ?: return
 
-        // 跳转到详情页
+        when (type) {
-        com.lukouguoji.gjj.activity.IntArrAirManifestDetailsActivity.start(
+            // 侧滑「回执」按钮：查询海关回执并跳转只读详情页
-            getTopActivity(),
+            ITEM_CLICK_TYPE_CUSTOMS_RESPONSE -> showCustomsResponse(
-            manifest
+                CustomsResponseUrl.INT_IMP_AIR_MANIFEST,
-        )
+                manifest.prefix,
+                manifest.no,
+                "原始舱单回执"
+            )
+            // 整卡点击（type 为 view id）：跳转到详情页
+            else -> com.lukouguoji.gjj.activity.IntArrAirManifestDetailsActivity.start(
+                getTopActivity(),
+                manifest
+            )
+        }
     }
 }

module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpAccidentVisaEditViewModel.kt

@@ -233,6 +233,65 @@ class IntImpAccidentVisaEditViewModel : BaseViewModel(), IOnItemClickListener {
         }
     }
 
+    ///////////////////////////////////////////////////////////////////////////
+    // 运单号带出国际进港舱单信息
+    ///////////////////////////////////////////////////////////////////////////
+
+    private var lastQueriedWbNo = ""
+
+    /**
+     * 运单号文本变化回调（Activity 中监听输入框）
+     * 满11位且与上次查询不同时，查询进港舱单信息并回填表单
+     * 仅新增模式生效：编辑模式下 loadDetail 回显运单号会触发本回调，
+     * 若不拦截会用舱单数据覆盖已保存的表单和图片列表
+     */
+    fun onWbNoChanged(wbNo: String) {
+        if (pageType.value != DetailsPageType.Add) return
+        if (wbNo.length != 11) return
+        if (wbNo == lastQueriedWbNo) return
+        lastQueriedWbNo = wbNo
+        queryWbInfo(wbNo)
+    }
+
+    private fun queryWbInfo(wbNo: String) {
+        launchLoadingCollect({ NetApply.api.getIntImpManifestByWbNo(wbNo) }) {
+            onSuccess = {
+                val data = it.data
+                if (it.verifySuccess() && data != null) {
+                    // 接口可能返回 null 字段（Gson 反射注入会绕过 Kotlin 非空默认值），统一 noNull 防护
+                    val b = dataBean.value ?: GjAccidentVisaEditBean()
+                    b.fdate = data.fdate.noNull().take(10)
+                    b.fno = data.fno.noNull()
+                    b.dep = data.origin.noNull()
+                    b.dest = data.dest.noNull()
+                    b.pc = (if (data.totalPc > 0) data.totalPc else data.pc).toString()
+                    b.weight = (if (data.totalWeight > 0.0) data.totalWeight else data.weight).toString()
+                    b.goods = data.goods.noNull().ifEmpty { data.goodsCn.noNull() }
+                    dataBean.value = b
+
+                    // 与航班级联查询判重键同步，避免航班输入框失焦后重复查询覆盖带出的始发/目的站
+                    lastQueriedFlight = "${b.fdate}-${b.fno}"
+
+                    // 回填交接图片：path 取原图完整 URL 用于预览，url 取缩略图相对路径用于提交
+                    val picList = data.pic.noNull().split(",").filter { p -> p.isNotEmpty() }
+                    val originalList = data.originalPic.noNull().split(",").filter { p -> p.isNotEmpty() }
+                    val images = picList.mapIndexed { index, picUrl ->
+                        val originalUrl = originalList.getOrElse(index) { picUrl }
+                        FileBean(
+                            path = MediaUtil.fillUrl(originalUrl),
+                            url = picUrl,
+                            originalPic = originalUrl
+                        )
+                    }
+                    // 重置图片区：舱单图片 + 末尾空白添加占位
+                    rv?.commonAdapter()?.refresh(images + FileBean())
+                } else {
+                    showToast(it.msg.noNull("未查询到该运单的进港舱单信息"))
+                }
+            }
+        }
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // 保存
     ///////////////////////////////////////////////////////////////////////////

module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpLoadingListViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
 import com.lukouguoji.gjj.R
 import com.lukouguoji.gjj.holder.IntImpLoadingListViewHolder
 import com.lukouguoji.module_base.base.BasePageViewModel
+import com.lukouguoji.module_base.bean.GjjLoadingUld
 import com.lukouguoji.module_base.bean.GjjManifest
 import com.lukouguoji.module_base.common.Constant
 import com.lukouguoji.module_base.common.ConstantEvent
@@ -109,15 +110,23 @@ class IntImpLoadingListViewModel : BasePageViewModel(), IOnItemClickListener {
 
     // ========== 全选状态 ==========
     val isAllChecked = MutableLiveData(false)
-
+
-    fun onItemCheckChanged() {
+    fun onItemCheckChanged() {
-        updateCheckAllStatus()
+        updateCheckAllStatus()
-    }
+    }
-
+
-    fun updateCheckAllStatus() {
+    fun updateCheckAllStatus() {
-        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjManifest> ?: return
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjLoadingUld> ?: return
-        isAllChecked.value = list.isNotEmpty() && list.all { it.checked.get() }
+        isAllChecked.value = list.isNotEmpty() && list.all { it.checked.get() }
-    }
+    }
+
+    /**
+     * 获取选中 ULD 下的全部运单（供修改库位/入库使用）
+     */
+    fun getSelectedManifests(): List<GjjManifest> {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjLoadingUld> ?: return emptyList()
+        return list.filter { it.checked.get() }.flatMap { it.manifestList ?: emptyList() }
+    }
 
     // ========== 适配器配置 ==========
     val itemViewHolder = IntImpLoadingListViewHolder::class.java
@@ -191,7 +200,7 @@ class IntImpLoadingListViewModel : BasePageViewModel(), IOnItemClickListener {
      * 全选按钮点击（切换全选状态）
      */
     fun checkAllClick() {
-        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjManifest> ?: return
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjLoadingUld> ?: return
 
         // 切换全选状态
         val shouldCheckAll = !isAllChecked.value!!
@@ -280,17 +289,9 @@ class IntImpLoadingListViewModel : BasePageViewModel(), IOnItemClickListener {
     }
 
     /**
-     * 列表项点击回调（侧滑菜单）
+     * 列表项点击回调（运单编辑已改为在子列表 ViewHolder 中直接跳转）
      */
     override fun onItemClick(position: Int, type: Int) {
-        when (type) {
-            2000 -> {
-                // 编辑操作
-                val list = pageModel.rv?.commonAdapter()?.items as? List<GjjManifest> ?: return
-                val bean = list.getOrNull(position) ?: return
-                com.lukouguoji.gjj.activity.IntImpLoadingListEditActivity.start(getTopActivity(), bean)
-            }
-        }
     }
 
     /**

module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpManifestViewModel.kt

@@ -125,15 +125,15 @@ class IntImpManifestViewModel : BasePageViewModel() {
 
     // ========== 全选状态 ==========
     val isAllChecked = MutableLiveData(false)
-
+
-    fun onItemCheckChanged() {
+    fun onItemCheckChanged() {
-        updateCheckAllStatus()
+        updateCheckAllStatus()
-    }
+    }
-
+
-    fun updateCheckAllStatus() {
+    fun updateCheckAllStatus() {
-        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjManifest> ?: return
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjManifest> ?: return
-        isAllChecked.value = list.isNotEmpty() && list.all { it.checked.get() }
+        isAllChecked.value = list.isNotEmpty() && list.all { it.checked.get() }
-    }
+    }
 
     // ========== 展开/收起 ==========
     val isAllExpanded = MutableLiveData(false)
@@ -481,6 +481,80 @@ class IntImpManifestViewModel : BasePageViewModel() {
             .navigation()
     }
 
+    /**
+     * 开始理货（弹出修改库位对话框，提交理货库位）
+     */
+    fun startTallyClick() {
+        val list = pageModel.rv?.commonAdapter()?.items as? List<GjjManifest> ?: return
+        val selectedItems = list.filter { it.isSelected }
+
+        if (selectedItems.isEmpty()) {
+            showToast("请选择要理货的运单")
+            return
+        }
+        if (selectedItems.size > 1) {
+            showToast("只能选择一个运单")
+            return
+        }
+
+        // 舱单列表接口不返回理货库位，需先查装机单记录取出该运单已有的库位再弹窗回填
+        val selectedItem = selectedItems.first()
+        val queryParams = mapOf(
+            "fid" to fid.ifEmpty { null },
+            "fdep" to fdep.ifEmpty { null },
+            "wbNo" to selectedItem.wbNo.ifEmpty { null },
+            "pageNum" to 1,
+            "pageSize" to 1
+        ).toRequestBody()
+
+        launchLoadingCollect({ NetApply.api.getIntImpLoadingList(queryParams) }) {
+            onSuccess = { result ->
+                // 装机单接口已按 ULD 分组，运单记录在 manifestList 中
+                val tallyRecord = result.list
+                    ?.flatMap { it.manifestList ?: emptyList() }
+                    ?.let { list -> list.firstOrNull { it.wbNo == selectedItem.wbNo || it.getWaybillNo() == selectedItem.wbNo } ?: list.firstOrNull() }
+                showModifyStorageDialog(
+                    selectedItems = selectedItems,
+                    currentLocationId = tallyRecord?.locationTallyId?.takeIf { it > 0 }?.toString() ?: "",
+                    currentLocationName = tallyRecord?.locationTally ?: ""
+                )
+            }
+            // 查询失败不阻断操作，直接弹出空白库位的对话框
+            onFailed = { _, _ -> showModifyStorageDialog(selectedItems, "", "") }
+        }
+    }
+
+    /**
+     * 弹出修改库位对话框并提交（currentLocation* 用于回填该运单已有的理货库位）
+     */
+    private fun showModifyStorageDialog(
+        selectedItems: List<GjjManifest>,
+        currentLocationId: String,
+        currentLocationName: String
+    ) {
+        IntImpModifyStorageDialogModel(
+            currentLocationId = currentLocationId,
+            currentLocationName = currentLocationName
+        ) { dialog ->
+            val params = mapOf(
+                "location" to dialog.locationName,
+                "locationId" to dialog.locationId.toLongOrNull(),
+                "manifestList" to selectedItems
+            ).toRequestBody()
+
+            launchLoadingCollect({ NetApply.api.modifyIntImpLoadingStorage(params) }) {
+                onSuccess = {
+                    if (it.verifySuccess()) {
+                        showToast(it.msg.noNull("修改库位成功"))
+                        refresh()
+                    } else {
+                        showToast(it.msg.noNull("修改库位失败"))
+                    }
+                }
+            }
+        }.show()
+    }
+
     /**
      * 货物发放
      */

module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpPickUpDLVViewModel.kt

@@ -143,7 +143,7 @@ class IntImpPickUpDLVViewModel : BasePageViewModel() {
             "beginDate" to paymentDateStart.value?.ifEmpty { null },
             "endDate" to paymentDateEnd.value?.ifEmpty { null },
             "agentCode" to agentCode.value?.ifEmpty { null },
-            "no" to wbNo.value?.ifEmpty { null },
+            "wbNo" to wbNo.value?.ifEmpty { null },
             "spCode" to spCode.value?.ifEmpty { null }
         )
 

module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpQueryViewModel.kt

@@ -33,7 +33,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener {
     val flightDateStart = MutableLiveData<String>(DateUtils.getCurrentTime().formatDate())
     val flightDateEnd = MutableLiveData("")
     val agentId = MutableLiveData("")
-    val outStatus = MutableLiveData("")
+    val flightNo = MutableLiveData("")
     val waybillNo = MutableLiveData("")
 
     // ==================== 下拉列表 ====================
@@ -55,6 +55,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener {
     val totalCount = MutableLiveData("0")
     val totalPc = MutableLiveData("0")
     val totalWeight = MutableLiveData("0")
+    val totalFlightNumber = MutableLiveData("0")
 
     // ==================== 特码下拉 ====================
     val spCodeList = MutableLiveData<List<KeyValue>>(emptyList())
@@ -66,7 +67,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener {
 
     // ==================== 筛选条件 ====================
     val spCode = MutableLiveData("")
-    val flightNo = MutableLiveData("")
+    val outStatus = MutableLiveData("")
     val origin = MutableLiveData("")
     val awbType = MutableLiveData("")
     val businessType = MutableLiveData("")
@@ -75,11 +76,11 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener {
     // 是否有筛选条件（任意一个非空则为 true）
     val hasFilter: MediatorLiveData<Boolean> = MediatorLiveData<Boolean>().apply {
         val update = { _: Any? ->
-            value = listOf(spCode, flightNo, origin, awbType, businessType, goodsCn)
+            value = listOf(spCode, outStatus, origin, awbType, businessType, goodsCn)
                 .any { !it.value.isNullOrEmpty() }
         }
         addSource(spCode, update)
-        addSource(flightNo, update)
+        addSource(outStatus, update)
         addSource(origin, update)
         addSource(awbType, update)
         addSource(businessType, update)
@@ -108,7 +109,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener {
 
     fun resetFilter() {
         spCode.value = ""
-        flightNo.value = ""
+        outStatus.value = ""
         origin.value = ""
         awbType.value = ""
         businessType.value = ""
@@ -176,6 +177,7 @@ class IntImpQueryViewModel : BasePageViewModel(), IOnItemClickListener {
                 totalCount.value = (data?.wbNumber ?: 0).toString()
                 totalPc.value = (data?.totalPc ?: 0).toString()
                 totalWeight.value = (data?.totalWeight ?: 0.0).toString()
+                totalFlightNumber.value = (data?.flightNumber ?: 0).toString()
             }
         }
     }

module_gjj/src/main/java/com/lukouguoji/gjj/viewModel/IntImpTallyViewModel.kt

@@ -16,6 +16,9 @@ import com.lukouguoji.module_base.common.ConstantEvent
 import com.lukouguoji.module_base.http.net.NetApply
 import com.lukouguoji.module_base.impl.FlowBus
 import com.lukouguoji.module_base.ktx.commonAdapter
+import com.lukouguoji.module_base.ktx.CustomsResponseUrl
+import com.lukouguoji.module_base.ktx.ITEM_CLICK_TYPE_CUSTOMS_RESPONSE
+import com.lukouguoji.module_base.ktx.showCustomsResponse
 import com.lukouguoji.module_base.ktx.launchCollect
 import com.lukouguoji.module_base.ktx.launchLoadingCollect
 import com.lukouguoji.module_base.ktx.showToast
@@ -289,4 +292,14 @@ class IntImpTallyViewModel : BasePageViewModel() {
             }
         }
     }
+
+    /**
+     * 列表项点击分发：侧滑「回执」按钮 → 查询海关回执并跳转只读详情页
+     */
+    override fun onItemClick(position: Int, type: Int) {
+        val bean = pageModel.rv?.commonAdapter()?.getItem(position) as? GjjImportTally ?: return
+        if (type == ITEM_CLICK_TYPE_CUSTOMS_RESPONSE) {
+            showCustomsResponse(CustomsResponseUrl.INT_IMP_TALLY, bean.prefix, bean.no, "进港理货回执")
+        }
+    }
 }

module_gjj/src/main/res/layout/activity_gjj_manifest_add.xml

@@ -1,5 +1,6 @@
 <?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:tools="http://schemas.android.com/tools">
 
     <data>
@@ -356,7 +357,37 @@
                                 android:layout_weight="0.605" />
 
                         </LinearLayout>
-                       <!-- -->
+
+                        <!-- 第8行：交接图片 -->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="4dp"
+                            android:layout_marginTop="15dp"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                completeSpace="@{5}"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:text="交接图片"
+                                android:textColor="@color/text_gray" />
+
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/rv_pic"
+                                itemLayoutId="@{viewModel.itemLayoutId}"
+                                viewHolder="@{viewModel.itemViewHolder}"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="10dp"
+                                android:layout_weight="1"
+                                android:overScrollMode="never"
+                                app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                                app:spanCount="9"
+                                tools:listitem="@layout/item_image_select_new" />
+
+                        </LinearLayout>
 
                     </LinearLayout>
 

module_gjj/src/main/res/layout/activity_int_imp_accident_visa_edit.xml

@@ -118,6 +118,12 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
+                            autoQueryEnabled="@{true}"
+                            autoQueryMaxLength="@{8}"
+                            autoQueryMinLength="@{8}"
+                            autoQueryParamKey="@{`wbNo`}"
+                            autoQueryTitle="@{`选择运单号`}"
+                            autoQueryUrl="@{`/IntImpManifest/pageQueryWbNoList`}"
                             enable="@{!viewModel.isDetailMode}"
                             hint='@{"请输入运单号"}'
                             title='@{"运单号"}'

module_gjj/src/main/res/layout/activity_int_imp_loading_list.xml

@@ -155,7 +155,7 @@
 
                 <ImageView
                     android:id="@+id/checkIcon"
-                    setIVCheckAllImage="@{viewModel.isAllChecked}"
+                    setIVCheckAllImage="@{viewModel.isAllChecked}"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginEnd="5dp"
@@ -207,7 +207,7 @@
 
             </LinearLayout>
 
-            <!-- 修改库位按钮 (蓝色) -->
+            <!-- 修改库位按钮 (蓝色)：暂时隐藏 -->
             <TextView
                 android:layout_width="100dp"
                 android:layout_height="40dp"
@@ -218,9 +218,10 @@
                 android:onClick="@{()-> activity.showModifyStorageDialog()}"
                 android:text="修改库位"
                 android:textColor="@color/white"
-                android:textSize="18sp" />
+                android:textSize="18sp"
+                android:visibility="gone" />
 
-            <!-- 入库按钮 (蓝色) -->
+            <!-- 入库按钮 (蓝色)：暂时隐藏 -->
             <TextView
                 android:layout_width="100dp"
                 android:layout_height="40dp"
@@ -230,7 +231,8 @@
                 android:onClick="@{()-> activity.showInStorageDialog()}"
                 android:text="入库"
                 android:textColor="@color/white"
-                android:textSize="18sp" />
+                android:textSize="18sp"
+                android:visibility="gone" />
 
         </LinearLayout>
 

module_gjj/src/main/res/layout/activity_int_imp_manifest.xml

@@ -274,9 +274,15 @@
                 style="@style/tv_bottom_btn"
                 android:layout_marginEnd="15dp"
                 android:onClick="@{()-> viewModel.sortingTallyClick()}"
-                android:text="分拣理货" />
+                android:text="装机单" />
 
-            <!-- 货物发放按钮 (红色) -->
+            <TextView
+                style="@style/tv_bottom_btn"
+                android:layout_marginEnd="15dp"
+                android:onClick="@{()-> viewModel.startTallyClick()}"
+                android:text="开始理货" />
+
+            <!-- 理货完成按钮 (红色) -->
             <TextView
                 android:layout_width="100dp"
                 android:layout_height="40dp"
@@ -284,7 +290,7 @@
                 android:background="@drawable/bg_red_btn_bottom"
                 android:gravity="center"
                 android:onClick="@{()-> viewModel.cargoReleaseClick()}"
-                android:text="货物发放"
+                android:text="理货完成"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
 

module_gjj/src/main/res/layout/activity_int_imp_query.xml

@@ -72,15 +72,15 @@
                         type="@{SearchLayoutType.SPINNER}"
                         value="@={viewModel.agentId}" />
 
-                    <!-- 出库状态 -->
+                    <!-- 航班号 -->
                     <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
+                        android:id="@+id/flight_no_search"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        hint='@{"请选择出库状态"}'
+                        hint='@{"请输入航班号"}'
-                        list="@{viewModel.outStatusList}"
+                        type="@{SearchLayoutType.INPUT}"
-                        type="@{SearchLayoutType.SPINNER}"
+                        value="@={viewModel.flightNo}" />
-                        value="@={viewModel.outStatus}" />
 
                     <!-- 运单号 -->
                     <com.lukouguoji.module_base.ui.weight.search.layout.PadSearchLayout
@@ -201,6 +201,16 @@
                             android:textStyle="bold"
                             tools:text="总重量：100" />
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="20dp"
+                            android:text='@{`航班航次：` + viewModel.totalFlightNumber}'
+                            android:textColor="@color/bottom_tool_tips_text_color"
+                            android:textSize="16sp"
+                            android:textStyle="bold"
+                            tools:text="航班航次：2" />
+
                     </LinearLayout>
 
                 </LinearLayout>

module_gjj/src/main/res/layout/item_int_arr_air_manifest.xml

@@ -27,6 +27,12 @@
         android:layout_marginVertical="5dp"
         android:orientation="vertical">
 
+        <!-- 侧滑布局：白色卡片（含展开按钮）+ 侧滑菜单 -->
+        <com.mcxtzhang.swipemenulib.SwipeMenuLayout
+            android:id="@+id/swipe_menu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
         <!-- 白色卡片（包含内容区域 + 展开按钮，统一圆角） -->
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
@@ -323,6 +329,23 @@
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
+        <!-- 侧滑菜单区 -->
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <!-- 回执按钮 -->
+            <TextView
+                android:id="@+id/btnResponse"
+                style="@style/tv_item_action"
+                android:background="@color/colorPrimary"
+                android:text="回执" />
+
+        </LinearLayout>
+
+        </com.mcxtzhang.swipemenulib.SwipeMenuLayout>
+
         <!-- 分单子列表容器（淡绿色背景） -->
         <LinearLayout
             visible="@{bean.showMore}"

module_gjj/src/main/res/layout/item_int_imp_loading_list.xml

@@ -8,55 +8,56 @@
 
         <variable
             name="bean"
-            type="com.lukouguoji.module_base.bean.GjjManifest" />
+            type="com.lukouguoji.module_base.bean.GjjLoadingUld" />
 
         <variable
             name="position"
             type="Integer" />
     </data>
 
-    <com.mcxtzhang.swipemenulib.SwipeMenuLayout
+    <LinearLayout
-        android:id="@+id/swipe_menu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="10dp"
-        android:layout_marginTop="10dp">
+        android:layout_marginTop="10dp"
+        android:orientation="vertical">
 
-        <!-- 主内容区域 -->
+        <!-- 白色卡片：ULD 主单 -->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/bg_white_radius_8"
-            android:orientation="horizontal"
+            android:orientation="vertical">
-            android:paddingVertical="20dp"
-            android:paddingHorizontal="10dp"
-            android:gravity="center_vertical">
 
-            <!-- 选中图标（飞机图标，根据选择状态切换图片） -->
+            <!-- 主要内容区域 -->
-            <ImageView
-                android:id="@+id/iv_icon"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center"
-                loadImage="@{bean.checked.get() ? @drawable/img_plane_s : @drawable/img_plane}"
-                android:src="@drawable/img_plane" />
-
-            <!-- 舱单信息区域 -->
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="15dp"
+                android:gravity="center_vertical"
-                android:layout_weight="1"
+                android:orientation="horizontal"
-                android:orientation="vertical">
+                android:paddingHorizontal="10dp"
+                android:paddingVertical="20dp">
 
-                <!-- 第一行：运单号、始发站、ULD编号、总件数、件数 -->
+                <!-- 选中图标 (飞机图标，根据选择状态切换图片) -->
+                <ImageView
+                    android:id="@+id/iv_icon"
+                    loadImage="@{bean.checked.get() ? @drawable/img_plane_s : @drawable/img_plane}"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="0.5px"
+                    android:src="@drawable/img_plane" />
+
+                <!-- ULD 信息区域：ULD编号、总件数、总重量、航班信息 -->
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:layout_weight="1"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
-                    <!-- 运单号 (weight=1.0) -->
+                    <!-- ULD编号 -->
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -65,235 +66,97 @@
                         android:orientation="horizontal">
 
                         <TextView
+                            completeSpace="@{5}"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            completeSpace="@{4}"
+                            android:text="ULD编号："
-                            android:text="运单号："
+                            android:textColor="@color/text_normal"
                             android:textSize="15sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@{bean.getWaybillNo()}"
+                            android:text="@{bean.uld}"
                             android:textColor="@color/colorPrimary"
                             android:textSize="15sp"
                             android:textStyle="bold" />
 
                     </LinearLayout>
 
-                    <!-- 始发站 (weight=1) -->
+                    <!-- 总件数 -->
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="0.8"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
                             completeSpace="@{4}"
-                            android:text="始发站："
-                            android:textSize="15sp" />
-
-                        <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@{bean.origin}"
-                            android:textSize="15sp" />
-
-                    </LinearLayout>
-
-                    <!-- ULD编号 (weight=1.0) -->
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            completeSpace="@{5}"
-                            android:text="ULD编号："
-                            android:textSize="15sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{bean.locationMft}"
-                            android:textSize="15sp" />
-
-                    </LinearLayout>
-
-                    <!-- 总件数 (weight=1) -->
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            completeSpace="@{4}"
                             android:text="总件数："
+                            android:textColor="@color/text_normal"
                             android:textSize="15sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@{String.valueOf(bean.totalPc)}"
+                            android:text="@{bean.totalPc == null ? `0` : String.valueOf(bean.totalPc)}"
+                            android:textColor="@color/text_normal"
                             android:textSize="15sp" />
 
                     </LinearLayout>
 
-                    <!-- 件数 (weight=1) -->
+                    <!-- 总重量 -->
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="0.8"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            completeSpace="@{5}"
-                            android:text="件数："
-                            android:textSize="15sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{String.valueOf(bean.pc)}"
-                            android:textSize="15sp" />
-
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <!-- 第二行：品名、代理、库位号、重量、计费重量 -->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
-
-                    <!-- 品名 (weight=1.0) -->
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
                             completeSpace="@{4}"
-                            android:text="品名(中)："
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="总重量："
+                            android:textColor="@color/text_normal"
                             android:textSize="15sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@{bean.goodsCn}"
+                            android:text="@{bean.totalWeightText}"
+                            android:textColor="@color/text_normal"
                             android:textSize="15sp" />
 
                     </LinearLayout>
 
-                    <!-- 代理 (weight=1) -->
+                    <!-- 航班信息 -->
                     <LinearLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="1.2"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
                         <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            completeSpace="@{4}"
-                            android:text="代理："
-                            android:textSize="15sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{bean.agentCode}"
-                            android:textSize="15sp" />
-
-                    </LinearLayout>
-
-                    <!-- 库位号 (weight=1.0) -->
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
                             completeSpace="@{5}"
-                            android:text="库位号："
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="航班信息："
+                            android:textColor="@color/text_normal"
                             android:textSize="15sp" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@{bean.locationTally}"
+                            android:ellipsize="end"
-                            android:textSize="15sp" />
+                            android:lines="1"
-
+                            android:maxLines="1"
-                    </LinearLayout>
+                            android:text="@{bean.flight}"
-
+                            android:textColor="@color/text_normal"
-                    <!-- 重量 (weight=1) -->
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            completeSpace="@{4}"
-                            android:text="重量："
-                            android:textSize="15sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{String.valueOf((int)bean.weight)}"
-                            android:textSize="15sp" />
-
-                    </LinearLayout>
-
-                    <!-- 计费重量 (weight=1) -->
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            completeSpace="@{5}"
-                            android:text="计费重量："
-                            android:textSize="15sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{String.valueOf((int)bean.cashWeight)}"
                             android:textSize="15sp" />
 
                     </LinearLayout>
@@ -302,23 +165,108 @@
 
             </LinearLayout>
 
+            <!-- 展开按钮 -->
+            <ImageView
+                android:id="@+id/iv_show"
+                android:layout_width="match_parent"
+                android:layout_height="20dp"
+                android:layout_marginTop="-20dp"
+                android:paddingVertical="2.5dp"
+                android:rotation="@{bean.showMore.get() ? 180f : 0f}"
+                android:scaleType="center"
+                android:src="@mipmap/img_down" />
+
         </LinearLayout>
 
-        <!-- 侧滑菜单区域 -->
+        <!-- 子单列表容器（关联运单，白色圆角卡片） -->
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <LinearLayout
-            android:layout_width="wrap_content"
+            visible="@{bean.showMore}"
-            android:layout_height="match_parent"
+            android:layout_width="match_parent"
-            android:orientation="horizontal">
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/bg_white_radius_8"
+            android:orientation="vertical"
+            android:visibility="gone">
 
-            <!-- 编辑按钮 -->
+            <!-- 暂无数据提示 -->
             <TextView
-                android:id="@+id/btn_edit"
+                android:id="@+id/tv_empty"
-                style="@style/tv_item_action"
+                android:layout_width="match_parent"
-                android:background="@color/colorPrimary"
+                android:layout_height="wrap_content"
-                android:text="编辑" />
+                android:gravity="center"
+                android:paddingVertical="15dp"
+                android:text="暂无运单数据"
+                android:textColor="@color/text_gray"
+                android:textSize="14sp"
+                android:visibility="gone" />
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
+            <!-- 表头 -->
+            <LinearLayout
+                android:id="@+id/ll_header"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_arrive_sub_header"
+                android:orientation="horizontal"
+                android:paddingHorizontal="10dp"
+                android:paddingVertical="10dp">
 
-    </com.mcxtzhang.swipemenulib.SwipeMenuLayout>
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.2"
+                    android:gravity="center"
+                    android:text="运单号"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center"
+                    android:text="件数"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.8"
+                    android:gravity="center"
+                    android:text="重量"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:gravity="center"
+                    android:text="品名"
+                    android:textColor="@color/text_normal"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+
+            <com.google.android.material.divider.MaterialDivider
+                android:id="@+id/divider_header"
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                app:dividerColor="@color/sub_list_divider" />
+
+            <!-- 子列表 RecyclerView -->
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_sub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+        </LinearLayout>
+
+    </LinearLayout>
 
 </layout>

module_gjj/src/main/res/layout/item_int_imp_loading_list_sub.xml

@@ -0,0 +1,86 @@
+<?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">
+
+    <data>
+
+        <variable
+            name="bean"
+            type="com.lukouguoji.module_base.bean.GjjManifest" />
+
+        <variable
+            name="position"
+            type="Integer" />
+    </data>
+
+    <LinearLayout
+        android:id="@+id/ll_row"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="8dp"
+            android:orientation="horizontal"
+            android:paddingHorizontal="10dp">
+
+            <!-- 运单号 -->
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1.2"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="@{bean.getWaybillNo()}"
+                android:textColor="@color/text_normal"
+                android:textSize="14sp" />
+
+            <!-- 件数 -->
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="0.8"
+                android:gravity="center"
+                android:text="@{String.valueOf(bean.pc)}"
+                android:textColor="@color/text_normal"
+                android:textSize="14sp" />
+
+            <!-- 重量 -->
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="0.8"
+                android:gravity="center"
+                android:text="@{String.valueOf((int)bean.weight)}"
+                android:textColor="@color/text_normal"
+                android:textSize="14sp" />
+
+            <!-- 品名 -->
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="2"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="@{bean.goodsCn.isEmpty() ? bean.goods : bean.goodsCn}"
+                android:textColor="@color/text_normal"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <com.google.android.material.divider.MaterialDivider
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            app:dividerColor="@color/sub_list_divider" />
+
+    </LinearLayout>
+
+</layout>

module_gjj/src/main/res/layout/item_int_imp_storage_use.xml

@@ -147,7 +147,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@{String.valueOf(bean.pc)}"
+                                android:text="@{bean.pcLabel ?? String.valueOf(bean.pc)}"
                                 android:textSize="15sp" />
 
                         </LinearLayout>

module_gjj/src/main/res/layout/item_int_imp_tally.xml

@@ -24,6 +24,12 @@
         android:layout_marginTop="10dp"
         android:orientation="vertical">
 
+        <!-- 侧滑布局：白色卡片（含展开按钮）+ 侧滑菜单 -->
+        <com.mcxtzhang.swipemenulib.SwipeMenuLayout
+            android:id="@+id/swipe_menu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
         <!-- 白色卡片主要内容区域 -->
         <LinearLayout
             android:layout_width="match_parent"
@@ -339,6 +345,23 @@
 
         </LinearLayout>
 
+        <!-- 侧滑菜单区 -->
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <!-- 回执按钮 -->
+            <TextView
+                android:id="@+id/btnResponse"
+                style="@style/tv_item_action"
+                android:background="@color/colorPrimary"
+                android:text="回执" />
+
+        </LinearLayout>
+
+        </com.mcxtzhang.swipemenulib.SwipeMenuLayout>
+
         <!-- 分单子列表容器（在白色卡片外面） -->
         <LinearLayout
             visible="@{bean.showMore}"

module_gjj/src/main/res/layout/layout_int_imp_query_filter.xml

@@ -68,17 +68,17 @@
                     type="@{DataLayoutType.SPINNER}"
                     value='@={viewModel.spCode}' />
 
-                <!-- 航班号 -->
+                <!-- 出库状态 -->
                 <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
-                    android:id="@+id/filter_flight_no"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="10dp"
-                    hint='@{"请输入航班号"}'
+                    hint='@{"请选择出库状态"}'
-                    title='@{"航班号"}'
+                    list="@{viewModel.outStatusList}"
+                    title='@{"出库状态"}'
                     titleLength="@{4}"
-                    type="@{DataLayoutType.INPUT}"
+                    type="@{DataLayoutType.SPINNER}"
-                    value='@={viewModel.flightNo}' />
+                    value='@={viewModel.outStatus}' />
 
                 <!-- 始发港 -->
                 <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew

module_hangban/src/main/java/com/lukouguoji/hangban/page/edit/HbFlightEditActivity.kt

@@ -0,0 +1,53 @@
+package com.lukouguoji.hangban.page.edit
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.lukouguoji.hangban.R
+import com.lukouguoji.hangban.databinding.ActivityHbFlightEditBinding
+import com.lukouguoji.module_base.base.BaseBindingActivity
+import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.common.DetailsPageType
+import com.lukouguoji.module_base.ktx.setUpperCaseAlphanumericFilter
+
+class HbFlightEditActivity :
+    BaseBindingActivity<ActivityHbFlightEditBinding, HbFlightEditViewModel>() {
+
+    override fun layoutId() = R.layout.activity_hb_flight_edit
+
+    override fun viewModelClass() = HbFlightEditViewModel::class.java
+
+    override fun initOnCreate(savedInstanceState: Bundle?) {
+        binding.viewModel = viewModel
+
+        binding.flightNoInput.et.setUpperCaseAlphanumericFilter()
+        binding.fdepInput.et.setUpperCaseAlphanumericFilter()
+        binding.fdestInput.et.setUpperCaseAlphanumericFilter()
+        binding.registrationInput.et.setUpperCaseAlphanumericFilter()
+
+        viewModel.initOnCreated(intent)
+
+        // 动态设置标题（必须在 initOnCreated 之后，pageType 已从 Intent 解析）
+        val title = when (viewModel.pageType.value) {
+            DetailsPageType.Modify -> "编辑航班"
+            else -> "新增航班"
+        }
+        setBackArrow(title)
+    }
+
+    companion object {
+        /**
+         * fid 为空表示新增，非空表示编辑
+         */
+        @JvmStatic
+        fun start(context: Context, fid: String = "") {
+            val pageType =
+                if (fid.isEmpty()) DetailsPageType.Add.name else DetailsPageType.Modify.name
+            context.startActivity(
+                Intent(context, HbFlightEditActivity::class.java)
+                    .putExtra(Constant.Key.PAGE_TYPE, pageType)
+                    .putExtra(Constant.Key.ID, fid)
+            )
+        }
+    }
+}

module_hangban/src/main/java/com/lukouguoji/hangban/page/edit/HbFlightEditViewModel.kt

@@ -0,0 +1,280 @@
+package com.lukouguoji.hangban.page.edit
+
+import android.content.Intent
+import android.view.View
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.lukouguoji.module_base.base.BaseViewModel
+import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.common.ConstantEvent
+import com.lukouguoji.module_base.common.DetailsPageType
+import com.lukouguoji.module_base.http.net.NetApply
+import com.lukouguoji.module_base.impl.FlowBus
+import com.lukouguoji.module_base.ktx.formatDate
+import com.lukouguoji.module_base.ktx.launchLoadingCollect
+import com.lukouguoji.module_base.ktx.noNull
+import com.lukouguoji.module_base.ktx.showToast
+import com.lukouguoji.module_base.ktx.toRequestBody
+import com.lukouguoji.module_base.ktx.verifyNullOrEmpty
+import com.lukouguoji.module_base.util.DictUtils
+import dev.DevUtils
+import dev.utils.app.info.KeyValue
+import dev.utils.common.DateUtils
+import kotlinx.coroutines.launch
+
+class HbFlightEditViewModel : BaseViewModel() {
+
+    val pageType = MutableLiveData(DetailsPageType.Add)
+
+    // 航班主键（编辑模式）
+    private var fid = ""
+
+    ///////////////////////////////////////////////////////////////////////////
+    // 表单字段
+    ///////////////////////////////////////////////////////////////////////////
+
+    val flightDate = MutableLiveData("")
+    val flightNo = MutableLiveData("")
+    val aircraftCode = MutableLiveData("")
+    val fdep = MutableLiveData("")
+    val jtz = MutableLiveData("")
+    val fdest = MutableLiveData("")
+    val countryType = MutableLiveData("")
+    val serviceType = MutableLiveData("")
+    val status = MutableLiveData("")
+    val scheduledTackOff = MutableLiveData("")
+    val estimatedTakeOff = MutableLiveData("")
+    val actualTakeOff = MutableLiveData("")
+    val scheduledArrival = MutableLiveData("")
+    val estimatedArrival = MutableLiveData("")
+    val actualArrival = MutableLiveData("")
+    val standId = MutableLiveData("")
+    val registration = MutableLiveData("")
+    val prefix = MutableLiveData("")
+    val flightStatus = MutableLiveData("")
+    val cmFlag = MutableLiveData("")
+    val delayFreeText = MutableLiveData("")
+
+    ///////////////////////////////////////////////////////////////////////////
+    // 下拉列表
+    ///////////////////////////////////////////////////////////////////////////
+
+    val countryTypeList = MutableLiveData<List<KeyValue>>(emptyList())
+    val serviceTypeList = MutableLiveData<List<KeyValue>>(emptyList())
+    val statusList = MutableLiveData<List<KeyValue>>(emptyList())
+    val flightStatusList = MutableLiveData<List<KeyValue>>(emptyList())
+    val cmFlagList = MutableLiveData<List<KeyValue>>(emptyList())
+
+    ///////////////////////////////////////////////////////////////////////////
+    // 选项定义（服务端入库/过滤用 code，详情接口返回中文名，回填时需反查）
+    ///////////////////////////////////////////////////////////////////////////
+
+    private val countryTypeOptions = listOf(
+        KeyValue("国内", "0"),
+        KeyValue("国际", "1"),
+        KeyValue("地区", "2"),
+        KeyValue("混合", "3"),
+    )
+
+    private val serviceTypeOptions = listOf(
+        KeyValue("客机", "0"),
+        KeyValue("货机", "1"),
+        KeyValue("卡车", "2"),
+    )
+
+    private val statusOptions = listOf(
+        KeyValue("出港", "0"),
+        KeyValue("进港", "1"),
+    )
+
+    private val flightStatusOptions = listOf(
+        KeyValue("正常", "0"),
+        KeyValue("登机", "1"),
+        KeyValue("登机结束", "2"),
+        KeyValue("起飞", "3"),
+        KeyValue("到达", "4"),
+        KeyValue("取消", "5"),
+        KeyValue("备降", "6"),
+        KeyValue("删除发布", "7"),
+        KeyValue("延误", "8"),
+        KeyValue("未知", "9"),
+    )
+
+    private val cmFlagOptions = listOf(
+        KeyValue("有货邮", "0"),
+        KeyValue("无货邮", "1"),
+    )
+
+    ///////////////////////////////////////////////////////////////////////////
+    // 方法区
+    ///////////////////////////////////////////////////////////////////////////
+
+    fun initOnCreated(intent: Intent) {
+        pageType.value =
+            if (intent.getStringExtra(Constant.Key.PAGE_TYPE) == DetailsPageType.Modify.name)
+                DetailsPageType.Modify else DetailsPageType.Add
+        fid = intent.getStringExtra(Constant.Key.ID) ?: ""
+
+        if (pageType.value == DetailsPageType.Modify && fid.isNotEmpty()) {
+            loadDetails()
+        } else {
+            flightDate.value = DateUtils.getCurrentTime().formatDate()
+            loadDictLists()
+        }
+    }
+
+    /**
+     * 编辑模式：加载航班详情
+     */
+    private fun loadDetails() {
+        launchLoadingCollect({
+            NetApply.api.getFlightDetails(fid)
+        }) {
+            onSuccess = {
+                it.data?.let { bean ->
+                    flightDate.value = bean.fdate
+                    flightNo.value = bean.fno
+                    aircraftCode.value = bean.aircraftCode
+                    fdep.value = bean.fdep
+                    jtz.value = bean.jtz
+                    fdest.value = bean.fdest
+                    countryType.value = toCode(countryTypeOptions, bean.countryType)
+                    serviceType.value = toCode(serviceTypeOptions, bean.serviceType)
+                    status.value = toCode(statusOptions, bean.status)
+                    scheduledTackOff.value = bean.scheduledTackOff
+                    estimatedTakeOff.value = bean.estimatedTakeOff
+                    actualTakeOff.value = bean.actualTakeOff
+                    scheduledArrival.value = bean.scheduledArrival
+                    estimatedArrival.value = bean.estimatedArrival
+                    actualArrival.value = bean.actualArrival
+                    standId.value = bean.standId
+                    registration.value = bean.registration
+                    prefix.value = bean.prefix
+                    flightStatus.value = toCode(flightStatusOptions, bean.flightStatus)
+                    cmFlag.value = toCode(cmFlagOptions, bean.cmFlag)
+                    delayFreeText.value = bean.delayFreeText
+                }
+                // 字典加载必须在编辑数据回填之后，保证 checkedValue 可用
+                loadDictLists()
+            }
+        }
+    }
+
+    /**
+     * 加载下拉列表（编辑模式传 checkedValue 置顶选中项）
+     */
+    private fun loadDictLists() {
+        val isModify = pageType.value == DetailsPageType.Modify
+
+        DictUtils.getCountryTypeList(
+            addAll = false,
+            checkedValue = if (isModify) countryType.value else null
+        ) {
+            countryTypeList.postValue(if (isModify) it else listOf(KeyValue("", "")) + it)
+        }
+
+        serviceTypeList.value =
+            buildStaticList(serviceTypeOptions, if (isModify) serviceType.value else null)
+
+        statusList.value =
+            buildStaticList(statusOptions, if (isModify) status.value else null)
+
+        flightStatusList.value =
+            buildStaticList(flightStatusOptions, if (isModify) flightStatus.value else null)
+
+        cmFlagList.value =
+            buildStaticList(cmFlagOptions, if (isModify) cmFlag.value else null)
+    }
+
+    /**
+     * 值转 code：详情接口可能返回中文名（如“国际”“客机”），统一转为 code 用于回填与提交
+     */
+    private fun toCode(options: List<KeyValue>, raw: String?): String {
+        if (raw.isNullOrEmpty()) return ""
+        return options.firstOrNull { it.value == raw }?.value
+            ?: options.firstOrNull { it.key == raw }?.value
+            ?: raw
+    }
+
+    /**
+     * 静态下拉列表：新增模式首位置空项；编辑模式将选中项置顶
+     */
+    private fun buildStaticList(list: List<KeyValue>, checkedValue: String?): List<KeyValue> {
+        if (checkedValue.isNullOrEmpty()) {
+            return listOf(KeyValue("", "")) + list
+        }
+        return list.filter { it.value == checkedValue } + list.filter { it.value != checkedValue }
+    }
+
+    /**
+     * 保存 点击
+     */
+    fun onSaveClick(view: View) {
+        if (flightDate.value.verifyNullOrEmpty("请选择航班日期")) return
+        if (flightNo.value.verifyNullOrEmpty("请输入航班号")) return
+        if (fdep.value.verifyNullOrEmpty("请输入始发港")) return
+        if (fdest.value.verifyNullOrEmpty("请输入目的港")) return
+
+        val isModify = pageType.value == DetailsPageType.Modify
+        val dep = fdep.value?.trim().noNull()
+        val dest = fdest.value?.trim().noNull()
+
+        val params = mutableMapOf<String, Any?>(
+            "fdate" to flightDate.value,
+            "fno" to flightNo.value?.trim(),
+            "aircraftCode" to aircraftCode.value?.trim(),
+            "fdep" to dep,
+            "jtz" to jtz.value?.trim(),
+            "fdest" to dest,
+            "range" to "$dep-$dest",
+            "countryType" to countryType.value,
+            "countryName" to countryTypeList.value
+                ?.firstOrNull { it.value == countryType.value }?.key,
+            "serviceType" to serviceType.value,
+            "status" to status.value,
+            "scheduledTackOff" to scheduledTackOff.value,
+            "estimatedTakeOff" to estimatedTakeOff.value,
+            "actualTakeOff" to actualTakeOff.value,
+            "scheduledArrival" to scheduledArrival.value,
+            "estimatedArrival" to estimatedArrival.value,
+            "actualArrival" to actualArrival.value,
+            "standId" to standId.value?.trim(),
+            "registration" to registration.value?.trim(),
+            "prefix" to prefix.value?.trim(),
+            "flightStatus" to flightStatus.value,
+            "cmFlag" to cmFlag.value,
+            "delayFreeText" to delayFreeText.value?.trim(),
+        )
+        if (isModify) {
+            params["fid"] = fid.toLongOrNull() ?: fid
+        }
+
+        launchLoadingCollect({
+            if (isModify) {
+                NetApply.api.updateFlight(params.toRequestBody())
+            } else {
+                NetApply.api.saveFlight(params.toRequestBody())
+            }
+        }) {
+            onSuccess = {
+                if (it.verifySuccess()) {
+                    showToast(if (isModify) "修改成功" else "新增成功")
+                    viewModelScope.launch {
+                        FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+                    }
+                    DevUtils.getTopActivity().finish()
+                } else {
+                    showToast(it.msg.noNull("保存失败"))
+                }
+            }
+        }
+    }
+
+    /**
+     * 取消 点击
+     */
+    fun onCancelClick(view: View) {
+        DevUtils.getTopActivity().finish()
+    }
+
+}

module_hangban/src/main/java/com/lukouguoji/hangban/page/query/list/HbQueryListActivity.kt

@@ -5,6 +5,9 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.lukouguoji.hangban.R
 import com.lukouguoji.hangban.databinding.ActivityHbQueryListBinding
 import com.lukouguoji.module_base.base.BaseBindingActivity
+import com.lukouguoji.module_base.common.ConstantEvent
+import com.lukouguoji.module_base.impl.FlowBus
+import com.lukouguoji.module_base.impl.observe
 import com.lukouguoji.module_base.ktx.addOnItemClickListener
 import com.lukouguoji.module_base.ktx.getLifecycleOwner
 import com.lukouguoji.module_base.router.ARouterConstants
@@ -26,6 +29,11 @@ class HbQueryListActivity :
 
         binding.rv.addOnItemClickListener(viewModel)
 
+        // 新增、编辑保存后刷新列表
+        FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).observe(this) {
+            viewModel.refresh()
+        }
+
         viewModel.refresh()
     }