diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeV2Activity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeV2Activity.kt
index e88e23f..752cfef 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeV2Activity.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeV2Activity.kt
@@ -90,18 +90,20 @@ class HomeV2Activity : BaseActivity() {
                             it.slotNo?.filter { c -> c.isDigit() }?.toIntOrNull() == shelfNo
                         }
                         val model = list.getOrNull(pos)?:return@forEach
-                        if (model.itemType == 1) {
-                            model.actualQty = (weight.grams / 1000.0).toBigDecimal()
-                        } else {
-                            model.totalWeightG = weight.grams.toBigDecimal()
-                        }
+                        model.weight = (1.0 * weight.grams / 1000.0).toBigDecimal()
+//                        if (model.itemType == 1) {
+//                            model.actualQty = (weight.grams / 1000.0).toBigDecimal()
+//                        } else {
+//                            model.totalWeightG = weight.grams.toBigDecimal()
+//                        }
                         shelfAdapter.notifyItemChanged(pos)
-                        log("getWeightInfo: slotNo=${model.slotNo},realWeight=${weight.grams}, item:${model.toJsonString()}")
+                        log("getWeightInfo: slotNo=${model.slotNo}, realWeight=${weight.grams}, temp=${data.temperature}, item:${model.toJsonString()}")
                         EventBus.getDefault().post(SendWeightEvent(shelfNo, weight.grams))
 //                        }
                     }
                 }
-                .onTempReport { _ ->
+                .onTempReport { frame ->
+                    log("onTempReport: $frame")
                     updateLeftStatus(deviceName)
                 }
                 .onLog { message -> log(message) }
diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/activity/ShelfV2Activity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/activity/ShelfV2Activity.kt
index 31cf988..2929895 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/activity/ShelfV2Activity.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/activity/ShelfV2Activity.kt
@@ -106,10 +106,10 @@ class ShelfV2Activity : BaseActivity() {
         recordItem?.let {
             binding.tvShelfName.text = it.slotNo
             binding.tvFoodName.text = if (it.itemName.isNullOrBlank()) "-" else it.itemName
-            val weightG = it.totalWeightG?.toInt() ?: 0
-            realWeight = weightG
-            binding.tvFoodWeight.text = if (weightG < 1000) "${weightG}克"
-            else "%.3f千克".format(weightG / 1000.0)
+            val weightG = it.weight?.toDouble() ?: 0.0
+            realWeight = (weightG * 1000.0).toInt()
+            binding.tvFoodWeight.text = if (weightG >= 1.0) "%.3f千克".format(weightG)
+            else "${realWeight}克"
             startTime = System.currentTimeMillis()
         }
 
@@ -187,8 +187,9 @@ class ShelfV2Activity : BaseActivity() {
                     it.itemName = ""
                     //4-空置
                     it.slotStatus = 4
-                    it.totalWeightG = null
-                    it.actualQty = null
+//                    it.totalWeightG = null
+//                    it.actualQty = null
+                    it.weight = null
                     it.itemType = 0
                     it.traceCode = null
                     it.storeTime = null
diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/adapter/ShelfV2Adapter.kt b/app/src/main/java/com/shuwei/intelligent/shelves/adapter/ShelfV2Adapter.kt
index 271d34c..27b1c9a 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/adapter/ShelfV2Adapter.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/adapter/ShelfV2Adapter.kt
@@ -35,13 +35,15 @@ class ShelfV2Adapter(list: MutableList<ShelfModelV2>) :
         if (item.slotStatus.toInt() == 2) binding.ivStaleFood.visible()
         else binding.ivStaleFood.gone()
 
-        // 重量：itemType=2 用 totalWeightG(g)，itemType=1 用 actualQty×1000(g)
-        val weightG = if (item.itemType == 1) (item.actualQty?.toDouble() ?: 0.0) * 1000.0
-        else item.totalWeightG?.toDouble() ?: 0.0
+//        // 重量：itemType=2 用 totalWeightG(g)，itemType=1 用 actualQty×1000(g)
+//        val weightG = if (item.itemType == 1) (item.actualQty?.toDouble() ?: 0.0) * 1000.0
+//        else item.totalWeightG?.toDouble() ?: 0.0
+
+        val weightG = item.weight?.toDouble() ?: 0.0
         binding.tvFoodWeight.run {
             setTextColor(getColor(R.color.food_weight_orange))
-            text = if (abs(weightG) < 1000) "${weightG.toInt()}克"
-            else "%.3f千克".format(weightG / 1000.0)
+            text = if (abs(weightG) >= 1.0) "%.3f千克".format(weightG)
+            else "${(weightG * 1000.0).toInt()}克"
         }
 
         val isBlank = item.itemName.isNullOrBlank()
diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfModelV2.kt b/app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfModelV2.kt
index 1beb751..7d9adfa 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfModelV2.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/model/ShelfModelV2.kt
@@ -26,7 +26,7 @@ data class ShelfModelV2(
     /** 订单量 kg（itemType=1） */
     var orderQty: BigDecimal? = null,
     /** 实收量 kg（itemType=1） */
-    var actualQty: BigDecimal? = null,
+//    var actualQty: BigDecimal? = null,
     /** 差异量 kg（itemType=1，可为负） */
     var diffQty: BigDecimal? = null,
     /** 规格（itemType=2，如：标准份） */
@@ -35,7 +35,9 @@ data class ShelfModelV2(
     /** 包数（itemType=2） */
     var pkgCount: Int? = null,
     /** 总重量 g（itemType=2） */
-    var totalWeightG: BigDecimal? = null,
+//    var totalWeightG: BigDecimal? = null,
+    /** 统一重量字段，单位千克 */
+    var weight: BigDecimal? = null,
     /** 验收结果：1-合格 / 2-轻微差异 / 3-不合格 / 4-待验 */
     var checkResult: Short? = null,
     /** 存储温度（℃） */