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?:"") } }