diff --git a/app/src/main/java/com/sw/inbound/model/request/GoodsAddParam.kt b/app/src/main/java/com/sw/inbound/model/request/GoodsAddParam.kt index 7f34fbc..27ee74e 100644 --- a/app/src/main/java/com/sw/inbound/model/request/GoodsAddParam.kt +++ b/app/src/main/java/com/sw/inbound/model/request/GoodsAddParam.kt @@ -135,7 +135,7 @@ data class GoodsAddParam( if (purchaseValue == null || purchaseValue == 0f) { return "请输入采购单位对应的库存数量" } - if (purchasePrice == null || purchasePrice == BigDecimal(0)) { + if (purchasePrice == null || purchasePrice!!.toFloat() <= 0) { return "请输入单价" } return null diff --git a/app/src/main/java/com/sw/inbound/model/request/PurchaseWarehouseParam.kt b/app/src/main/java/com/sw/inbound/model/request/PurchaseWarehouseParam.kt index 0d4ba86..c4e613e 100644 --- a/app/src/main/java/com/sw/inbound/model/request/PurchaseWarehouseParam.kt +++ b/app/src/main/java/com/sw/inbound/model/request/PurchaseWarehouseParam.kt @@ -163,6 +163,9 @@ data class PurchaseWarehouseParam( if (goodsPrice == null || goodsPrice == 0.0) { return "请输入采购金额" } + if (goodsWeight == null || goodsWeight!!.toFloat() <= 0) { + return "请放入要称重的物品" + } return null } } diff --git a/app/src/main/java/com/sw/inbound/model/response/GoodsInfo.kt b/app/src/main/java/com/sw/inbound/model/response/GoodsInfo.kt index 00d1889..874c2d9 100644 --- a/app/src/main/java/com/sw/inbound/model/response/GoodsInfo.kt +++ b/app/src/main/java/com/sw/inbound/model/response/GoodsInfo.kt @@ -189,12 +189,9 @@ data class GoodsInfo( if (recPriceExItem == null || recPriceExItem == 0f) { return "请输入收货金额" } - if (goodsWeight == null || goodsWeight == BigDecimal(0)) { + if (goodsWeight == null || goodsWeight!!.toFloat() <= 0) { return "请放入要称重的物品" } return null -// return goodName == null || warehouseId == null || -// purchaseUnitId == null || recUnitPriceTaxIn == null -// || receiveCount == null || recPriceExItem == null } } \ No newline at end of file diff --git a/app/src/main/java/com/sw/inbound/viewmodel/ReceiptViewModel.kt b/app/src/main/java/com/sw/inbound/viewmodel/ReceiptViewModel.kt index d44734d..a292a1c 100644 --- a/app/src/main/java/com/sw/inbound/viewmodel/ReceiptViewModel.kt +++ b/app/src/main/java/com/sw/inbound/viewmodel/ReceiptViewModel.kt @@ -195,6 +195,9 @@ class ReceiptViewModel @Inject constructor( weight * 1000 / consumeValue / purchaseValue val finalCount = count.toSafeFloat(currentItem.unitName) Timber.d("startSensorScale weight = $weight, count = $count, finalCount = $finalCount, consumeValue = $consumeValue, purchaseValue = $purchaseValue") + if (info.receivedNumTemp.isEmpty()) { + _countUserInput.value = false + } _selectedItem.value = info.copy( goodsWeight = weight.toSafeBigDecimal(), receivedNumTemp = if (_countUserInput.value) info.receivedNumTemp else count.toSafeString( diff --git a/app/src/main/java/com/sw/inbound/viewmodel/SelfProcurementViewModel.kt b/app/src/main/java/com/sw/inbound/viewmodel/SelfProcurementViewModel.kt index 4bf4b10..f5e6a1c 100644 --- a/app/src/main/java/com/sw/inbound/viewmodel/SelfProcurementViewModel.kt +++ b/app/src/main/java/com/sw/inbound/viewmodel/SelfProcurementViewModel.kt @@ -89,6 +89,9 @@ class SelfProcurementViewModel @Inject constructor( weight * 1000 / consumeValue / purchaseValue val finalCount = count.toSafeDouble(currentItem.unitName) Timber.d("startSensorScale weight = $weight, count = $count, finalCount = $finalCount, consumeValue = $consumeValue, purchaseValue = $purchaseValue") + if (info.goodsCountTemp.isEmpty()) { + _countUserInput.value = false + } _selectedItem.value = info.copy( goodsWeight = weight.toSafeBigDecimal(), goodsCountTemp = if (_countUserInput.value) info.goodsCountTemp else count.toSafeString(