修复了部分问题

app/src/main/java/com/sw/inbound/model/response/GoodsInfo.kt

@@ -33,6 +33,12 @@ data class GoodsInfo(
     // 单价 界面显示
     var recUnitPriceTaxInTemp: String = "",
 
+    /**
+     * 新单价 部分收货需要
+     */
+    var newRecUnitPriceTaxIn: Float? = null,
+
+    var newRecUnitPriceTaxInTemp: String = "",
     /**
      * 单位名称
      */
@@ -109,7 +115,18 @@ data class GoodsInfo(
         get() {
             if (receivedNum == null)
                 return "-"
-            return receivedNum?.toFormattedString() ?: "-"
+            return receivedNum?.toSafeString(unitName) ?: "-"
+        }
+
+    val dualCountStr: String
+        get() {
+            return if (receivedNum != null && receivedNum != 0f && receiveCount != null && receiveCount != 0f) {
+                "${receivedNum.toSafeString(unitName)}/${receiveCount.toSafeString(unitName)}"
+            } else if (receivedNum != null && receivedNum != 0f) {
+                "${receivedNum.toSafeString(unitName)}/-"
+            } else {
+                receiveCountListStr
+            }
         }
 
     val recUnitPriceTaxInStr: String
@@ -124,6 +141,12 @@ data class GoodsInfo(
             return recUnitPriceTaxIn?.toFormattedString() ?: "-"
         }
 
+    val newRecUnitPriceTaxInListStr: String
+        get() {
+            if (newRecUnitPriceTaxIn == 0f) return "-"
+            return newRecUnitPriceTaxIn?.toFormattedString() ?: "-"
+        }
+
     val receiveCountStr: String
         get() {
             return when (receiveCount) {
@@ -204,7 +227,7 @@ data class GoodsInfo(
         if (receivedNum == null || receivedNum == 0f) {
             return "请输入收货数量或进行称重"
         }
-        if (recUnitPriceTaxIn == null || recUnitPriceTaxIn == 0f) {
+        if (newRecUnitPriceTaxIn == null || newRecUnitPriceTaxIn == 0f) {
             return "请输入收货单价"
         }
         if (recPriceExItem == null || recPriceExItem == 0f) {