修复了部分收货问题
This commit is contained in:
@@ -20,9 +20,14 @@ data class UploadInfo(
|
|||||||
*/
|
*/
|
||||||
var supplierId: Int? = null,
|
var supplierId: Int? = null,
|
||||||
/**
|
/**
|
||||||
* 物品信息
|
*
|
||||||
|
* 物品信息 【全部收货使用】
|
||||||
*/
|
*/
|
||||||
var receiveGoodsInfos: List<GoodsInfo>
|
var receiveGoodsInfos: List<GoodsInfo> = emptyList<GoodsInfo>(),
|
||||||
|
/**
|
||||||
|
* 物品信息 【部分收货使用】
|
||||||
|
*/
|
||||||
|
var receiveGoodsInfoList: List<GoodsInfo> = emptyList<GoodsInfo>()
|
||||||
) : Parcelable
|
) : Parcelable
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -135,10 +135,12 @@ fun ReceiptProductScreen(
|
|||||||
}, onConfirmClick = { isFull ->
|
}, onConfirmClick = { isFull ->
|
||||||
Timber.d(if (isFull) "确认收货" else "部分收货")
|
Timber.d(if (isFull) "确认收货" else "部分收货")
|
||||||
viewModel.updateReceiptDialog(false)
|
viewModel.updateReceiptDialog(false)
|
||||||
val uploadInfo = UploadInfo(id = id, receiveGoodsInfos = orders)
|
val uploadInfo = UploadInfo(id = id)
|
||||||
if (isFull) {
|
if (isFull) {
|
||||||
|
uploadInfo.receiveGoodsInfos = orders
|
||||||
viewModel.confirmReceipt(uploadInfo)
|
viewModel.confirmReceipt(uploadInfo)
|
||||||
} else {
|
} else {
|
||||||
|
uploadInfo.receiveGoodsInfoList = orders
|
||||||
uploadInfo.supplierId = supplierId
|
uploadInfo.supplierId = supplierId
|
||||||
viewModel.partialReceipt(uploadInfo)
|
viewModel.partialReceipt(uploadInfo)
|
||||||
}
|
}
|
||||||
@@ -156,7 +158,7 @@ fun ReceiptLeftView(
|
|||||||
viewModel: ReceiptViewModel,
|
viewModel: ReceiptViewModel,
|
||||||
id: Int
|
id: Int
|
||||||
) {
|
) {
|
||||||
val warehouseTypeList = GlobalData.warehouseTypeList // receiptViewModel.getStoreList()
|
val warehouseTypeList = GlobalData.warehouseTypeList
|
||||||
val currentPurchaseInfo by viewModel.currentPurchaseInfo.collectAsState()
|
val currentPurchaseInfo by viewModel.currentPurchaseInfo.collectAsState()
|
||||||
|
|
||||||
LaunchedEffect(id) {
|
LaunchedEffect(id) {
|
||||||
@@ -555,7 +557,7 @@ private fun ReceiptProductEditView(
|
|||||||
|
|
||||||
RowInputLayout(
|
RowInputLayout(
|
||||||
label = "收货单价",
|
label = "收货单价",
|
||||||
value = selectedItem!!.recUnitPriceTaxInTemp,
|
value = selectedItem!!.recUnitPriceTaxInTemp ?: "",
|
||||||
trailingLabel = "元",
|
trailingLabel = "元",
|
||||||
isInitUpdate = true,
|
isInitUpdate = true,
|
||||||
onValueChange = { value ->
|
onValueChange = { value ->
|
||||||
@@ -572,7 +574,7 @@ private fun ReceiptProductEditView(
|
|||||||
)
|
)
|
||||||
RowInputLayout(
|
RowInputLayout(
|
||||||
label = "收货金额",
|
label = "收货金额",
|
||||||
value = selectedItem!!.recPriceExItemTemp,
|
value = selectedItem!!.recPriceExItemTemp ?: "",
|
||||||
trailingLabel = "元",
|
trailingLabel = "元",
|
||||||
isInitUpdate = true,
|
isInitUpdate = true,
|
||||||
onValueChange = { value ->
|
onValueChange = { value ->
|
||||||
|
|||||||
Reference in New Issue
Block a user