From 0c0aba2aebff287bfc6c66756aa30d040df8a6bf Mon Sep 17 00:00:00 2001 From: mazengfei <331023091@qq.com> Date: Wed, 20 May 2026 14:21:03 +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 | 6 +++--- 2 files changed, 5 insertions(+), 5 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 32f3305..2cb658e 100644 --- a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt +++ b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt @@ -694,7 +694,7 @@ abstract class GoodsListActivity : BaseActivity() { } logInfo("selfProcurementSubmit自采入库提交数据:${submitData.toJsonString()}") showWaitingDialog2("加载中") - receiptViewModel.addToWarehouse(submitData) { success -> + receiptViewModel.addToWarehouse(submitData) { success, msg -> hideWaitingDialog() if (success) { toast("提交入库成功") @@ -703,7 +703,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 c819010..e30017f 100644 --- a/app/src/main/java/com/sw/inbound/viewmodel/ReceiptViewModel.kt +++ b/app/src/main/java/com/sw/inbound/viewmodel/ReceiptViewModel.kt @@ -326,14 +326,14 @@ class ReceiptViewModel @Inject constructor( fun confirmReceipt(uploadInfo: UploadInfo, callback: (Boolean) -> Unit) { launchWithLoading { val resp = repository.confirmReceipt(uploadInfo) - callback(resp.data == true) + callback(resp.isSuccess()) } } - fun addToWarehouse(list: List, callback: (Boolean) -> Unit) { + fun addToWarehouse(list: List, callback: (Boolean, String) -> Unit) { launchWithLoading { val resp = repository.selfPurchaseWarehousing(list) - callback(resp.data == true) + callback(resp.isSuccess(), resp.msg?:"") } }