优化

app/src/main/java/com/sw/inbound/dialog/AddGoodsDialog.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.net.Uri
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.EditText
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
@@ -120,7 +121,28 @@ class AddGoodsDialog(
             arrowImage = binding.ivProcurementArrow,
             list = GlobalData.unitTypeList,
             height = 2 * 71.dp
-        )
+        ) {
+            val warehouseUnit = binding.tvWarehouseUnit.text.toString().trim()
+            if (warehouseUnit.isBlank()) return@showDropDownList
+            when (it.value) {
+                "千克", "公斤" -> {
+                    setGoodsCount(warehouseUnit, "1", "2", "1000")
+                }
+                "斤" -> {
+                    setGoodsCount(warehouseUnit, "0.5", "1", "500")
+                }
+                "克" -> {
+                    setGoodsCount(warehouseUnit, "0.001", "0.002", "1")
+                }
+                else -> {
+                    val procurementUnit = binding.tvProcurementUnit.text.toString().trim()
+                    val warehouseUnit = binding.tvWarehouseUnit.text.toString().trim()
+                    binding.etGoodsCount.setText(
+                        if (procurementUnit == warehouseUnit) "1" else ""
+                    )
+                }
+            }
+        }
 //        showDropDownList(
 //            binding.flGoodsType,
 //            textView = binding.tvGoodsType,
@@ -141,6 +163,51 @@ class AddGoodsDialog(
         ) {
             binding.tvSelectUseUnit.text = it.value
             binding.tvSelectProcurementUnit.text = it.value
+            val procurementUnit = binding.tvProcurementUnit.text.toString().trim()
+            when (it.value) {
+                "千克", "公斤" -> {
+                    binding.etUseUnit.setText("1000")
+                    setGoodsCount(procurementUnit, "1", "0.5", "0.001")
+                }
+                "斤" -> {
+                    binding.etUseUnit.setText("500")
+                    setGoodsCount(procurementUnit, "2", "1", "0.002")
+                }
+                "克" -> {
+                    binding.etUseUnit.setText("1")
+                    setGoodsCount(procurementUnit, "1000", "500", "1")
+                }
+                else -> {
+                    binding.etUseUnit.setText("")
+
+                    val procurementUnit = binding.tvProcurementUnit.text.toString().trim()
+                    val warehouseUnit = binding.tvWarehouseUnit.text.toString().trim()
+                    binding.etGoodsCount.setText(
+                        if (procurementUnit == warehouseUnit) "1" else ""
+                    )
+                }
+            }
+        }
+    }
+
+    private fun setGoodsCount(unit:String, kgCount:String, jinCount:String, gCount:String) {
+        when (unit) {
+            "千克", "公斤" -> {
+                binding.etGoodsCount.setText(kgCount)
+            }
+            "斤" -> {
+                binding.etGoodsCount.setText(jinCount)
+            }
+            "克" -> {
+                binding.etGoodsCount.setText(gCount)
+            }
+            else -> {
+                val procurementUnit = binding.tvProcurementUnit.text.toString().trim()
+                val warehouseUnit = binding.tvWarehouseUnit.text.toString().trim()
+                binding.etGoodsCount.setText(
+                    if (procurementUnit == warehouseUnit) "1" else ""
+                )
+            }
         }
     }
 
@@ -227,7 +294,7 @@ class AddGoodsDialog(
             return
         }
         val goodsCount = binding.etGoodsCount.text.trim().toString()
-        if (costValue.isBlank()) {
+        if (goodsCount.isBlank()) {
             context.toast("请输入采购数量")
             return
         }

app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt

@@ -7,6 +7,7 @@ import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
+import com.sw.inbound.GlobalData
 import com.sw.inbound.R
 import com.sw.inbound.activity.FoodCollectionActivity
 import com.sw.inbound.activity.GoodsListActivity
@@ -17,7 +18,7 @@ abstract class BaseDialog(
     context: Context,
     var defWidth: Int = 1500.dp,
 //    var defHeight: Int = 900.dp
-    var defHeight: Int = 750.dp
+    var defHeight: Int = if ("f0bcabbb-0d58-3b14-8bed-9863b7ec61ef" == GlobalData.deviceId) 750.dp else 900.dp
 ) : Dialog(context, R.style.DialogTheme) {
 
     override fun onCreate(savedInstanceState: Bundle?) {