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