替换模型，重新识别改为更新数据不关闭弹窗，设备联调优化

app/src/main/java/com/sw/inbound/adapter/ReceiptGoodsAdapter.kt

@@ -16,6 +16,7 @@ import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.sw.inbound.R
 import com.sw.inbound.databinding.ListItemReceiptGoodsBinding
 import com.sw.inbound.dialog.WarnDialog
+import com.sw.inbound.ext.toFormattedString
 import com.sw.inbound.ext.toSafeDouble
 import com.sw.inbound.model.response.GoodsInfo
 import com.sw.inbound.utils.ext.dp
@@ -62,13 +63,15 @@ class ReceiptGoodsAdapter(var list: MutableList<GoodsInfo>) :
             )
             tvGoodsName.text = item.goodName.ifNullOrBlank("-")
             tvProcurementUnit.text = item.unitName.ifNullOrBlank("-")
-            tvProcurementCount.text = if (item.receiveCount == null || item.receiveCount == 0.toDouble()) "-"
-                                        else item.receiveCount.removeTrailingZeros()
+            val realCount = item.receiveCount?:0.toDouble()
+            tvProcurementCount.text = if (realCount == 0.toDouble()) "-" else realCount.removeTrailingZeros()
             //tvProcurementPrice.text = item.recUnitPriceTaxInBak.toSafeDouble(2).ifNullOrZero("-")
             //tvProcurementAmount.text = item.recPriceExItem.toSafeDouble(2).ifNullOrZero("-")
             //tvReceiptCount.text = item.receivedNum.toSafeDouble(2).ifNullOrZero("-")
-            tvGoodsWeight.text = if (item.goodsWeight == null || item.goodsWeight == 0.toBigDecimal()) "-"
-                                    else item.goodsWeight?.toDouble().removeTrailingZeros()
+
+            tvGoodsWeight.text = doubleFormat(item.goodsWeight?.toDouble())
+
+            tvReceiptPrice.text = doubleFormat(item.recUnitPriceTaxIn)
 
             if (item.unitHint.isNullOrBlank().not()) {
                 unitDivider.visible()
@@ -136,7 +139,7 @@ class ReceiptGoodsAdapter(var list: MutableList<GoodsInfo>) :
                 }
                 item.receivedNum = it
                 item.recUnitPriceTaxIn = item.recPriceInItem!! / it
-                //tvGoodsPrice.text = "${item.goodsUnitPrice?.roundedDecimalPlace(2)}"
+                tvReceiptPrice.text = "${item.recUnitPriceTaxIn?.roundedDecimalPlace(2)}"
             }
             addEditListener(etReceiptAmount) {
                 if (it == 0.toDouble()) {
@@ -146,7 +149,7 @@ class ReceiptGoodsAdapter(var list: MutableList<GoodsInfo>) :
                 }
                 item.recPriceInItem = it
                 item.recUnitPriceTaxIn = it / item.receivedNum!!
-                //tvGoodsPrice.text = "${item.goodsUnitPrice?.roundedDecimalPlace(2)}"
+                tvReceiptPrice.text = "${item.recUnitPriceTaxIn?.roundedDecimalPlace(2)}"
             }
             ivClear.run {
                 visible()
@@ -210,4 +213,9 @@ class ReceiptGoodsAdapter(var list: MutableList<GoodsInfo>) :
         }
     }
 
+    private fun doubleFormat(num:Double?): String{
+        val realNum = num?:0.toDouble()
+        return if (realNum == 0.toDouble()) "-" else realNum.toFormattedString(2)
+    }
+
 }