diff --git a/app/src/main/java/com/sw/inbound/model/request/UploadInfo.kt b/app/src/main/java/com/sw/inbound/model/request/UploadInfo.kt index c8efbf6..ccb49ce 100644 --- a/app/src/main/java/com/sw/inbound/model/request/UploadInfo.kt +++ b/app/src/main/java/com/sw/inbound/model/request/UploadInfo.kt @@ -20,9 +20,14 @@ data class UploadInfo( */ var supplierId: Int? = null, /** - * 物品信息 + * + * 物品信息 【全部收货使用】 */ - var receiveGoodsInfos: List + var receiveGoodsInfos: List = emptyList(), + /** + * 物品信息 【部分收货使用】 + */ + var receiveGoodsInfoList: List = emptyList() ) : Parcelable /** diff --git a/app/src/main/java/com/sw/inbound/ui/page/ReceiptProductScreen.kt b/app/src/main/java/com/sw/inbound/ui/page/ReceiptProductScreen.kt index adf18a8..6560d1e 100644 --- a/app/src/main/java/com/sw/inbound/ui/page/ReceiptProductScreen.kt +++ b/app/src/main/java/com/sw/inbound/ui/page/ReceiptProductScreen.kt @@ -135,10 +135,12 @@ fun ReceiptProductScreen( }, onConfirmClick = { isFull -> Timber.d(if (isFull) "确认收货" else "部分收货") viewModel.updateReceiptDialog(false) - val uploadInfo = UploadInfo(id = id, receiveGoodsInfos = orders) + val uploadInfo = UploadInfo(id = id) if (isFull) { + uploadInfo.receiveGoodsInfos = orders viewModel.confirmReceipt(uploadInfo) } else { + uploadInfo.receiveGoodsInfoList = orders uploadInfo.supplierId = supplierId viewModel.partialReceipt(uploadInfo) } @@ -156,7 +158,7 @@ fun ReceiptLeftView( viewModel: ReceiptViewModel, id: Int ) { - val warehouseTypeList = GlobalData.warehouseTypeList // receiptViewModel.getStoreList() + val warehouseTypeList = GlobalData.warehouseTypeList val currentPurchaseInfo by viewModel.currentPurchaseInfo.collectAsState() LaunchedEffect(id) { @@ -555,7 +557,7 @@ private fun ReceiptProductEditView( RowInputLayout( label = "收货单价", - value = selectedItem!!.recUnitPriceTaxInTemp, + value = selectedItem!!.recUnitPriceTaxInTemp ?: "", trailingLabel = "元", isInitUpdate = true, onValueChange = { value -> @@ -572,7 +574,7 @@ private fun ReceiptProductEditView( ) RowInputLayout( label = "收货金额", - value = selectedItem!!.recPriceExItemTemp, + value = selectedItem!!.recPriceExItemTemp ?: "", trailingLabel = "元", isInitUpdate = true, onValueChange = { value ->