From 675b9d234eb8a31b5919c0186b0767f6a3daaaa3 Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Sat, 17 Jan 2026 17:01:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E5=87=BA=E6=B8=AF=20?=
 =?UTF-8?q?=E8=A3=85=E8=B4=A7=E5=8D=B8=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../viewModel/IntExpAssembleStartViewModel.kt | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt
index a1f1d1e..a2572ac 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpAssembleStartViewModel.kt
@@ -1,6 +1,7 @@
 package com.lukouguoji.gjc.viewModel
 
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
 import com.lukouguoji.gjc.R
 import com.lukouguoji.gjc.holder.AssembleInfoViewHolder
 import com.lukouguoji.gjc.holder.AssemblePositionViewHolder
@@ -8,14 +9,17 @@ import com.lukouguoji.gjc.holder.AssembleWaybillViewHolder
 import com.lukouguoji.module_base.base.BaseViewModel
 import com.lukouguoji.module_base.bean.*
 import com.lukouguoji.module_base.common.Constant
+import com.lukouguoji.module_base.common.ConstantEvent
 import com.lukouguoji.module_base.db.perference.SharedPreferenceUtil
 import com.lukouguoji.module_base.http.net.NetApply
+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.toRequestBody
 import com.lukouguoji.module_base.model.ScanModel
 import dev.utils.app.info.KeyValue
+import kotlinx.coroutines.launch
 
 /**
  * 国际出港-开始组装ViewModel（静态数据）
@@ -437,17 +441,23 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
 
         val assembleCount = waybillInfo.value?.assembleCount?.trim() ?: ""
         if (assembleCount.isEmpty()) {
-            showToast("请输入组装件数")
+            val countFieldName = if (isLoad) "装货件数" else "卸货件数"
+            showToast("请输入${countFieldName}")
             return
         }
 
-        // 校验组装件数不能大于运单件数
+        // 校验件数范围
         val waybillPieces = waybillInfo.value?.waybillPieces?.trim() ?: ""
         val assembleCountInt = assembleCount.toLongOrNull() ?: 0L
         val waybillPiecesInt = waybillPieces.toLongOrNull() ?: 0L
 
         if (assembleCountInt > waybillPiecesInt) {
-            showToast("组装件数不能大于运单件数")
+            val errorMessage = if (isLoad) {
+                "装货件数不能大于运单件数"
+            } else {
+                "卸货件数不能大于已装货件数"
+            }
+            showToast(errorMessage)
             return
         }
 
@@ -559,6 +569,11 @@ class IntExpAssembleStartViewModel : BaseViewModel() {
     ) {
         showToast("${operationName}成功")
 
+        // 发送刷新事件，通知出港组装列表页面更新数据
+        viewModelScope.launch {
+            FlowBus.with<String>(ConstantEvent.EVENT_REFRESH).emit("refresh")
+        }
+
         // 重新查询组装信息列表（刷新数据）
         loadAssembledList()