采购单入库商品默认显示采购单信息；采集数据显示优化

app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt

@@ -28,6 +28,7 @@ import com.sw.inbound.databinding.LayoutEmptySearchBinding
 import com.sw.inbound.dialog.CollectSearchDialog
 import com.sw.inbound.dialog.CustomDialog
 import com.sw.inbound.dialog.Loading
+import com.sw.inbound.dialog.WarnDialog
 import com.sw.inbound.model.response.SearchGoodsInfo
 import com.sw.inbound.objbox.Food
 import com.sw.inbound.objbox.FoodCollectionBean
@@ -182,8 +183,7 @@ class FoodCollectionActivity : ComponentActivity() {
             }
 //            vectorThread()
 //            uploadAllImage()
-
-            upload()
+            showUploadDialog()
         }
         binding.btnTakePhoto.clickWithDebounce(800) {
             takePhoto()
@@ -224,6 +224,20 @@ class FoodCollectionActivity : ComponentActivity() {
         }
     }
 
+    private fun showUploadDialog() {
+        val goodsName = searchGoodsList[clickIndex].goodsName
+        WarnDialog(
+            context = this,
+            content = "选择错误会影响识别结果，请确认当前采集物品是：${goodsName}？",
+            cancelBlock = {
+
+            },
+            confirmBlock = {
+                upload()
+            }
+        ) .show()
+    }
+
     private var pageNo = 1
     private var clickIndex = -1
 

app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt

@@ -38,19 +38,13 @@ import com.sw.inbound.model.request.UploadInfo
 import com.sw.inbound.model.response.DictType
 import com.sw.inbound.model.response.GoodsInfo
 import com.sw.inbound.model.response.SearchGoodsInfo
-import com.sw.inbound.objbox.Food
 import com.sw.inbound.objbox.FoodModule
 import com.sw.inbound.objbox.FoodModule.IdNameScore
-import com.sw.inbound.objbox.FoodModule.bitmap2FloatArray
-import com.sw.inbound.objbox.Food_
-import com.sw.inbound.objbox.ObjectBox
 import com.sw.inbound.sdk.SensorScaleUtils
-import com.sw.inbound.utils.AssetsTool
 import com.sw.inbound.utils.BitmapCropper
 import com.sw.inbound.utils.BitmapSaver
 import com.sw.inbound.utils.CameraUtils
 import com.sw.inbound.utils.DateTimeUtils
-import com.sw.inbound.utils.FileUtils
 import com.sw.inbound.utils.ImageUtil
 import com.sw.inbound.utils.LogSaveUtil
 import com.sw.inbound.utils.PreciseDelayHandler
@@ -63,7 +57,6 @@ import com.sw.inbound.utils.ext.toast
 import com.sw.inbound.viewmodel.ReceiptViewModel
 import com.sw.inbound.viewmodel.UserViewModel
 import dagger.hilt.android.AndroidEntryPoint
-import io.objectbox.query.Query
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import okhttp3.RequestBody
@@ -483,7 +476,7 @@ abstract class GoodsListActivity : ComponentActivity() {
                 context = this,
                 list = goodsList.toMutableList(),
                 goodsFile = file,
-                goodsName = name,
+                goodsName = name
             ) {
                 GoodsSearchDialog(this).show()
             }.apply {

app/src/main/java/com/sw/inbound/activity/ReceiptActivity.kt

@@ -85,6 +85,8 @@ class ReceiptActivity : GoodsListActivity() {
                 list.forEach { goodsInfo ->
                     goodsInfo.recUnitPriceTaxInBak = goodsInfo.recUnitPriceTaxIn
                     goodsInfo.recUnitPriceTaxIn = 0.0
+                    goodsInfo.recPriceExItemBak = goodsInfo.recPriceExItem
+                    goodsInfo.receiveCountBak = goodsInfo.receiveCount
                     goodsInfo.unitNameBak = goodsInfo.unitName
                     goodsInfo.receivedNumBak = goodsInfo.receivedNum
                 }