发送取出试管架通知时增加试管信息

doc/MQTT.md

@@ -95,11 +95,26 @@ sequenceDiagram
     "src" : "stw-80a"
     "action" : "TubeRackTakeOut",
     "params" : {
-    	"batchNo":"TR-01"
+    	"batchNo":"TR-01",
+        "tubes": [
+            {
+                "index": 0,
+                "no": "R01-T01",
+                "batchNo": "Batch-1716875877308",
+                "errorRoundCount": 0
+            },
+            ...
+		]
     },
 }
 ```
 
+- `batchNo` : 批次号
+- `tubes` : 试管信息列表
+  - `index` : 试管索引
+  - `no` : 试管编号
+  - `batchNo` ：批次号
+
 
 
 **试管架已取出**

src/main/java/com/iflytop/digester/DigestionTaskThread.java

@@ -556,7 +556,10 @@ public class DigestionTaskThread extends Thread {
     private void waitForTubeRackTakeOut() {
         this.updateTaskStatus("TubeRackTakeOutWait", "等待取出试管架");
 
-        Map<String,Object> message = Map.of("batchNo", this.taskModel.batchNo, "taskId", this.taskModel.outTaskId);
+        Map<String,Object> message = new HashMap<>();
+        message.put("taskId", this.taskModel.outTaskId);
+        message.put("batchNo", this.taskModel.batchNo);
+        message.put("tubes", this.heatingSlot.tubes);
         if ( "auto".equals(this.taskModel.mode) ) {
             this.manager.sendMessageToTransBot("TubeRackTakeOut", message);
         } else {

src/main/java/com/iflytop/digester/deviceinstance/HeatingTurntableSlotTube.java

@@ -2,8 +2,12 @@ package com.iflytop.digester.deviceinstance;
 public class HeatingTurntableSlotTube {
     // tube index
     public Integer index = -1;
-    // tube no
+    /**
+     * 试管编号, 当试管编号为空时, 表示试管未放置
+     */
     public String no = "";
+    // batch no
+    public String batchNo = "";
     // 异常处理轮次计数
     public Integer errorRoundCount=0;
 }

src/main/java/com/iflytop/digester/model/MdbDigestionTask.java

@@ -63,6 +63,7 @@ public class MdbDigestionTask extends UfActiveRecord {
             var tube = new HeatingTurntableSlotTube();
             tube.index = indexCounter++;
             tube.no = tubeNode.get("no").asText();
+            tube.batchNo = this.batchNo;
             list.add(tube);
         }
         return list;