diff --git a/app/src/main/java/com/sw/inbound/activity/ReceiptActivity.kt b/app/src/main/java/com/sw/inbound/activity/ReceiptActivity.kt index 2e47e5a..f5cc4af 100644 --- a/app/src/main/java/com/sw/inbound/activity/ReceiptActivity.kt +++ b/app/src/main/java/com/sw/inbound/activity/ReceiptActivity.kt @@ -5,6 +5,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.sw.inbound.R import com.sw.inbound.adapter.ReceiptGoodsAdapter import com.sw.inbound.model.response.DictType +import com.sw.inbound.model.response.GoodsInfo import com.sw.inbound.utils.ext.clickWithDebounce import com.sw.inbound.utils.ext.toJsonString import com.sw.inbound.utils.ext.toast @@ -83,12 +84,7 @@ class ReceiptActivity : GoodsListActivity() { binding.tvPurchaseNo.text = "采购单号:${detail.purCode}" val list = detail.receiveGoodsInfoList list.forEach { goodsInfo -> - goodsInfo.recUnitPriceTaxInBak = goodsInfo.recUnitPriceTaxIn - goodsInfo.recUnitPriceTaxIn = 0.0 - goodsInfo.recPriceExItemBak = goodsInfo.recPriceExItem - goodsInfo.receiveCountBak = goodsInfo.receiveCount - goodsInfo.unitNameBak = goodsInfo.unitName - goodsInfo.receivedNumBak = goodsInfo.receivedNum + resetGoods(goodsInfo) } goodsList.addAll(list) adapter.notifyDataSetChanged() @@ -97,6 +93,15 @@ class ReceiptActivity : GoodsListActivity() { } } + fun resetGoods(item: GoodsInfo) { + item.recUnitPriceTaxInBak = item.recUnitPriceTaxIn + item.recUnitPriceTaxIn = 0.0 + item.recPriceExItemBak = item.recPriceExItem + item.receiveCountBak = item.receiveCount + item.unitNameBak = item.unitName + item.receivedNumBak = item.receivedNum + } + override fun getWarehouseList(): List { return goodsList.filter { it.warehouseId.isNullOrBlank().not() && it.warehouseName.isNullOrBlank().not() diff --git a/app/src/main/java/com/sw/inbound/adapter/ReceiptGoodsAdapter.kt b/app/src/main/java/com/sw/inbound/adapter/ReceiptGoodsAdapter.kt index 8e20894..5a96390 100644 --- a/app/src/main/java/com/sw/inbound/adapter/ReceiptGoodsAdapter.kt +++ b/app/src/main/java/com/sw/inbound/adapter/ReceiptGoodsAdapter.kt @@ -176,6 +176,7 @@ class ReceiptGoodsAdapter(var receiptActivity: ReceiptActivity, var list: Mutabl item.recPriceInItem = 0.0 item.recUnitPriceTaxIn = 0.0 item.unitName = item.unitNameBak + item.goodsWeight = null notifyItemChanged(position) receiptActivity.run { userViewModel.putGoodsData(localGoodsKey, list.toJsonString())