From 1092a7c43dfeb5d08d8da53aeef8727b71eadcf9 Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Mon, 25 May 2026 10:33:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=85=B7=E4=BD=93=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sw/inbound/activity/GoodsListActivity.kt    | 4 ++--
 .../main/java/com/sw/inbound/viewmodel/ReceiptViewModel.kt    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt
index 2cb658e..7deb23f 100644
--- a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt
+++ b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt
@@ -655,7 +655,7 @@ abstract class GoodsListActivity : BaseActivity() {
         )
         logInfo("receiptSubmit确认收货提交数据：${uploadInfo.toJsonString()}")
         showWaitingDialog2("加载中")
-        receiptViewModel.confirmReceipt(uploadInfo) { success ->
+        receiptViewModel.confirmReceipt(uploadInfo) { success, msg ->
             hideWaitingDialog()
             if (success) {
                 userViewModel.deleteKey(localGoodsKey)
@@ -664,7 +664,7 @@ abstract class GoodsListActivity : BaseActivity() {
                     finish()
                 }, 200)
             } else {
-                toast("确认收货失败")
+                toast("确认收货失败：$msg")
             }
         }
     }
diff --git a/app/src/main/java/com/sw/inbound/viewmodel/ReceiptViewModel.kt b/app/src/main/java/com/sw/inbound/viewmodel/ReceiptViewModel.kt
index e30017f..4387139 100644
--- a/app/src/main/java/com/sw/inbound/viewmodel/ReceiptViewModel.kt
+++ b/app/src/main/java/com/sw/inbound/viewmodel/ReceiptViewModel.kt
@@ -323,10 +323,10 @@ class ReceiptViewModel @Inject constructor(
 //        }
 //    }
 
-    fun confirmReceipt(uploadInfo: UploadInfo, callback: (Boolean) -> Unit) {
+    fun confirmReceipt(uploadInfo: UploadInfo, callback: (Boolean, String) -> Unit) {
         launchWithLoading {
             val resp = repository.confirmReceipt(uploadInfo)
-            callback(resp.isSuccess())
+            callback(resp.isSuccess(), resp.msg?:"")
         }
     }