From 1e46a5ace7eb316d53d30919f067833823e9f183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=A2=9E=E9=A3=9E?= <331023091@qq.com>
Date: Wed, 26 Nov 2025 11:14:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/FoodCollectionActivity.kt        | 21 ++++++++++++++++-
 .../sw/inbound/activity/GoodsListActivity.kt  |  6 ++++-
 .../sw/inbound/dialog/CollectSearchDialog.kt  | 23 +++++++++++++++++++
 .../com/sw/inbound/dialog/GoodsStoreDialog.kt |  2 +-
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt b/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt
index a47e62d..a2733cb 100644
--- a/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt
+++ b/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt
@@ -317,9 +317,11 @@ class FoodCollectionActivity : ComponentActivity() {
 //                //toast("保存失败")
 //                return
 //            }
+            val goods = searchGoodsList[clickIndex]
+            val saveName = goods.goodsName + goods.goodsCode
             box?.put(
                 Food(
-                    name = searchGoodsList[clickIndex].goodsName,
+                    name = saveName,
                     foodIdx = 0,
                     foodVector = imageVector
                 )
@@ -428,6 +430,23 @@ class FoodCollectionActivity : ComponentActivity() {
         }
     }
 
+
+    private val receiptViewModel: ReceiptViewModel by viewModels()
+
+     fun searchGoodsInfoList(goodsName: String, block:(List<SearchGoodsInfo.Record>)->Unit) {
+         runBlocking {
+             val list = searchGoodsInfoList2(goodsName)
+             block(list)
+         }
+    }
+    suspend fun searchGoodsInfoList2(
+        goodsName: String,
+        pageNo: Int = 1,
+        pageSize: Int = 10
+    ): List<SearchGoodsInfo.Record> {
+        return receiptViewModel.searchGoodsInfoList2(goodsName, pageNo, pageSize)
+    }
+
     data class RespData(
         var code:String?=null,
         var data:String?=null,
diff --git a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt
index d28a7b2..ceb7ba1 100644
--- a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt
+++ b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt
@@ -174,6 +174,10 @@ abstract class GoodsListActivity : ComponentActivity() {
         //}
         if (weight < 200) {
             if (abs(weight) < 10) {
+//                val clazzName = DialogManager.getDialogList()
+//                    .map { it.javaClass.simpleName }
+//                    .joinToString(",")
+//                Timber.tag(TAG).d(clazzName)
                 if (DialogManager.getDialogList().size == 1 &&
                     DialogManager.contains("GoodsRecognizeDialog") &&
                     goodsRecognizeDialog?.isShowing == true) {
@@ -609,7 +613,7 @@ abstract class GoodsListActivity : ComponentActivity() {
         if (isAgainRecognize) {
             runOnUiThread {
                 Loading.dismiss()
-                toast("识别识别，请稍候重试")
+                //toast("识别失败，请稍候重试")
                 recognizeCallback?.invoke(mutableListOf())
             }
             isAgainRecognize = false
diff --git a/app/src/main/java/com/sw/inbound/dialog/CollectSearchDialog.kt b/app/src/main/java/com/sw/inbound/dialog/CollectSearchDialog.kt
index 6651ad7..83c2f78 100644
--- a/app/src/main/java/com/sw/inbound/dialog/CollectSearchDialog.kt
+++ b/app/src/main/java/com/sw/inbound/dialog/CollectSearchDialog.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
+import androidx.activity.viewModels
 import androidx.core.widget.addTextChangedListener
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -18,6 +19,7 @@ import com.sw.inbound.objbox.ObjectBox
 import com.sw.inbound.utils.ext.addOnActionSearchListener
 import com.sw.inbound.utils.ext.hideKeyboard
 import com.sw.inbound.utils.ext.toast
+import com.sw.inbound.viewmodel.ReceiptViewModel
 import io.objectbox.Box
 import io.objectbox.kotlin.boxFor
 
@@ -98,6 +100,7 @@ class CollectSearchDialog(
         //        }
         //    }.start()
         //}
+
     }
 
     private var pageNo = 1
@@ -206,4 +209,24 @@ class CollectSearchDialog(
         binding.root.hideKeyboard()
     }
 
+    fun test() {
+        val goodsName = "多宝鱼,黑鱼（整条鱼）,鸡腿肉"
+        activity?.searchGoodsInfoList(goodsName = goodsName) { items->
+            items.forEach { goods ->
+                box?.all?.filter {
+                    it.name?.contains(goods.goodsName?:"-") == true
+                }?.forEach {
+                    activity?.runOnUiThread {
+                        activity?.toast(goods.goodsName)
+                    }
+                    it.name = goods.goodsName + goods.goodsCode
+                    box?.put(it)
+                }
+            }
+//            activity?.runOnUiThread {
+//                activity?.toast("已保存")
+//            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt b/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt
index 1a8a645..088e560 100644
--- a/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt
+++ b/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt
@@ -456,7 +456,7 @@ class GoodsStoreDialog(
                         val imageVector = FoodModule.bitmap2FloatArray(bitmap)
                         box?.put(
                             Food(
-                                name = goods.goodsName, foodIdx = 0, foodVector = imageVector
+                                name = goods.goodsName + goods.goodsCode, foodIdx = 0, foodVector = imageVector
                             )
                         )
                     } catch (e: Exception) {