采购列表和入库列表页支持修改数量和价格;识别弹窗关闭及延迟识别;入库页面逻辑优化;提交未选择仓库时提示优化;
This commit is contained in:
@@ -5,7 +5,6 @@ import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import coil.load
|
||||
import com.sw.inbound.activity.GoodsListActivity
|
||||
import com.sw.inbound.adapter.RecognizeAdapter
|
||||
import com.sw.inbound.databinding.DialogGoodsRecognizeBinding
|
||||
@@ -19,6 +18,7 @@ class GoodsRecognizeDialog(
|
||||
var goodsFile: File?=null,
|
||||
var goodsName: String?=null,
|
||||
var list: MutableList<SearchGoodsInfo.Record>,
|
||||
//var closeCallback:()->Unit,
|
||||
var findGoods: () -> Unit
|
||||
) : BaseDialog(context) {
|
||||
|
||||
@@ -41,9 +41,7 @@ class GoodsRecognizeDialog(
|
||||
isStateViewEnable = true
|
||||
setOnItemClickListener { adapter, view, position ->
|
||||
if (list[position].isSelected) {
|
||||
GoodsStoreDialog(context, list[position]) {
|
||||
activity?.addGoods(it)
|
||||
}.show()
|
||||
showGoodsStoreDialog(position)
|
||||
return@setOnItemClickListener
|
||||
}
|
||||
list.forEach { item ->
|
||||
@@ -51,13 +49,19 @@ class GoodsRecognizeDialog(
|
||||
}
|
||||
list[position].isSelected = true
|
||||
notifyDataSetChanged()
|
||||
GoodsStoreDialog(context, list[position]) {
|
||||
activity?.addGoods(it)
|
||||
}.show()
|
||||
showGoodsStoreDialog(position)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun showGoodsStoreDialog(position: Int) {
|
||||
GoodsStoreDialog(context, list[position]) {
|
||||
activity?.addGoods(it)
|
||||
activity?.startTime = System.currentTimeMillis()
|
||||
dismiss()
|
||||
}.show()
|
||||
}
|
||||
|
||||
private var activity: GoodsListActivity? = null
|
||||
override fun initView() {
|
||||
activity = getReceiptActivity()
|
||||
@@ -68,7 +72,12 @@ class GoodsRecognizeDialog(
|
||||
if (recognizeAdapter.list.isEmpty()) {
|
||||
loadEmptyView()
|
||||
}
|
||||
binding.ivClose.setOnClickListener { dismiss() }
|
||||
binding.ivClose.setOnClickListener {
|
||||
dismiss()
|
||||
activity?.isShowRecognizeDialog = true
|
||||
activity?.goodsRecognizeDialog = null
|
||||
activity?.startTime = System.currentTimeMillis()
|
||||
}
|
||||
binding.btnManuallyFind.setOnClickListener {
|
||||
findGoods()
|
||||
//dismiss()
|
||||
|
||||
Reference in New Issue
Block a user