优化采购的数据的重量清除问题
This commit is contained in:
@@ -5,6 +5,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
|
|||||||
import com.sw.inbound.R
|
import com.sw.inbound.R
|
||||||
import com.sw.inbound.adapter.ReceiptGoodsAdapter
|
import com.sw.inbound.adapter.ReceiptGoodsAdapter
|
||||||
import com.sw.inbound.model.response.DictType
|
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.clickWithDebounce
|
||||||
import com.sw.inbound.utils.ext.toJsonString
|
import com.sw.inbound.utils.ext.toJsonString
|
||||||
import com.sw.inbound.utils.ext.toast
|
import com.sw.inbound.utils.ext.toast
|
||||||
@@ -83,12 +84,7 @@ class ReceiptActivity : GoodsListActivity() {
|
|||||||
binding.tvPurchaseNo.text = "采购单号:${detail.purCode}"
|
binding.tvPurchaseNo.text = "采购单号:${detail.purCode}"
|
||||||
val list = detail.receiveGoodsInfoList
|
val list = detail.receiveGoodsInfoList
|
||||||
list.forEach { goodsInfo ->
|
list.forEach { goodsInfo ->
|
||||||
goodsInfo.recUnitPriceTaxInBak = goodsInfo.recUnitPriceTaxIn
|
resetGoods(goodsInfo)
|
||||||
goodsInfo.recUnitPriceTaxIn = 0.0
|
|
||||||
goodsInfo.recPriceExItemBak = goodsInfo.recPriceExItem
|
|
||||||
goodsInfo.receiveCountBak = goodsInfo.receiveCount
|
|
||||||
goodsInfo.unitNameBak = goodsInfo.unitName
|
|
||||||
goodsInfo.receivedNumBak = goodsInfo.receivedNum
|
|
||||||
}
|
}
|
||||||
goodsList.addAll(list)
|
goodsList.addAll(list)
|
||||||
adapter.notifyDataSetChanged()
|
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<DictType> {
|
override fun getWarehouseList(): List<DictType> {
|
||||||
return goodsList.filter {
|
return goodsList.filter {
|
||||||
it.warehouseId.isNullOrBlank().not() && it.warehouseName.isNullOrBlank().not()
|
it.warehouseId.isNullOrBlank().not() && it.warehouseName.isNullOrBlank().not()
|
||||||
|
|||||||
@@ -176,6 +176,7 @@ class ReceiptGoodsAdapter(var receiptActivity: ReceiptActivity, var list: Mutabl
|
|||||||
item.recPriceInItem = 0.0
|
item.recPriceInItem = 0.0
|
||||||
item.recUnitPriceTaxIn = 0.0
|
item.recUnitPriceTaxIn = 0.0
|
||||||
item.unitName = item.unitNameBak
|
item.unitName = item.unitNameBak
|
||||||
|
item.goodsWeight = null
|
||||||
notifyItemChanged(position)
|
notifyItemChanged(position)
|
||||||
receiptActivity.run {
|
receiptActivity.run {
|
||||||
userViewModel.putGoodsData(localGoodsKey, list.toJsonString())
|
userViewModel.putGoodsData(localGoodsKey, list.toJsonString())
|
||||||
|
|||||||
Reference in New Issue
Block a user