From 05015a7a18c7e862e51377fa3f69992d257ea560 Mon Sep 17 00:00:00 2001 From: mazengfei <331023091@qq.com> Date: Tue, 10 Mar 2026 17:24:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E9=87=8D=E9=87=8F=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sw/inbound/activity/ReceiptActivity.kt | 17 +++++++++++------ .../sw/inbound/adapter/ReceiptGoodsAdapter.kt | 1 + 2 files changed, 12 insertions(+), 6 deletions(-) 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())