feat: migrate to pymodbus 3.11.4 and update bioyond configs

PyModbus 3.x Migration:
- Copied modbus.py and client.py from dev branch for compatibility
- Rewrote FLOAT32 decoding using struct module in coin_cell_assembly.py
- Fixed STRING decoding for QR codes (battery and electrolyte barcodes)
- Tested successfully on hardware with correct data decoding

Bioyond Studio Updates:
- Updated bioyond_studio config.py
- Modified bioyond_cell_workstation.py
- Enhanced warehouse.py and decks.py
- Added README_WAREHOUSE.md documentation

Parameter Enhancements:
- Enhanced coin_cell_workstation.yaml parameter descriptions
- Added matrix position ranges and indexing rules

Breaking changes:
- Requires pymodbus >= 3.9.0
- Removed deprecated BinaryPayloadDecoder/BinaryPayloadBuilder
- Updated to use client.convert_from/to_registers() methods

fix_datatype.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import re
+
+filepath = r'd:\UniLab\Uni-Lab-OS\unilabos\device_comms\modbus_plc\modbus.py'
+
+with open(filepath, 'r', encoding='utf-8') as f:
+    content = f.read()
+
+# Replace the DataType placeholder with actual enum
+find_pattern = r'# DataType will be accessed via client instance.*?DataType = None  # Placeholder.*?\n'
+replacement = '''# Define DataType enum for pymodbus 2.5.3 compatibility
+class DataType(Enum):
+    INT16 = "int16"
+    UINT16 = "uint16"
+    INT32 = "int32"
+    UINT32 = "uint32"
+    INT64 = "int64"
+    UINT64 = "uint64"
+    FLOAT32 = "float32"
+    FLOAT64 = "float64"
+    STRING = "string"
+    BOOL = "bool"
+
+'''
+
+new_content = re.sub(find_pattern, replacement, content, flags=re.DOTALL)
+
+with open(filepath, 'w', encoding='utf-8') as f:
+    f.write(new_content)
+
+print('File updated successfully!')

unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_cell_workstation.py

@@ -161,6 +161,95 @@ class BioyondCellWorkstation(BioyondWorkstation):
             logger.warning(f"任务未知状态 ({status}) (orderCode={order_code})")
             return {"status": f"unknown_{status}", "report": report}
 
+    def get_material_info(self, material_id: str) -> Dict[str, Any]:
+        """查询物料详细信息（物料详情接口）
+        
+        Args:
+            material_id: 物料 ID (GUID)
+            
+        Returns:
+            物料详情，包含 name, typeName, locations 等
+        """
+        result = self._post_lims("/api/lims/storage/material-info", material_id)
+        return result.get("data", {})
+
+    def _process_order_reagents(self, report: Dict[str, Any]) -> Dict[str, Any]:
+        """处理订单完成报文中的试剂数据，计算质量比
+        
+        Args:
+            report: 订单完成推送的 report 数据
+            
+        Returns:
+            {
+                "real_mass_ratio": {"试剂A": 0.6, "试剂B": 0.4},
+                "target_mass_ratio": {"试剂A": 0.6, "试剂B": 0.4},
+                "reagent_details": [...]  # 详细数据
+            }
+        """
+        used_materials = report.get("usedMaterials", [])
+        
+        # 1. 筛选试剂（typemode="2"，注意是小写且是字符串）
+        reagents = [m for m in used_materials if str(m.get("typemode")) == "2"]
+        
+        if not reagents:
+            logger.warning("订单完成报文中没有试剂（typeMode=2）")
+            return {
+                "real_mass_ratio": {},
+                "target_mass_ratio": {},
+                "reagent_details": []
+            }
+        
+        # 2. 查询试剂名称
+        reagent_data = []
+        for reagent in reagents:
+            material_id = reagent.get("materialId")
+            if not material_id:
+                continue
+                
+            try:
+                info = self.get_material_info(material_id)
+                name = info.get("name", f"Unknown_{material_id[:8]}")
+                real_qty = float(reagent.get("realQuantity", 0.0))
+                used_qty = float(reagent.get("usedQuantity", 0.0))
+                
+                reagent_data.append({
+                    "name": name,
+                    "material_id": material_id,
+                    "real_quantity": real_qty,
+                    "used_quantity": used_qty
+                })
+                logger.info(f"试剂: {name}, 目标={used_qty}g, 实际={real_qty}g")
+            except Exception as e:
+                logger.error(f"查询物料信息失败: {material_id}, {e}")
+                continue
+        
+        if not reagent_data:
+            return {
+                "real_mass_ratio": {},
+                "target_mass_ratio": {},
+                "reagent_details": []
+            }
+        
+        # 3. 计算质量比
+        def calculate_mass_ratio(items: List[Dict], key: str) -> Dict[str, float]:
+            total = sum(item[key] for item in items)
+            if total == 0:
+                logger.warning(f"总质量为0，无法计算{key}质量比")
+                return {item["name"]: 0.0 for item in items}
+            return {item["name"]: round(item[key] / total, 4) for item in items}
+        
+        real_mass_ratio = calculate_mass_ratio(reagent_data, "real_quantity")
+        target_mass_ratio = calculate_mass_ratio(reagent_data, "used_quantity")
+        
+        logger.info(f"真实质量比: {real_mass_ratio}")
+        logger.info(f"目标质量比: {target_mass_ratio}")
+        
+        return {
+            "real_mass_ratio": real_mass_ratio,
+            "target_mass_ratio": target_mass_ratio,
+            "reagent_details": reagent_data
+        }
+
 
     # -------------------- 基础HTTP封装 --------------------
     def _url(self, path: str) -> str:
@@ -257,7 +346,7 @@ class BioyondCellWorkstation(BioyondWorkstation):
     def auto_feeding4to3(
         self,
         # ★ 修改点：默认模板路径
-        xlsx_path: Optional[str] = "/Users/sml/work/Unilab/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/material_template.xlsx",
+        xlsx_path: Optional[str] = "D:\\UniLab\\Uni-Lab-OS\\unilabos\\devices\\workstation\\bioyond_studio\\bioyond_cell\\material_template.xlsx",
         # ---------------- WH4 - 加样头面 (Z=1, 12个点位) ----------------
         WH4_x1_y1_z1_1_materialName: str = "", WH4_x1_y1_z1_1_quantity: float = 0.0,
         WH4_x2_y1_z1_2_materialName: str = "", WH4_x2_y1_z1_2_quantity: float = 0.0,
@@ -394,9 +483,13 @@ class BioyondCellWorkstation(BioyondWorkstation):
             return response
           # 等待完成报送
         result = self.wait_for_order_finish(order_code)
+        print("\n" + "="*60)
+        print("实验记录本结果auto_feeding4to3")
+        print("="*60)
+        print(json.dumps(result, indent=2, ensure_ascii=False))
+        print("="*60 + "\n")
         return result
     
-
     def auto_batch_outbound_from_xlsx(self, xlsx_path: str) -> Dict[str, Any]:
         """
         3.31 自动化下料（Excel -> JSON -> POST /api/lims/storage/auto-batch-out-bound）
@@ -474,7 +567,7 @@ class BioyondCellWorkstation(BioyondWorkstation):
         - totalMass 自动计算为所有物料质量之和
         - createTime 缺失或为空时自动填充为当前日期（YYYY/M/D）
         """
-        default_path = Path("/Users/sml/work/Unilab/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/2025092701.xlsx")
+        default_path = Path("D:\\UniLab\\Uni-Lab-OS\\unilabos\\devices\\workstation\\bioyond_studio\\bioyond_cell\\2025122301.xlsx")
         path = Path(xlsx_path) if xlsx_path else default_path
         print(f"[create_orders] 使用 Excel 路径: {path}")
         if path != default_path:
@@ -610,19 +703,324 @@ class BioyondCellWorkstation(BioyondWorkstation):
         print(f"[create_orders] 即将提交订单数量: {len(orders)}")
         response = self._post_lims("/api/lims/order/orders", orders)
         print(f"[create_orders] 接口返回: {response}")
-        # 等待任务报送成功
+        
+        # 提取所有返回的 orderCode
         data_list = response.get("data", [])
-        if data_list:
-            order_code = data_list[0].get("orderCode")
-        else:
-            order_code = None
-
-        if not order_code:
-            logger.error("上料任务未返回有效 orderCode！")
+        if not data_list:
+            logger.error("创建订单未返回有效数据！")
             return response
-          # 等待完成报送
-        result = self.wait_for_order_finish(order_code)
-        return result
+        
+        # 收集所有 orderCode
+        order_codes = []
+        for order_item in data_list:
+            code = order_item.get("orderCode")
+            if code:
+                order_codes.append(code)
+        
+        if not order_codes:
+            logger.error("未找到任何有效的 orderCode！")
+            return response
+        
+        print(f"[create_orders] 等待 {len(order_codes)} 个订单完成: {order_codes}")
+        
+        # 等待所有订单完成并收集报文
+        all_reports = []
+        for idx, order_code in enumerate(order_codes, 1):
+            print(f"[create_orders] 正在等待第 {idx}/{len(order_codes)} 个订单: {order_code}")
+            result = self.wait_for_order_finish(order_code)
+            
+            # 提取报文数据
+            if result.get("status") == "success":
+                report = result.get("report", {})
+                
+                # [新增] 处理试剂数据，计算质量比
+                try:
+                    mass_ratios = self._process_order_reagents(report)
+                    report["mass_ratios"] = mass_ratios  # 添加到报文中
+                    logger.info(f"已计算订单 {order_code} 的试剂质量比")
+                except Exception as e:
+                    logger.error(f"计算试剂质量比失败: {e}")
+                    report["mass_ratios"] = {
+                        "real_mass_ratio": {},
+                        "target_mass_ratio": {},
+                        "reagent_details": [],
+                        "error": str(e)
+                    }
+                
+                all_reports.append(report)
+                print(f"[create_orders] ✓ 订单 {order_code} 完成")
+            else:
+                logger.warning(f"订单 {order_code} 状态异常: {result.get('status')}")
+                # 即使订单失败，也记录下这个结果
+                all_reports.append({
+                    "orderCode": order_code,
+                    "status": result.get("status"),
+                    "error": result.get("message", "未知错误")
+                })
+        
+        print(f"[create_orders] 所有订单已完成，共收集 {len(all_reports)} 个报文")
+        print("实验记录本========================create_orders========================")
+        
+        # 返回所有订单的完成报文
+        final_result = {
+            "status": "all_completed",
+            "total_orders": len(order_codes),
+            "reports": all_reports,
+            "original_response": response
+        }
+        
+        print(f"返回报文数量: {len(all_reports)}")
+        for i, report in enumerate(all_reports, 1):
+            print(f"报文 {i}: orderCode={report.get('orderCode', 'N/A')}, status={report.get('status', 'N/A')}")
+        print("========================")
+        
+        return final_result
+
+    def create_orders_v2(self, xlsx_path: str) -> Dict[str, Any]:
+        """
+        从 Excel 解析并创建实验（2.14）- V2版本
+        约定：
+        - batchId = Excel 文件名（不含扩展名）
+        - 物料列：所有以 "(g)" 结尾（不再读取"总质量(g)"列）
+        - totalMass 自动计算为所有物料质量之和
+        - createTime 缺失或为空时自动填充为当前日期（YYYY/M/D）
+        """
+        default_path = Path("D:\\UniLab\\Uni-Lab-OS\\unilabos\\devices\\workstation\\bioyond_studio\\bioyond_cell\\2025122301.xlsx")
+        path = Path(xlsx_path) if xlsx_path else default_path
+        print(f"[create_orders_v2] 使用 Excel 路径: {path}")
+        if path != default_path:
+            print("[create_orders_v2] 来源: 调用方传入自定义路径")
+        else:
+            print("[create_orders_v2] 来源: 使用默认模板路径")
+
+        if not path.exists():
+            print(f"[create_orders_v2] ⚠️ Excel 文件不存在: {path}")
+            raise FileNotFoundError(f"未找到 Excel 文件：{path}")
+
+        try:
+            df = pd.read_excel(path, sheet_name=0, engine="openpyxl")
+        except Exception as e:
+            raise RuntimeError(f"读取 Excel 失败：{e}")
+        print(f"[create_orders_v2] Excel 读取成功，行数: {len(df)}, 列: {list(df.columns)}")
+
+        # 列名容错：返回可选列名，找不到则返回 None
+        def _pick(col_names: List[str]) -> Optional[str]:
+            for c in col_names:
+                if c in df.columns:
+                    return c
+            return None
+
+        col_order_name = _pick(["配方ID", "orderName", "订单编号"])
+        col_create_time = _pick(["创建日期", "createTime"])
+        col_bottle_type = _pick(["配液瓶类型", "bottleType"])
+        col_mix_time = _pick(["混匀时间(s)", "mixTime"])
+        col_load = _pick(["扣电组装分液体积", "loadSheddingInfo"])
+        col_pouch = _pick(["软包组装分液体积", "pouchCellInfo"])
+        col_cond = _pick(["电导测试分液体积", "conductivityInfo"])
+        col_cond_cnt = _pick(["电导测试分液瓶数", "conductivityBottleCount"])
+        print("[create_orders_v2] 列匹配结果:", {
+            "order_name": col_order_name,
+            "create_time": col_create_time,
+            "bottle_type": col_bottle_type,
+            "mix_time": col_mix_time,
+            "load": col_load,
+            "pouch": col_pouch,
+            "conductivity": col_cond,
+            "conductivity_bottle_count": col_cond_cnt,
+        })
+
+        # 物料列：所有以 (g) 结尾
+        material_cols = [c for c in df.columns if isinstance(c, str) and c.endswith("(g)")]
+        print(f"[create_orders_v2] 识别到的物料列: {material_cols}")
+        if not material_cols:
+            raise KeyError("未发现任何以“(g)”结尾的物料列，请检查表头。")
+
+        batch_id = path.stem
+
+        def _to_ymd_slash(v) -> str:
+            # 统一为 "YYYY/M/D"；为空或解析失败则用当前日期
+            if v is None or (isinstance(v, float) and pd.isna(v)) or str(v).strip() == "":
+                ts = datetime.now()
+            else:
+                try:
+                    ts = pd.to_datetime(v)
+                except Exception:
+                    ts = datetime.now()
+            return f"{ts.year}/{ts.month}/{ts.day}"
+
+        def _as_int(val, default=0) -> int:
+            try:
+                if pd.isna(val):
+                    return default
+                return int(val)
+            except Exception:
+                return default
+
+        def _as_float(val, default=0.0) -> float:
+            try:
+                if pd.isna(val):
+                    return default
+                return float(val)
+            except Exception:
+                return default
+
+        def _as_str(val, default="") -> str:
+            if val is None or (isinstance(val, float) and pd.isna(val)):
+                return default
+            s = str(val).strip()
+            return s if s else default
+
+        orders: List[Dict[str, Any]] = []
+
+        for idx, row in df.iterrows():
+            mats: List[Dict[str, Any]] = []
+            total_mass = 0.0
+
+            for mcol in material_cols:
+                val = row.get(mcol, None)
+                if val is None or (isinstance(val, float) and pd.isna(val)):
+                    continue
+                try:
+                    mass = float(val)
+                except Exception:
+                    continue
+                if mass > 0:
+                    mats.append({"name": mcol.replace("(g)", ""), "mass": mass})
+                    total_mass += mass
+                else:
+                    if mass < 0:
+                        print(f"[create_orders_v2] 第 {idx+1} 行物料 {mcol} 数值为负数: {mass}")
+
+            order_data = {
+                "batchId": batch_id,
+                "orderName": _as_str(row[col_order_name], default=f"{batch_id}_order_{idx+1}") if col_order_name else f"{batch_id}_order_{idx+1}",
+                "createTime": _to_ymd_slash(row[col_create_time]) if col_create_time else _to_ymd_slash(None),
+                "bottleType": _as_str(row[col_bottle_type], default="配液小瓶") if col_bottle_type else "配液小瓶",
+                "mixTime": _as_int(row[col_mix_time]) if col_mix_time else 0,
+                "loadSheddingInfo": _as_float(row[col_load]) if col_load else 0.0,
+                "pouchCellInfo": _as_float(row[col_pouch]) if col_pouch else 0,
+                "conductivityInfo": _as_float(row[col_cond]) if col_cond else 0,
+                "conductivityBottleCount": _as_int(row[col_cond_cnt]) if col_cond_cnt else 0,
+                "materialInfos": mats,
+                "totalMass": round(total_mass, 4)  # 自动汇总
+            }
+            print(f"[create_orders_v2] 第 {idx+1} 行解析结果: orderName={order_data['orderName']}, "
+                  f"loadShedding={order_data['loadSheddingInfo']}, pouchCell={order_data['pouchCellInfo']}, "
+                  f"conductivity={order_data['conductivityInfo']}, totalMass={order_data['totalMass']}, "
+                  f"material_count={len(mats)}")
+
+            if order_data["totalMass"] <= 0:
+                print(f"[create_orders_v2] ⚠️ 第 {idx+1} 行总质量 <= 0，可能导致 LIMS 校验失败")
+            if not mats:
+                print(f"[create_orders_v2] ⚠️ 第 {idx+1} 行未找到有效物料")
+
+            orders.append(order_data)
+        print("================================================")
+        print("orders:", orders)
+
+        print(f"[create_orders_v2] 即将提交订单数量: {len(orders)}")
+        response = self._post_lims("/api/lims/order/orders", orders)
+        print(f"[create_orders_v2] 接口返回: {response}")
+        
+        # 提取所有返回的 orderCode
+        data_list = response.get("data", [])
+        if not data_list:
+            logger.error("创建订单未返回有效数据！")
+            return response
+        
+        # 收集所有 orderCode
+        order_codes = []
+        for order_item in data_list:
+            code = order_item.get("orderCode")
+            if code:
+                order_codes.append(code)
+        
+        if not order_codes:
+            logger.error("未找到任何有效的 orderCode！")
+            return response
+        
+        print(f"[create_orders_v2] 等待 {len(order_codes)} 个订单完成: {order_codes}")
+        
+        # ========== 步骤1: 等待所有订单完成并收集报文（不计算质量比）==========
+        all_reports = []
+        for idx, order_code in enumerate(order_codes, 1):
+            print(f"[create_orders_v2] 正在等待第 {idx}/{len(order_codes)} 个订单: {order_code}")
+            result = self.wait_for_order_finish(order_code)
+            
+            # 提取报文数据
+            if result.get("status") == "success":
+                report = result.get("report", {})
+                all_reports.append(report)
+                print(f"[create_orders_v2] ✓ 订单 {order_code} 完成")
+            else:
+                logger.warning(f"订单 {order_code} 状态异常: {result.get('status')}")
+                # 即使订单失败，也记录下这个结果
+                all_reports.append({
+                    "orderCode": order_code,
+                    "status": result.get("status"),
+                    "error": result.get("message", "未知错误")
+                })
+        
+        print(f"[create_orders_v2] 所有订单已完成，共收集 {len(all_reports)} 个报文")
+        
+        # ========== 步骤2: 统一计算所有订单的质量比 ==========
+        print(f"[create_orders_v2] 开始统一计算 {len(all_reports)} 个订单的质量比...")
+        all_mass_ratios = []  # 存储所有订单的质量比，与reports顺序一致
+        
+        for idx, report in enumerate(all_reports, 1):
+            order_code = report.get("orderCode", "N/A")
+            print(f"[create_orders_v2] 计算第 {idx}/{len(all_reports)} 个订单 {order_code} 的质量比...")
+            
+            # 只为成功完成的订单计算质量比
+            if "error" not in report:
+                try:
+                    mass_ratios = self._process_order_reagents(report)
+                    # 精简输出，只保留核心质量比信息
+                    all_mass_ratios.append({
+                        "orderCode": order_code,
+                        "orderName": report.get("orderName", "N/A"),
+                        "real_mass_ratio": mass_ratios.get("real_mass_ratio", {}),
+                        "target_mass_ratio": mass_ratios.get("target_mass_ratio", {})
+                    })
+                    logger.info(f"✓ 已计算订单 {order_code} 的试剂质量比")
+                except Exception as e:
+                    logger.error(f"计算订单 {order_code} 质量比失败: {e}")
+                    all_mass_ratios.append({
+                        "orderCode": order_code,
+                        "orderName": report.get("orderName", "N/A"),
+                        "real_mass_ratio": {},
+                        "target_mass_ratio": {},
+                        "error": str(e)
+                    })
+            else:
+                # 失败的订单不计算质量比
+                all_mass_ratios.append({
+                    "orderCode": order_code,
+                    "orderName": report.get("orderName", "N/A"),
+                    "real_mass_ratio": {},
+                    "target_mass_ratio": {},
+                    "error": "订单未成功完成"
+                })
+        
+        print(f"[create_orders_v2] 质量比计算完成")
+        print("实验记录本========================create_orders_v2========================")
+        
+        # 返回所有订单的完成报文
+        final_result = {
+            "status": "all_completed",
+            "total_orders": len(order_codes),
+            "bottle_count": len(order_codes),  # 明确标注瓶数，用于下游check
+            "reports": all_reports,  # 原始订单报文（不含质量比）
+            "mass_ratios": all_mass_ratios,  # 所有质量比统一放在这里
+            "original_response": response
+        }
+        
+        print(f"返回报文数量: {len(all_reports)}")
+        for i, report in enumerate(all_reports, 1):
+            print(f"报文 {i}: orderCode={report.get('orderCode', 'N/A')}, status={report.get('status', 'N/A')}")
+        print("========================")
+        
+        return final_result
 
     # 2.7 启动调度
     def scheduler_start(self) -> Dict[str, Any]:
@@ -635,7 +1033,7 @@ class BioyondCellWorkstation(BioyondWorkstation):
         请求体只包含 apiKey 和 requestTime
         """
         return self._post_lims("/api/lims/scheduler/stop")
-            # 2.9 继续调度
+         
     # 2.9 继续调度
     def scheduler_continue(self) -> Dict[str, Any]:
         """
@@ -650,6 +1048,146 @@ class BioyondCellWorkstation(BioyondWorkstation):
         """
         return self._post_lims("/api/lims/scheduler/reset")
 
+    def scheduler_start_and_auto_feeding(
+        self,
+        # ★ Excel路径参数
+        xlsx_path: Optional[str] = "D:\\UniLab\\Uni-Lab-OS\\unilabos\\devices\\workstation\\bioyond_studio\\bioyond_cell\\material_template.xlsx",
+        # ---------------- WH4 - 加样头面 (Z=1, 12个点位) ----------------
+        WH4_x1_y1_z1_1_materialName: str = "", WH4_x1_y1_z1_1_quantity: float = 0.0,
+        WH4_x2_y1_z1_2_materialName: str = "", WH4_x2_y1_z1_2_quantity: float = 0.0,
+        WH4_x3_y1_z1_3_materialName: str = "", WH4_x3_y1_z1_3_quantity: float = 0.0,
+        WH4_x4_y1_z1_4_materialName: str = "", WH4_x4_y1_z1_4_quantity: float = 0.0,
+        WH4_x5_y1_z1_5_materialName: str = "", WH4_x5_y1_z1_5_quantity: float = 0.0,
+        WH4_x1_y2_z1_6_materialName: str = "", WH4_x1_y2_z1_6_quantity: float = 0.0,
+        WH4_x2_y2_z1_7_materialName: str = "", WH4_x2_y2_z1_7_quantity: float = 0.0,
+        WH4_x3_y2_z1_8_materialName: str = "", WH4_x3_y2_z1_8_quantity: float = 0.0,
+        WH4_x4_y2_z1_9_materialName: str = "", WH4_x4_y2_z1_9_quantity: float = 0.0,
+        WH4_x5_y2_z1_10_materialName: str = "", WH4_x5_y2_z1_10_quantity: float = 0.0,
+        WH4_x1_y3_z1_11_materialName: str = "", WH4_x1_y3_z1_11_quantity: float = 0.0,
+        WH4_x2_y3_z1_12_materialName: str = "", WH4_x2_y3_z1_12_quantity: float = 0.0,
+
+        # ---------------- WH4 - 原液瓶面 (Z=2, 9个点位) ----------------
+        WH4_x1_y1_z2_1_materialName: str = "", WH4_x1_y1_z2_1_quantity: float = 0.0, WH4_x1_y1_z2_1_materialType: str = "", WH4_x1_y1_z2_1_targetWH: str = "",
+        WH4_x2_y1_z2_2_materialName: str = "", WH4_x2_y1_z2_2_quantity: float = 0.0, WH4_x2_y1_z2_2_materialType: str = "", WH4_x2_y1_z2_2_targetWH: str = "",
+        WH4_x3_y1_z2_3_materialName: str = "", WH4_x3_y1_z2_3_quantity: float = 0.0, WH4_x3_y1_z2_3_materialType: str = "", WH4_x3_y1_z2_3_targetWH: str = "",
+        WH4_x1_y2_z2_4_materialName: str = "", WH4_x1_y2_z2_4_quantity: float = 0.0, WH4_x1_y2_z2_4_materialType: str = "", WH4_x1_y2_z2_4_targetWH: str = "",
+        WH4_x2_y2_z2_5_materialName: str = "", WH4_x2_y2_z2_5_quantity: float = 0.0, WH4_x2_y2_z2_5_materialType: str = "", WH4_x2_y2_z2_5_targetWH: str = "",
+        WH4_x3_y2_z2_6_materialName: str = "", WH4_x3_y2_z2_6_quantity: float = 0.0, WH4_x3_y2_z2_6_materialType: str = "", WH4_x3_y2_z2_6_targetWH: str = "",
+        WH4_x1_y3_z2_7_materialName: str = "", WH4_x1_y3_z2_7_quantity: float = 0.0, WH4_x1_y3_z2_7_materialType: str = "", WH4_x1_y3_z2_7_targetWH: str = "",
+        WH4_x2_y3_z2_8_materialName: str = "", WH4_x2_y3_z2_8_quantity: float = 0.0, WH4_x2_y3_z2_8_materialType: str = "", WH4_x2_y3_z2_8_targetWH: str = "",
+        WH4_x3_y3_z2_9_materialName: str = "", WH4_x3_y3_z2_9_quantity: float = 0.0, WH4_x3_y3_z2_9_materialType: str = "", WH4_x3_y3_z2_9_targetWH: str = "",
+
+        # ---------------- WH3 - 人工堆栈 (Z=3, 15个点位) ----------------
+        WH3_x1_y1_z3_1_materialType: str = "", WH3_x1_y1_z3_1_materialId: str = "", WH3_x1_y1_z3_1_quantity: float = 0,
+        WH3_x2_y1_z3_2_materialType: str = "", WH3_x2_y1_z3_2_materialId: str = "", WH3_x2_y1_z3_2_quantity: float = 0,
+        WH3_x3_y1_z3_3_materialType: str = "", WH3_x3_y1_z3_3_materialId: str = "", WH3_x3_y1_z3_3_quantity: float = 0,
+        WH3_x1_y2_z3_4_materialType: str = "", WH3_x1_y2_z3_4_materialId: str = "", WH3_x1_y2_z3_4_quantity: float = 0,
+        WH3_x2_y2_z3_5_materialType: str = "", WH3_x2_y2_z3_5_materialId: str = "", WH3_x2_y2_z3_5_quantity: float = 0,
+        WH3_x3_y2_z3_6_materialType: str = "", WH3_x3_y2_z3_6_materialId: str = "", WH3_x3_y2_z3_6_quantity: float = 0,
+        WH3_x1_y3_z3_7_materialType: str = "", WH3_x1_y3_z3_7_materialId: str = "", WH3_x1_y3_z3_7_quantity: float = 0,
+        WH3_x2_y3_z3_8_materialType: str = "", WH3_x2_y3_z3_8_materialId: str = "", WH3_x2_y3_z3_8_quantity: float = 0,
+        WH3_x3_y3_z3_9_materialType: str = "", WH3_x3_y3_z3_9_materialId: str = "", WH3_x3_y3_z3_9_quantity: float = 0,
+        WH3_x1_y4_z3_10_materialType: str = "", WH3_x1_y4_z3_10_materialId: str = "", WH3_x1_y4_z3_10_quantity: float = 0,
+        WH3_x2_y4_z3_11_materialType: str = "", WH3_x2_y4_z3_11_materialId: str = "", WH3_x2_y4_z3_11_quantity: float = 0,
+        WH3_x3_y4_z3_12_materialType: str = "", WH3_x3_y4_z3_12_materialId: str = "", WH3_x3_y4_z3_12_quantity: float = 0,
+        WH3_x1_y5_z3_13_materialType: str = "", WH3_x1_y5_z3_13_materialId: str = "", WH3_x1_y5_z3_13_quantity: float = 0,
+        WH3_x2_y5_z3_14_materialType: str = "", WH3_x2_y5_z3_14_materialId: str = "", WH3_x2_y5_z3_14_quantity: float = 0,
+        WH3_x3_y5_z3_15_materialType: str = "", WH3_x3_y5_z3_15_materialId: str = "", WH3_x3_y5_z3_15_quantity: float = 0,
+    ) -> Dict[str, Any]:
+        """
+        组合函数：先启动调度，然后执行自动化上料
+        
+        此函数简化了工作流操作，将两个有顺序依赖的操作组合在一起：
+        1. 启动调度（scheduler_start）
+        2. 自动化上料（auto_feeding4to3）
+        
+        参数与 auto_feeding4to3 完全相同，支持 Excel 和手动参数两种模式
+        
+        Returns:
+            包含调度启动结果和上料结果的字典
+        """
+        logger.info("=" * 60)
+        logger.info("开始执行组合操作：启动调度 + 自动化上料")
+        logger.info("=" * 60)
+        
+        # 步骤1: 启动调度
+        logger.info("【步骤 1/2】启动调度...")
+        scheduler_result = self.scheduler_start()
+        logger.info(f"调度启动结果: {scheduler_result}")
+        
+        # 检查调度是否启动成功
+        if scheduler_result.get("code") != 1:
+            logger.error(f"调度启动失败: {scheduler_result}")
+            return {
+                "success": False,
+                "step": "scheduler_start",
+                "scheduler_result": scheduler_result,
+                "error": "调度启动失败"
+            }
+        
+        logger.info("✓ 调度启动成功")
+        
+        # 步骤2: 执行自动化上料
+        logger.info("【步骤 2/2】执行自动化上料...")
+        feeding_result = self.auto_feeding4to3(
+            xlsx_path=xlsx_path,
+            WH4_x1_y1_z1_1_materialName=WH4_x1_y1_z1_1_materialName, WH4_x1_y1_z1_1_quantity=WH4_x1_y1_z1_1_quantity,
+            WH4_x2_y1_z1_2_materialName=WH4_x2_y1_z1_2_materialName, WH4_x2_y1_z1_2_quantity=WH4_x2_y1_z1_2_quantity,
+            WH4_x3_y1_z1_3_materialName=WH4_x3_y1_z1_3_materialName, WH4_x3_y1_z1_3_quantity=WH4_x3_y1_z1_3_quantity,
+            WH4_x4_y1_z1_4_materialName=WH4_x4_y1_z1_4_materialName, WH4_x4_y1_z1_4_quantity=WH4_x4_y1_z1_4_quantity,
+            WH4_x5_y1_z1_5_materialName=WH4_x5_y1_z1_5_materialName, WH4_x5_y1_z1_5_quantity=WH4_x5_y1_z1_5_quantity,
+            WH4_x1_y2_z1_6_materialName=WH4_x1_y2_z1_6_materialName, WH4_x1_y2_z1_6_quantity=WH4_x1_y2_z1_6_quantity,
+            WH4_x2_y2_z1_7_materialName=WH4_x2_y2_z1_7_materialName, WH4_x2_y2_z1_7_quantity=WH4_x2_y2_z1_7_quantity,
+            WH4_x3_y2_z1_8_materialName=WH4_x3_y2_z1_8_materialName, WH4_x3_y2_z1_8_quantity=WH4_x3_y2_z1_8_quantity,
+            WH4_x4_y2_z1_9_materialName=WH4_x4_y2_z1_9_materialName, WH4_x4_y2_z1_9_quantity=WH4_x4_y2_z1_9_quantity,
+            WH4_x5_y2_z1_10_materialName=WH4_x5_y2_z1_10_materialName, WH4_x5_y2_z1_10_quantity=WH4_x5_y2_z1_10_quantity,
+            WH4_x1_y3_z1_11_materialName=WH4_x1_y3_z1_11_materialName, WH4_x1_y3_z1_11_quantity=WH4_x1_y3_z1_11_quantity,
+            WH4_x2_y3_z1_12_materialName=WH4_x2_y3_z1_12_materialName, WH4_x2_y3_z1_12_quantity=WH4_x2_y3_z1_12_quantity,
+            WH4_x1_y1_z2_1_materialName=WH4_x1_y1_z2_1_materialName, WH4_x1_y1_z2_1_quantity=WH4_x1_y1_z2_1_quantity, 
+            WH4_x1_y1_z2_1_materialType=WH4_x1_y1_z2_1_materialType, WH4_x1_y1_z2_1_targetWH=WH4_x1_y1_z2_1_targetWH,
+            WH4_x2_y1_z2_2_materialName=WH4_x2_y1_z2_2_materialName, WH4_x2_y1_z2_2_quantity=WH4_x2_y1_z2_2_quantity, 
+            WH4_x2_y1_z2_2_materialType=WH4_x2_y1_z2_2_materialType, WH4_x2_y1_z2_2_targetWH=WH4_x2_y1_z2_2_targetWH,
+            WH4_x3_y1_z2_3_materialName=WH4_x3_y1_z2_3_materialName, WH4_x3_y1_z2_3_quantity=WH4_x3_y1_z2_3_quantity, 
+            WH4_x3_y1_z2_3_materialType=WH4_x3_y1_z2_3_materialType, WH4_x3_y1_z2_3_targetWH=WH4_x3_y1_z2_3_targetWH,
+            WH4_x1_y2_z2_4_materialName=WH4_x1_y2_z2_4_materialName, WH4_x1_y2_z2_4_quantity=WH4_x1_y2_z2_4_quantity, 
+            WH4_x1_y2_z2_4_materialType=WH4_x1_y2_z2_4_materialType, WH4_x1_y2_z2_4_targetWH=WH4_x1_y2_z2_4_targetWH,
+            WH4_x2_y2_z2_5_materialName=WH4_x2_y2_z2_5_materialName, WH4_x2_y2_z2_5_quantity=WH4_x2_y2_z2_5_quantity, 
+            WH4_x2_y2_z2_5_materialType=WH4_x2_y2_z2_5_materialType, WH4_x2_y2_z2_5_targetWH=WH4_x2_y2_z2_5_targetWH,
+            WH4_x3_y2_z2_6_materialName=WH4_x3_y2_z2_6_materialName, WH4_x3_y2_z2_6_quantity=WH4_x3_y2_z2_6_quantity, 
+            WH4_x3_y2_z2_6_materialType=WH4_x3_y2_z2_6_materialType, WH4_x3_y2_z2_6_targetWH=WH4_x3_y2_z2_6_targetWH,
+            WH4_x1_y3_z2_7_materialName=WH4_x1_y3_z2_7_materialName, WH4_x1_y3_z2_7_quantity=WH4_x1_y3_z2_7_quantity, 
+            WH4_x1_y3_z2_7_materialType=WH4_x1_y3_z2_7_materialType, WH4_x1_y3_z2_7_targetWH=WH4_x1_y3_z2_7_targetWH,
+            WH4_x2_y3_z2_8_materialName=WH4_x2_y3_z2_8_materialName, WH4_x2_y3_z2_8_quantity=WH4_x2_y3_z2_8_quantity, 
+            WH4_x2_y3_z2_8_materialType=WH4_x2_y3_z2_8_materialType, WH4_x2_y3_z2_8_targetWH=WH4_x2_y3_z2_8_targetWH,
+            WH4_x3_y3_z2_9_materialName=WH4_x3_y3_z2_9_materialName, WH4_x3_y3_z2_9_quantity=WH4_x3_y3_z2_9_quantity, 
+            WH4_x3_y3_z2_9_materialType=WH4_x3_y3_z2_9_materialType, WH4_x3_y3_z2_9_targetWH=WH4_x3_y3_z2_9_targetWH,
+            WH3_x1_y1_z3_1_materialType=WH3_x1_y1_z3_1_materialType, WH3_x1_y1_z3_1_materialId=WH3_x1_y1_z3_1_materialId, WH3_x1_y1_z3_1_quantity=WH3_x1_y1_z3_1_quantity,
+            WH3_x2_y1_z3_2_materialType=WH3_x2_y1_z3_2_materialType, WH3_x2_y1_z3_2_materialId=WH3_x2_y1_z3_2_materialId, WH3_x2_y1_z3_2_quantity=WH3_x2_y1_z3_2_quantity,
+            WH3_x3_y1_z3_3_materialType=WH3_x3_y1_z3_3_materialType, WH3_x3_y1_z3_3_materialId=WH3_x3_y1_z3_3_materialId, WH3_x3_y1_z3_3_quantity=WH3_x3_y1_z3_3_quantity,
+            WH3_x1_y2_z3_4_materialType=WH3_x1_y2_z3_4_materialType, WH3_x1_y2_z3_4_materialId=WH3_x1_y2_z3_4_materialId, WH3_x1_y2_z3_4_quantity=WH3_x1_y2_z3_4_quantity,
+            WH3_x2_y2_z3_5_materialType=WH3_x2_y2_z3_5_materialType, WH3_x2_y2_z3_5_materialId=WH3_x2_y2_z3_5_materialId, WH3_x2_y2_z3_5_quantity=WH3_x2_y2_z3_5_quantity,
+            WH3_x3_y2_z3_6_materialType=WH3_x3_y2_z3_6_materialType, WH3_x3_y2_z3_6_materialId=WH3_x3_y2_z3_6_materialId, WH3_x3_y2_z3_6_quantity=WH3_x3_y2_z3_6_quantity,
+            WH3_x1_y3_z3_7_materialType=WH3_x1_y3_z3_7_materialType, WH3_x1_y3_z3_7_materialId=WH3_x1_y3_z3_7_materialId, WH3_x1_y3_z3_7_quantity=WH3_x1_y3_z3_7_quantity,
+            WH3_x2_y3_z3_8_materialType=WH3_x2_y3_z3_8_materialType, WH3_x2_y3_z3_8_materialId=WH3_x2_y3_z3_8_materialId, WH3_x2_y3_z3_8_quantity=WH3_x2_y3_z3_8_quantity,
+            WH3_x3_y3_z3_9_materialType=WH3_x3_y3_z3_9_materialType, WH3_x3_y3_z3_9_materialId=WH3_x3_y3_z3_9_materialId, WH3_x3_y3_z3_9_quantity=WH3_x3_y3_z3_9_quantity,
+            WH3_x1_y4_z3_10_materialType=WH3_x1_y4_z3_10_materialType, WH3_x1_y4_z3_10_materialId=WH3_x1_y4_z3_10_materialId, WH3_x1_y4_z3_10_quantity=WH3_x1_y4_z3_10_quantity,
+            WH3_x2_y4_z3_11_materialType=WH3_x2_y4_z3_11_materialType, WH3_x2_y4_z3_11_materialId=WH3_x2_y4_z3_11_materialId, WH3_x2_y4_z3_11_quantity=WH3_x2_y4_z3_11_quantity,
+            WH3_x3_y4_z3_12_materialType=WH3_x3_y4_z3_12_materialType, WH3_x3_y4_z3_12_materialId=WH3_x3_y4_z3_12_materialId, WH3_x3_y4_z3_12_quantity=WH3_x3_y4_z3_12_quantity,
+            WH3_x1_y5_z3_13_materialType=WH3_x1_y5_z3_13_materialType, WH3_x1_y5_z3_13_materialId=WH3_x1_y5_z3_13_materialId, WH3_x1_y5_z3_13_quantity=WH3_x1_y5_z3_13_quantity,
+            WH3_x2_y5_z3_14_materialType=WH3_x2_y5_z3_14_materialType, WH3_x2_y5_z3_14_materialId=WH3_x2_y5_z3_14_materialId, WH3_x2_y5_z3_14_quantity=WH3_x2_y5_z3_14_quantity,
+            WH3_x3_y5_z3_15_materialType=WH3_x3_y5_z3_15_materialType, WH3_x3_y5_z3_15_materialId=WH3_x3_y5_z3_15_materialId, WH3_x3_y5_z3_15_quantity=WH3_x3_y5_z3_15_quantity,
+        )
+        
+        logger.info("=" * 60)
+        logger.info("组合操作完成")
+        logger.info("=" * 60)
+        
+        return {
+            "success": True,
+            "scheduler_result": scheduler_result,
+            "feeding_result": feeding_result
+        }
+
 
     # 2.24 物料变更推送
     def report_material_change(self, material_obj: Dict[str, Any]) -> Dict[str, Any]:
@@ -679,6 +1217,48 @@ class BioyondCellWorkstation(BioyondWorkstation):
         result = self.wait_for_order_finish(order_code)
         return result
 
+    def transfer_3_to_2(self,
+                        source_wh_id: Optional[str] = '3a19debc-84b4-0359-e2d4-b3beea49348b',
+                        source_x: int = 1, 
+                        source_y: int = 1, 
+                        source_z: int = 1) -> Dict[str, Any]:
+        """
+        2.34 3-2 物料转运接口
+        
+        新建从 3 -> 2 的搬运任务
+        
+        Args:
+            source_wh_id: 来源仓库 Id (默认为3号仓库)
+            source_x: 来源位置 X 坐标
+            source_y: 来源位置 Y 坐标
+            source_z: 来源位置 Z 坐标
+            
+        Returns:
+            dict: 包含任务 orderId 和 orderCode 的响应
+        """
+        payload: Dict[str, Any] = {
+            "sourcePosX": source_x, 
+            "sourcePosY": source_y, 
+            "sourcePosZ": source_z
+        }
+        if source_wh_id:
+            payload["sourceWHID"] = source_wh_id
+
+        logger.info(f"[transfer_3_to_2] 开始转运: 仓库={source_wh_id}, 位置=({source_x}, {source_y}, {source_z})")
+        response = self._post_lims("/api/lims/order/transfer-task3To2", payload)
+        
+        # 等待任务报送成功
+        order_code = response.get("data", {}).get("orderCode")
+        if not order_code:
+            logger.error("[transfer_3_to_2] 转运任务未返回有效 orderCode！")
+            return response
+        
+        logger.info(f"[transfer_3_to_2] 转运任务已创建: {order_code}")
+        # 等待完成报送
+        result = self.wait_for_order_finish(order_code)
+        logger.info(f"[transfer_3_to_2] 转运任务完成: {order_code}")
+        return result
+
     # 3.35 1→2 物料转运
     def transfer_1_to_2(self) -> Dict[str, Any]:
         """
@@ -686,14 +1266,28 @@ class BioyondCellWorkstation(BioyondWorkstation):
         URL: /api/lims/order/transfer-task1To2
         只需要 apiKey 和 requestTime
         """
+        logger.info("[transfer_1_to_2] 开始 1→2 物料转运")
         response = self._post_lims("/api/lims/order/transfer-task1To2")
-                # 等待任务报送成功
-        order_code = response.get("data", {}).get("orderCode")
+        logger.info(f"[transfer_1_to_2] API Response: {response}")
+        
+        # 等待任务报送成功 - 处理不同的响应格式
+        order_code = None
+        data_field = response.get("data")
+        
+        if isinstance(data_field, dict):
+            order_code = data_field.get("orderCode")
+        elif isinstance(data_field, str):
+            # 某些接口可能直接返回 orderCode 字符串
+            order_code = data_field
+        
         if not order_code:
-            logger.error("上料任务未返回有效 orderCode！")
+            logger.error(f"[transfer_1_to_2] 转运任务未返回有效 orderCode！响应: {response}")
             return response
-          # 等待完成报送
+        
+        logger.info(f"[transfer_1_to_2] 转运任务已创建: {order_code}")
+        # 等待完成报送
         result = self.wait_for_order_finish(order_code)
+        logger.info(f"[transfer_1_to_2] 转运任务完成: {order_code}")
         return result
    
     # 2.5 批量查询实验报告(post过滤关键字查询)

unilabos/devices/workstation/bioyond_studio/bioyond_cell/output_example.json

@@ -0,0 +1,197 @@
+{
+    "token": "",
+    "request_time": "2025-12-24T15:32:09.2148671+08:00",
+    "data": {
+        "orderId": "3a1e614d-a082-c44a-60be-68647a35e6f1",
+        "orderCode": "BSO2025122400024",
+        "orderName": "DP20251224001",
+        "startTime": "2025-12-24T14:51:50.549848",
+        "endTime": "2025-12-24T15:32:09.000765",
+        "status": "30",
+        "workflowStatus": "completed",
+        "completionTime": "2025-12-24T15:32:09.000765",
+        "usedMaterials": [
+            {
+                "materialId": "3a1e614b-53a6-0ec4-10bd-956b240c0f04",
+                "locationId": "3a19debc-84b5-4c1c-d3a1-26830cf273ff",
+                "typemode": "1",
+                "usedQuantity": 2,
+                "realQuantity": 2
+            },
+            {
+                "materialId": "3a1e614b-4da7-cf62-3a40-7e5879255c0c",
+                "locationId": "3a1a224d-ed49-710c-a9c3-3fc61d479cbb",
+                "typemode": "1",
+                "usedQuantity": 1,
+                "realQuantity": 1
+            },
+            {
+                "materialId": "3a1e614b-53a7-2850-42c8-a7a2de8ff4bf",
+                "locationId": "3a19debc-84b5-4c1c-d3a1-26830cf273ff",
+                "typemode": "1",
+                "usedQuantity": 1,
+                "realQuantity": 1
+            },
+            {
+                "materialId": "3a1e614b-4da6-ac9d-02be-4b0716796bd2",
+                "locationId": "3a1a224d-ed49-710c-a9c3-3fc61d479cbb",
+                "typemode": "1",
+                "usedQuantity": 2,
+                "realQuantity": 2
+            },
+            {
+                "materialId": "3a1e614d-9c9a-fafa-4757-c7411b03bd9f",
+                "locationId": "3a1abd46-18fe-1f56-6ced-a1f7fe08e36c",
+                "typemode": "0",
+                "usedQuantity": 1,
+                "realQuantity": 1
+            },
+            {
+                "materialId": "3a1e614b-6917-b8f9-7987-7a33a3792829",
+                "locationId": "3a19da43-57b5-294f-d663-154a1cc32270",
+                "typemode": "2",
+                "usedQuantity": 3.51,
+                "realQuantity": 3.5155000000000000000000000000
+            },
+            {
+                "materialId": "3a1e614b-6914-d92b-e348-f52e13817a5d",
+                "locationId": "3a19da56-1379-ff7c-1745-07e200b44ce2",
+                "typemode": "2",
+                "usedQuantity": 0.33,
+                "realQuantity": 0.3336000000000000000000000000
+            }
+        ]
+    }
+}
+
+{
+    "token": "",
+    "request_time": "2025-12-24T15:32:09.9999039+08:00",
+    "data": {
+        "orderId": "3a1e614d-a0a2-f7a9-9360-610021c9479d",
+        "orderCode": "BSO2025122400025",
+        "orderName": "DP20251224002",
+        "startTime": "2025-12-24T14:53:03.44259",
+        "endTime": "2025-12-24T15:32:09.828261",
+        "status": "30",
+        "workflowStatus": "completed",
+        "completionTime": "2025-12-24T15:32:09.828261",
+        "usedMaterials": [
+            {
+                "materialId": "3a1e614b-4da7-6527-9f1c-b39e3de8ff2b",
+                "locationId": "3a1a224d-ed49-710c-a9c3-3fc61d479cbb",
+                "typemode": "1",
+                "usedQuantity": 1,
+                "realQuantity": 1
+            },
+            {
+                "materialId": "3a1e614b-53a6-0ec4-10bd-956b240c0f04",
+                "locationId": "3a19debc-84b5-4c1c-d3a1-26830cf273ff",
+                "typemode": "1",
+                "usedQuantity": 2,
+                "realQuantity": 2
+            },
+            {
+                "materialId": "3a1e614b-4da6-ac9d-02be-4b0716796bd2",
+                "locationId": "3a1a224d-ed49-710c-a9c3-3fc61d479cbb",
+                "typemode": "1",
+                "usedQuantity": 2,
+                "realQuantity": 2
+            },
+            {
+                "materialId": "3a1e614b-53a8-8474-cac8-0fd7d349e4b2",
+                "locationId": "3a19debc-84b5-4c1c-d3a1-26830cf273ff",
+                "typemode": "1",
+                "usedQuantity": 1,
+                "realQuantity": 1
+            },
+            {
+                "materialId": "3a1e614d-9c9a-fafa-4757-c7411b03bd9f",
+                "locationId": null,
+                "typemode": "0",
+                "usedQuantity": 1,
+                "realQuantity": 1
+            },
+            {
+                "materialId": "3a1e614b-6917-b8f9-7987-7a33a3792829",
+                "locationId": "3a19da43-57b5-294f-d663-154a1cc32270",
+                "typemode": "2",
+                "usedQuantity": 0.7,
+                "realQuantity": 0
+            },
+            {
+                "materialId": "3a1e614b-6914-d92b-e348-f52e13817a5d",
+                "locationId": "3a19da56-1379-ff7c-1745-07e200b44ce2",
+                "typemode": "2",
+                "usedQuantity": 1.15,
+                "realQuantity": 1.1627000000000000000000000000
+            }
+        ]
+    }
+}
+
+{
+    "token": "",
+    "request_time": "2025-12-24T15:34:00.4139986+08:00",
+    "data": {
+        "orderId": "3a1e614d-a0cd-81ca-9f7f-2f4e93af01cd",
+        "orderCode": "BSO2025122400026",
+        "orderName": "DP20251224003",
+        "startTime": "2025-12-24T14:54:24.443344",
+        "endTime": "2025-12-24T15:34:00.26321",
+        "status": "30",
+        "workflowStatus": "completed",
+        "completionTime": "2025-12-24T15:34:00.26321",
+        "usedMaterials": [
+            {
+                "materialId": "3a1e614b-4da6-ac9d-02be-4b0716796bd2",
+                "locationId": "3a19deae-2c7a-b9eb-f4e3-e308e0cf839a",
+                "typemode": "1",
+                "usedQuantity": 2,
+                "realQuantity": 2
+            },
+            {
+                "materialId": "3a1e614b-4da8-b678-f204-207076f09c83",
+                "locationId": "3a19deae-2c7a-b9eb-f4e3-e308e0cf839a",
+                "typemode": "1",
+                "usedQuantity": 1,
+                "realQuantity": 1
+            },
+            {
+                "materialId": "3a1e614b-53a6-0ec4-10bd-956b240c0f04",
+                "locationId": "3a19debc-84b5-4c1c-d3a1-26830cf273ff",
+                "typemode": "1",
+                "usedQuantity": 2,
+                "realQuantity": 2
+            },
+            {
+                "materialId": "3a1e614b-53a8-e3f2-dee0-fa97b600b652",
+                "locationId": "3a19debc-84b5-4c1c-d3a1-26830cf273ff",
+                "typemode": "1",
+                "usedQuantity": 1,
+                "realQuantity": 1
+            },
+            {
+                "materialId": "3a1e614d-9c9a-fafa-4757-c7411b03bd9f",
+                "locationId": null,
+                "typemode": "0",
+                "usedQuantity": 1,
+                "realQuantity": 1
+            },
+            {
+                "materialId": "3a1e614b-6917-b8f9-7987-7a33a3792829",
+                "locationId": "3a19da43-57b5-294f-d663-154a1cc32270",
+                "typemode": "2",
+                "usedQuantity": 2.0,
+                "realQuantity": 2.0075000000000000000000000000
+            },
+            {
+                "materialId": "3a1e614b-6914-d92b-e348-f52e13817a5d",
+                "locationId": "3a19da56-1379-ff7c-1745-07e200b44ce2",
+                "typemode": "2",
+                "usedQuantity": 1.2,
+                "realQuantity": 1.2126000000000000000000000000
+            }
+        ]
+    }
+}

unilabos/devices/workstation/bioyond_studio/bioyond_cell/smiles&molweight.py

@@ -0,0 +1,12 @@
+import pubchempy as pcp
+
+cas = "21324-40-3"  # 示例
+comps = pcp.get_compounds(cas, namespace="name")
+if not comps:
+    raise ValueError("No hit")
+
+c = comps[0]
+
+print("Canonical SMILES:", c.canonical_smiles)
+print("Isomeric  SMILES:", c.isomeric_smiles)
+print("MW:", c.molecular_weight)

unilabos/devices/workstation/bioyond_studio/bioyond_cell/多订单返回说明.md

@@ -0,0 +1,113 @@
+# Bioyond Cell 工作站 - 多订单返回示例
+
+本文档说明了 `create_orders` 函数如何收集并返回所有订单的完成报文。
+
+## 问题描述
+
+之前的实现只会等待并返回第一个订单的完成报文，如果有多个订单（例如从 Excel 解析出 3 个订单），只能得到第一个订单的推送信息。
+
+## 解决方案
+
+修改后的 `create_orders` 函数现在会：
+
+1. **提取所有 orderCode**：从 LIMS 接口返回的 `data` 列表中提取所有订单编号
+2. **逐个等待完成**：遍历所有 orderCode，调用 `wait_for_order_finish` 等待每个订单完成
+3. **收集所有报文**：将每个订单的完成报文存入 `all_reports` 列表
+4. **统一返回**：返回包含所有订单报文的 JSON 格式数据
+
+## 返回格式
+
+```json
+{
+    "status": "all_completed",
+    "total_orders": 3,
+    "reports": [
+        {
+            "token": "",
+            "request_time": "2025-12-24T15:32:09.2148671+08:00",
+            "data": {
+                "orderId": "3a1e614d-a082-c44a-60be-68647a35e6f1",
+                "orderCode": "BSO2025122400024",
+                "orderName": "DP20251224001",
+                "status": "30",
+                "workflowStatus": "completed",
+                "usedMaterials": [...]
+            }
+        },
+        {
+            "token": "",
+            "request_time": "2025-12-24T15:32:09.9999039+08:00",
+            "data": {
+                "orderId": "3a1e614d-a0a2-f7a9-9360-610021c9479d",
+                "orderCode": "BSO2025122400025",
+                "orderName": "DP20251224002",
+                "status": "30",
+                "workflowStatus": "completed",
+                "usedMaterials": [...]
+            }
+        },
+        {
+            "token": "",
+            "request_time": "2025-12-24T15:34:00.4139986+08:00",
+            "data": {
+                "orderId": "3a1e614d-a0cd-81ca-9f7f-2f4e93af01cd",
+                "orderCode": "BSO2025122400026",
+                "orderName": "DP20251224003",
+                "status": "30",
+                "workflowStatus": "completed",
+                "usedMaterials": [...]
+            }
+        }
+    ],
+    "original_response": {...}
+}
+```
+
+## 使用示例
+
+```python
+# 调用 create_orders
+result = workstation.create_orders("20251224.xlsx")
+
+# 访问返回数据
+print(f"总订单数: {result['total_orders']}")
+print(f"状态: {result['status']}")
+
+# 遍历所有订单的报文
+for i, report in enumerate(result['reports'], 1):
+    order_data = report.get('data', {})
+    print(f"\n订单 {i}:")
+    print(f"  orderCode: {order_data.get('orderCode')}")
+    print(f"  orderName: {order_data.get('orderName')}")
+    print(f"  status: {order_data.get('status')}")
+    print(f"  使用物料数: {len(order_data.get('usedMaterials', []))}")
+```
+
+## 控制台输出示例
+
+```
+[create_orders] 即将提交订单数量: 3
+[create_orders] 接口返回: {...}
+[create_orders] 等待 3 个订单完成: ['BSO2025122400024', 'BSO2025122400025', 'BSO2025122400026']
+[create_orders] 正在等待第 1/3 个订单: BSO2025122400024
+[create_orders] ✓ 订单 BSO2025122400024 完成
+[create_orders] 正在等待第 2/3 个订单: BSO2025122400025
+[create_orders] ✓ 订单 BSO2025122400025 完成
+[create_orders] 正在等待第 3/3 个订单: BSO2025122400026
+[create_orders] ✓ 订单 BSO2025122400026 完成
+[create_orders] 所有订单已完成，共收集 3 个报文
+实验记录本========================create_orders========================
+返回报文数量: 3
+报文 1: orderCode=BSO2025122400024, status=30
+报文 2: orderCode=BSO2025122400025, status=30
+报文 3: orderCode=BSO2025122400026, status=30
+========================
+```
+
+## 关键改进
+
+1. ✅ **等待所有订单**：不再只等待第一个订单，而是遍历所有 orderCode
+2. ✅ **收集完整报文**：每个订单的完整推送报文都被保存在 `reports` 数组中
+3. ✅ **详细日志**：清晰显示正在等待哪个订单，以及完成情况
+4. ✅ **错误处理**：即使某个订单失败，也会记录其状态信息
+5. ✅ **统一格式**：返回的 JSON 格式便于后续处理和分析

unilabos/devices/workstation/bioyond_studio/config.py

@@ -8,8 +8,10 @@ import os
 # BioyondCellWorkstation 默认配置（包含所有必需参数）
 API_CONFIG = {
     # API 连接配置
-    # "api_host": os.getenv("BIOYOND_API_HOST", "http://172.16.1.143:44389"),#实机
-    "api_host": os.getenv("BIOYOND_API_HOST", "http://172.16.11.219:44388"),# 仿真机
+    # 实机
+    #"api_host": os.getenv("BIOYOND_API_HOST", "http://172.16.11.118:44389"),
+    # 仿真机
+    "api_host": os.getenv("BIOYOND_API_HOST", "http://172.16.11.219:44388"),
     "api_key": os.getenv("BIOYOND_API_KEY", "8A819E5C"),
     "timeout": int(os.getenv("BIOYOND_TIMEOUT", "30")),
     
@@ -17,7 +19,7 @@ API_CONFIG = {
     "report_token": os.getenv("BIOYOND_REPORT_TOKEN", "CHANGE_ME_TOKEN"),
     
     # HTTP 服务配置
-    "HTTP_host": os.getenv("BIOYOND_HTTP_HOST", "172.16.11.2"),  # HTTP服务监听地址，监听计算机飞连ip地址
+    "HTTP_host": os.getenv("BIOYOND_HTTP_HOST", "172.16.11.206"),  # HTTP服务监听地址，监听计算机飞连ip地址
     "HTTP_port": int(os.getenv("BIOYOND_HTTP_PORT", "8080")),
     "debug_mode": False,# 调试模式
 }
@@ -131,6 +133,46 @@ WAREHOUSE_MAPPING = {
             "J03": "3a19deae-2c7a-f237-89d9-8fe19025dee9"
         }
     },
+    "手动传递窗右": {
+        "uuid": "",
+        "site_uuids": {
+            "A01": "3a19deae-2c7a-36f5-5e41-02c5b66feaea",
+            "A02": "3a19deae-2c7a-dc6d-c41e-ef285d946cfe",
+            "A03": "3a19deae-2c7a-5876-c454-6b7e224ca927",
+            "B01": "3a19deae-2c7a-2426-6d71-e9de3cb158b1",
+            "B02": "3a19deae-2c7a-79b0-5e44-efaafd1e4cf3",
+            "B03": "3a19deae-2c7a-b9eb-f4e3-e308e0cf839a",
+            "C01": "3a19deae-2c7a-32bc-768e-556647e292f3",
+            "C02": "3a19deae-2c7a-e97a-8484-f5a4599447c4",
+            "C03": "3a19deae-2c7a-3056-6504-10dc73fbc276",
+            "D01": "3a19deae-2c7a-ffad-875e-8c4cda61d440",
+            "D02": "3a19deae-2c7a-61be-601c-b6fb5610499a",
+            "D03": "3a19deae-2c7a-c0f7-05a7-e3fe2491e560",
+            "E01": "3a19deae-2c7a-a6f4-edd1-b436a7576363",
+            "E02": "3a19deae-2c7a-4367-96dd-1ca2186f4910",
+            "E03": "3a19deae-2c7a-b163-2219-23df15200311",
+        }
+    },
+    "手动传递窗左": {
+        "uuid": "",
+        "site_uuids": {
+            "F01": "3a19deae-2c7a-d594-fd6a-0d20de3c7c4a",
+            "F02": "3a19deae-2c7a-a194-ea63-8b342b8d8679",
+            "F03": "3a19deae-2c7a-f7c4-12bd-425799425698",
+            "G01": "3a19deae-2c7a-0b56-72f1-8ab86e53b955",
+            "G02": "3a19deae-2c7a-204e-95ed-1f1950f28343",
+            "G03": "3a19deae-2c7a-392b-62f1-4907c66343f8",
+            "H01": "3a19deae-2c7a-5602-e876-d27aca4e3201",
+            "H02": "3a19deae-2c7a-f15c-70e0-25b58a8c9702",
+            "H03": "3a19deae-2c7a-780b-8965-2e1345f7e834",
+            "I01": "3a19deae-2c7a-8849-e172-07de14ede928",
+            "I02": "3a19deae-2c7a-4772-a37f-ff99270bafc0",
+            "I03": "3a19deae-2c7a-cce7-6e4a-25ea4a2068c4",
+            "J01": "3a19deae-2c7a-1848-de92-b5d5ed054cc6",
+            "J02": "3a19deae-2c7a-1d45-b4f8-6f866530e205",
+            "J03": "3a19deae-2c7a-f237-89d9-8fe19025dee9"
+        }
+    },
     "4号手套箱内部堆栈": {
         "uuid": "",
         "site_uuids": {

unilabos/devices/workstation/coin_cell_assembly/Modbus_CSV_Mapping_Guide.md

@@ -0,0 +1,84 @@
+# Modbus CSV 地址映射说明
+
+本文档说明 `coin_cell_assembly_a.csv` 文件如何将命名节点映射到实际的 Modbus 地址，以及如何在代码中使用它们。
+
+## 1. CSV 文件结构
+
+地址表文件位于同级目录下：`coin_cell_assembly_a.csv`
+
+每一行定义了一个 Modbus 节点，包含以下关键列：
+
+| 列名 | 说明 | 示例 |
+|------|------|------|
+| **Name** | **节点名称** (代码中引用的 Key) | `COIL_ALUMINUM_FOIL` |
+| **DataType** | 数据类型 (BOOL, INT16, FLOAT32, STRING) | `BOOL` |
+| **Comment** | 注释说明 | `使用铝箔垫` |
+| **Attribute** | 属性 (通常留空或用于额外标记) | |
+| **DeviceType** | Modbus 寄存器类型 (`coil`, `hold_register`) | `coil` |
+| **Address** | **Modbus 地址** (十进制) | `8340` |
+
+### 示例行 (铝箔垫片)
+
+```csv
+COIL_ALUMINUM_FOIL,BOOL,,使用铝箔垫,,coil,8340,
+```
+
+- **名称**: `COIL_ALUMINUM_FOIL`
+- **类型**: `coil` (线圈，读写单个位)
+- **地址**: `8340`
+
+---
+
+## 2. 加载与注册流程
+
+在 `coin_cell_assembly.py` 的初始化代码中：
+
+1. **加载 CSV**: `BaseClient.load_csv()` 读取 CSV 并解析每行定义。
+2. **注册节点**: `modbus_client.register_node_list()` 将解析后的节点注册到 Modbus 客户端实例中。
+
+```python
+# 代码位置: coin_cell_assembly.py (L174-175)
+self.nodes = BaseClient.load_csv(os.path.join(os.path.dirname(__file__), 'coin_cell_assembly_a.csv'))                            
+self.client = modbus_client.register_node_list(self.nodes)
+```
+
+---
+
+## 3. 代码中的使用方式
+
+注册后，通过 `self.client.use_node('节点名称')` 即可获取该节点对象并进行读写操作，无需关心具体地址。
+
+### 控制铝箔垫片 (COIL_ALUMINUM_FOIL)
+
+```python
+# 代码位置: qiming_coin_cell_code 函数 (L1048)
+self.client.use_node('COIL_ALUMINUM_FOIL').write(not lvbodian)
+```
+
+- **写入 True**: 对应 Modbus 功能码 05 (Write Single Coil)，向地址 `8340` 写入 `1` (ON)。
+- **写入 False**: 向地址 `8340` 写入 `0` (OFF)。
+
+> **注意**: 代码中使用了 `not lvbodian`，这意味着逻辑是反转的。如果 `lvbodian` 参数为 `True` (默认)，写入的是 `False` (不使用铝箔垫)。
+
+---
+
+## 4. 地址转换注意事项 (Modbus vs PLC)
+
+CSV 中的 `Address` 列（如 `8340`）是 **Modbus 协议地址**。
+
+如果使用 InoProShop (汇川 PLC 编程软件)，看到的可能是 **PLC 内部地址** (如 `%QX...` 或 `%MW...`)。这两者之间通常需要转换。
+
+### 常见的转换规则 (示例)
+
+- **Coil (线圈) %QX**: 
+  - `Modbus地址 = 字节地址 * 8 + 位偏移`
+  - *例子*: `%QX834.0` -> `834 * 8 + 0` = `6672`
+  - *注意*: 如果 CSV 中配置的是 `8340`，这可能是一个自定义映射，或者是基于不同规则（如直接对应 Word 地址的某种映射，或者可能就是地址写错了/使用了非标准映射）。
+
+- **Register (寄存器) %MW**:
+  - 通常直接对应，或者有偏移量 (如 Modbus 40001 = PLC MW0)。
+
+### 验证方法
+由于 `test_unilab_interact.py` 中发现 `8450` (CSV风格) 不工作，而 `6760` (%QX845.0 计算值) 工作正常，**建议对 CSV 中的其他地址也进行核实**，特别是像 `8340` 这样以 0 结尾看起来像是 "字节地址+0" 的数值，可能实际上应该是 `%QX834.0` 对应的 `6672`。
+
+如果发现设备控制无反应，请尝试按照标准的 Modbus 计算方式转换 PLC 地址。

unilabos/devices/workstation/coin_cell_assembly/YB_YH_materials.py

@@ -634,6 +634,12 @@ class CoincellDeck(Deck):
         self.assign_child_resource(waste_tip_box, Coordinate(x=778.0, y=622.0, z=0))
 
 
+def YH_Deck(name=""):
+    cd = CoincellDeck(name=name)
+    cd.setup()
+    return cd
+
+
 if __name__ == "__main__":
     deck = create_coin_cell_deck()
     print(deck)

unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly.py

@@ -1,4 +1,3 @@
-      
 import csv
 import inspect
 import json
@@ -21,6 +20,44 @@ from unilabos.ros.nodes.presets.workstation import ROS2WorkstationNode
 from unilabos.devices.workstation.coin_cell_assembly.YB_YH_materials import CoincellDeck
 from unilabos.resources.graphio import convert_resources_to_type
 from unilabos.utils.log import logger
+import struct
+
+
+def _decode_float32_correct(registers):
+    """
+    正确解码FLOAT32类型的Modbus寄存器
+    
+    Args:
+        registers: 从Modbus读取的原始寄存器值列表
+        
+    Returns:
+        正确解码的浮点数值
+        
+    Note:
+        根据test_glove_box_pressure.py验证的配置:
+        - Byte Order: Big (Modbus标准)
+        - Word Order: Little (PLC配置)
+    """
+    if not registers or len(registers) < 2:
+        return 0.0
+    
+    try:
+        # Word Order: Little - 交换两个寄存器的顺序
+        # Byte Order: Big - 每个寄存器内部使用大端字节序
+        low_word = registers[0]
+        high_word = registers[1]
+        
+        # 将两个16位寄存器组合成一个32位值 (Little Word Order)
+        # 使用大端字节序 ('>') 将每个寄存器转换为字节
+        byte_string = struct.pack('>HH', high_word, low_word)
+        
+        # 将字节字符串解码为浮点数 (大端)
+        value = struct.unpack('>f', byte_string)[0]
+        
+        return value
+    except Exception as e:
+        logger.error(f"解码FLOAT32失败: {e}, registers: {registers}")
+        return 0.0
 
 
 def _ensure_modbus_slave_kw_alias(modbus_client):
@@ -139,7 +176,7 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
                 time.sleep(2)
             if not modbus_client.client.is_socket_open():
                 raise ValueError('modbus tcp connection failed')
-            self.nodes = BaseClient.load_csv(os.path.join(os.path.dirname(__file__), 'coin_cell_assembly_1105.csv'))
+            self.nodes = BaseClient.load_csv(os.path.join(os.path.dirname(__file__), 'coin_cell_assembly_b.csv'))                            
             self.client = modbus_client.register_node_list(self.nodes)
         else:
             print("测试模式，跳过连接")
@@ -502,48 +539,72 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
         """单颗电池组装时间 (秒, REAL/FLOAT32)"""
         if self.debug_mode:
             return 0
-        time, read_err =  self.client.use_node('REG_DATA_ASSEMBLY_PER_TIME').read(2, word_order=WorderOrder.LITTLE)
-        return time
+        # 读取原始寄存器并正确解码FLOAT32
+        result = self.client.client.read_holding_registers(address=self.client.use_node('REG_DATA_ASSEMBLY_PER_TIME').address, count=2)
+        if result.isError():
+            logger.error(f"读取组装时间失败")
+            return 0.0
+        return _decode_float32_correct(result.registers)
 
     @property
     def data_open_circuit_voltage(self) -> float:
         """开路电压值 (FLOAT32)"""
         if self.debug_mode:
             return 0
-        vol, read_err =  self.client.use_node('REG_DATA_OPEN_CIRCUIT_VOLTAGE').read(2, word_order=WorderOrder.LITTLE)
-        return vol
+        # 读取原始寄存器并正确解码FLOAT32
+        result = self.client.client.read_holding_registers(address=self.client.use_node('REG_DATA_OPEN_CIRCUIT_VOLTAGE').address, count=2)
+        if result.isError():
+            logger.error(f"读取开路电压失败")
+            return 0.0
+        return _decode_float32_correct(result.registers)
 
     @property
     def data_axis_x_pos(self) -> float:
         """分液X轴当前位置 (FLOAT32)"""
         if self.debug_mode:
             return 0
-        pos, read_err =  self.client.use_node('REG_DATA_AXIS_X_POS').read(2, word_order=WorderOrder.LITTLE)
-        return pos
+        # 读取原始寄存器并正确解码FLOAT32
+        result = self.client.client.read_holding_registers(address=self.client.use_node('REG_DATA_AXIS_X_POS').address, count=2)
+        if result.isError():
+            logger.error(f"读取X轴位置失败")
+            return 0.0
+        return _decode_float32_correct(result.registers)
 
     @property
     def data_axis_y_pos(self) -> float:
         """分液Y轴当前位置 (FLOAT32)"""
         if self.debug_mode:
             return 0
-        pos, read_err =  self.client.use_node('REG_DATA_AXIS_Y_POS').read(2, word_order=WorderOrder.LITTLE)
-        return pos
+        # 读取原始寄存器并正确解码FLOAT32
+        result = self.client.client.read_holding_registers(address=self.client.use_node('REG_DATA_AXIS_Y_POS').address, count=2)
+        if result.isError():
+            logger.error(f"读变Y轴位置失败")
+            return 0.0
+        return _decode_float32_correct(result.registers)
 
     @property
     def data_axis_z_pos(self) -> float:
         """分液Z轴当前位置 (FLOAT32)"""
         if self.debug_mode:
             return 0
-        pos, read_err =  self.client.use_node('REG_DATA_AXIS_Z_POS').read(2, word_order=WorderOrder.LITTLE)
-        return pos
+        # 读取原始寄存器并正确解码FLOAT32
+        result = self.client.client.read_holding_registers(address=self.client.use_node('REG_DATA_AXIS_Z_POS').address, count=2)
+        if result.isError():
+            logger.error(f"读取Z轴位置失败")
+            return 0.0
+        return _decode_float32_correct(result.registers)
 
     @property
     def data_pole_weight(self) -> float:
         """当前电池正极片称重数据 (FLOAT32)"""
         if self.debug_mode:
             return 0
-        weight, read_err =  self.client.use_node('REG_DATA_POLE_WEIGHT').read(2, word_order=WorderOrder.LITTLE)
-        return weight
+        # 读取原始寄存器并正确解码FLOAT32
+        result = self.client.client.read_holding_registers(address=self.client.use_node('REG_DATA_POLE_WEIGHT').address, count=2)
+        if result.isError():
+            logger.error(f"读取极片质量失败")
+            return 0.0
+        return _decode_float32_correct(result.registers)
 
     @property
     def data_assembly_pressure(self) -> int:
@@ -573,11 +634,27 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
     def data_coin_cell_code(self) -> str:
         """电池二维码序列号 (STRING)"""
         try:
-            # 尝试不同的字节序读取
+            # 读取 STRING 类型数据
             code_little, read_err = self.client.use_node('REG_DATA_COIN_CELL_CODE').read(10, word_order=WorderOrder.LITTLE)
-            # logger.debug(f"读取电池二维码原始数据: {code_little}")
-            clean_code = code_little[-8:][::-1]
-            return clean_code
+            
+            # PyModbus 3.x 返回 string 类型
+            if not isinstance(code_little, str):
+                logger.warning(f"电池二维码返回的类型不支持: {type(code_little)}, 值: {repr(code_little)}")
+                return "N/A"
+            
+            # 从字符串末尾查找连续的字母数字字符（反转字符串）
+            import re
+            reversed_str = code_little[::-1]
+            match = re.match(r'^([A-Za-z0-9]+)', reversed_str)
+            
+            if not match:
+                logger.warning(f"未找到有效的电池二维码数据，原始字符串: {repr(code_little)}")
+                return "N/A"
+            
+            # 提取匹配到的字符串（已经是正确顺序）
+            decoded = match.group(1)[:8]  # 只取前8个字符
+            
+            return decoded if decoded else "N/A"
         except Exception as e:
             logger.error(f"读取电池二维码失败: {e}")
             return "N/A"
@@ -585,12 +662,29 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
 
     @property
     def data_electrolyte_code(self) -> str:
+        """电解液二维码序列号 (STRING)"""
         try:
-            # 尝试不同的字节序读取
+            # 读取 STRING 类型数据
             code_little, read_err = self.client.use_node('REG_DATA_ELECTROLYTE_CODE').read(10, word_order=WorderOrder.LITTLE)
-            # logger.debug(f"读取电解液二维码原始数据: {code_little}")
-            clean_code = code_little[-8:][::-1]
-            return clean_code
+            
+            # PyModbus 3.x 返回 string 类型
+            if not isinstance(code_little, str):
+                logger.warning(f"电解液二维码返回的类型不支持: {type(code_little)}, 值: {repr(code_little)}")
+                return "N/A"
+            
+            # 从字符串末尾查找连续的字母数字字符（反转字符串）
+            import re
+            reversed_str = code_little[::-1]
+            match = re.match(r'^([A-Za-z0-9]+)', reversed_str)
+            
+            if not match:
+                logger.warning(f"未找到有效的电解液二维码数据，原始字符串: {repr(code_little)}")
+                return "N/A"
+            
+            # 提取匹配到的字符串（已经是正确顺序）
+            decoded = match.group(1)[:8]  # 只取前8个字符
+            
+            return decoded if decoded else "N/A"
         except Exception as e:
             logger.error(f"读取电解液二维码失败: {e}")
             return "N/A"
@@ -598,27 +692,39 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
     # ===================== 环境监控区 ======================
     @property
     def data_glove_box_pressure(self) -> float:
-        """手套箱压力 (bar, FLOAT32)"""
+        """手套箱压力 (mbar, FLOAT32)"""
         if self.debug_mode:
             return 0
-        status, read_err = self.client.use_node('REG_DATA_GLOVE_BOX_PRESSURE').read(2, word_order=WorderOrder.LITTLE)
-        return status
+        # 读取原始寄存器并正确解码FLOAT32
+        result = self.client.client.read_holding_registers(address=self.client.use_node('REG_DATA_GLOVE_BOX_PRESSURE').address, count=2)
+        if result.isError():
+            logger.error(f"读取手套箱压力失败")
+            return 0.0
+        return _decode_float32_correct(result.registers)
 
     @property
     def data_glove_box_o2_content(self) -> float:
         """手套箱氧含量 (ppm, FLOAT32)"""
         if self.debug_mode:
             return 0
-        value, read_err = self.client.use_node('REG_DATA_GLOVE_BOX_O2_CONTENT').read(2, word_order=WorderOrder.LITTLE)
-        return value
+        # 读取原始寄存器并正确解码FLOAT32
+        result = self.client.client.read_holding_registers(address=self.client.use_node('REG_DATA_GLOVE_BOX_O2_CONTENT').address, count=2)
+        if result.isError():
+            logger.error(f"读取手套箱氧含量失败")
+            return 0.0
+        return _decode_float32_correct(result.registers)
 
     @property
     def data_glove_box_water_content(self) -> float:
         """手套箱水含量 (ppm, FLOAT32)"""
         if self.debug_mode:
             return 0
-        value, read_err = self.client.use_node('REG_DATA_GLOVE_BOX_WATER_CONTENT').read(2, word_order=WorderOrder.LITTLE)
-        return value
+        # 读取原始寄存器并正确解码FLOAT32
+        result = self.client.client.read_holding_registers(address=self.client.use_node('REG_DATA_GLOVE_BOX_WATER_CONTENT').address, count=2)
+        if result.isError():
+            logger.error(f"读取手套箱水含量失败")
+            return 0.0
+        return _decode_float32_correct(result.registers)
 
 #    @property
 #    def data_stack_vision_code(self) -> int:
@@ -690,6 +796,130 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
             print("waiting for start_cmd")
             time.sleep(1)      
 
+    def func_pack_device_init_auto_start_combined(self) -> bool:
+        """
+        组合函数：设备初始化 + 切换自动模式 + 启动
+        
+        整合了原有的三个独立函数：
+        1. func_pack_device_init()  - 设备初始化
+        2. func_pack_device_auto()  - 切换自动模式
+        3. func_pack_device_start() - 启动设备
+        
+        Returns:
+            bool: 操作成功返回 True，失败返回 False
+        """
+        logger.info("=" * 60)
+        logger.info("开始组合操作：设备初始化 → 自动模式 → 启动")
+        logger.info("=" * 60)
+        
+        # 步骤0: 前置条件检查
+        logger.info("\n【步骤 0/3】前置条件检查...")
+        try:
+            # 检查 REG_UNILAB_INTERACT (应该为False，表示使用Unilab交互)
+            unilab_interact_node = self.client.use_node('REG_UNILAB_INTERACT')
+            unilab_interact_value, read_err = unilab_interact_node.read(1)
+            
+            if read_err:
+                error_msg = "❌ 无法读取 REG_UNILAB_INTERACT 状态！请检查设备连接。"
+                logger.error(error_msg)
+                raise RuntimeError(error_msg)
+            
+            # 提取实际值（处理可能的列表或单值）
+            if isinstance(unilab_interact_value, (list, tuple)):
+                unilab_interact_actual = unilab_interact_value[0] if len(unilab_interact_value) > 0 else None
+            else:
+                unilab_interact_actual = unilab_interact_value
+            
+            logger.info(f"  REG_UNILAB_INTERACT 当前值: {unilab_interact_actual}")
+            
+            if unilab_interact_actual != False:
+                error_msg = (
+                    "❌ 前置条件检查失败！\n"
+                    f"  REG_UNILAB_INTERACT = {unilab_interact_actual} (期望值: False)\n"
+                    "  说明: 当前设备设置为'忽略Unilab交互'模式\n"
+                    "  操作: 请在HMI上确认并切换为'使用Unilab交互'模式\n"
+                    "  提示: REG_UNILAB_INTERACT应该为False才能继续"
+                )
+                logger.error(error_msg)
+                raise RuntimeError(error_msg)
+            
+            logger.info("  ✓ REG_UNILAB_INTERACT 检查通过 (值为False，使用Unilab交互)")
+            
+            # 检查 COIL_GB_L_IGNORE_CMD (应该为False，表示使用左手套箱)
+            gb_l_ignore_node = self.client.use_node('COIL_GB_L_IGNORE_CMD')
+            gb_l_ignore_value, read_err = gb_l_ignore_node.read(1)
+            
+            if read_err:
+                error_msg = "❌ 无法读取 COIL_GB_L_IGNORE_CMD 状态！请检查设备连接。"
+                logger.error(error_msg)
+                raise RuntimeError(error_msg)
+            
+            # 提取实际值
+            if isinstance(gb_l_ignore_value, (list, tuple)):
+                gb_l_ignore_actual = gb_l_ignore_value[0] if len(gb_l_ignore_value) > 0 else None
+            else:
+                gb_l_ignore_actual = gb_l_ignore_value
+            
+            logger.info(f"  COIL_GB_L_IGNORE_CMD 当前值: {gb_l_ignore_actual}")
+            
+            if gb_l_ignore_actual != False:
+                error_msg = (
+                    "❌ 前置条件检查失败！\n"
+                    f"  COIL_GB_L_IGNORE_CMD = {gb_l_ignore_actual} (期望值: False)\n"
+                    "  说明: 当前设备设置为'忽略左手套箱'模式\n"
+                    "  操作: 请在HMI上确认并切换为'使用左手套箱'模式\n"
+                    "  提示: COIL_GB_L_IGNORE_CMD应该为False才能继续"
+                )
+                logger.error(error_msg)
+                raise RuntimeError(error_msg)
+            
+            logger.info("  ✓ COIL_GB_L_IGNORE_CMD 检查通过 (值为False，使用左手套箱)")
+            logger.info("✓ 所有前置条件检查通过！")
+            
+        except ValueError as e:
+            # 节点未找到
+            error_msg = f"❌ 配置错误：{str(e)}\n请检查CSV配置文件是否包含必要的节点。"
+            logger.error(error_msg)
+            raise RuntimeError(error_msg)
+        except Exception as e:
+            # 其他异常
+            error_msg = f"❌ 前置条件检查异常：{str(e)}"
+            logger.error(error_msg)
+            raise
+        
+        # 步骤1: 设备初始化
+        logger.info("\n【步骤 1/3】设备初始化...")
+        try:
+            self.func_pack_device_init()
+            logger.info("✓ 设备初始化完成")
+        except Exception as e:
+            logger.error(f"❌ 设备初始化失败: {e}")
+            return False
+        
+        # 步骤2: 切换自动模式
+        logger.info("\n【步骤 2/3】切换自动模式...")
+        try:
+            self.func_pack_device_auto()
+            logger.info("✓ 切换自动模式完成")
+        except Exception as e:
+            logger.error(f"❌ 切换自动模式失败: {e}")
+            return False
+        
+        # 步骤3: 启动设备
+        logger.info("\n【步骤 3/3】启动设备...")
+        try:
+            self.func_pack_device_start()
+            logger.info("✓ 启动设备完成")
+        except Exception as e:
+            logger.error(f"❌ 启动设备失败: {e}")
+            return False
+        
+        logger.info("\n" + "=" * 60)
+        logger.info("组合操作完成：设备已成功初始化、切换自动模式并启动")
+        logger.info("=" * 60)
+        
+        return True
+
     def func_pack_send_bottle_num(self, bottle_num):
         bottle_num = int(bottle_num)
         #发送电解液平台数
@@ -713,6 +943,111 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
         time.sleep(1) 
         #自动按钮置False
 
+    def func_sendbottle_allpack_multi(
+        self, 
+        elec_num, 
+        elec_use_num, 
+        elec_vol: int = 50,
+        # 电解液双滴模式参数
+        dual_drop_mode: bool = False,
+        dual_drop_first_volume: int = 25,
+        dual_drop_suction_timing: bool = False,
+        dual_drop_start_timing: bool = False,
+        assembly_type: int = 7, 
+        assembly_pressure: int = 4200,
+        # 来自原 qiming_coin_cell_code 的参数
+        fujipian_panshu: int = 0,
+        fujipian_juzhendianwei: int = 0,
+        gemopanshu: int = 0,
+        gemo_juzhendianwei: int = 0,
+        qiangtou_juzhendianwei: int = 0,
+        lvbodian: bool = True,
+        battery_pressure_mode: bool = True,
+        battery_clean_ignore: bool = False,
+        file_path: str = "/Users/sml/work"
+    ) -> Dict[str, Any]:
+        """
+        发送瓶数+简化组装函数（适用于第二批次及后续批次）
+        
+        合并了发送瓶数和简化组装流程，用于连续批次生产。
+        适用场景：设备已完成初始化和启动，仍在自动模式下运行。
+        
+        Args:
+            elec_num: 电解液瓶数
+            elec_use_num: 每瓶电解液组装的电池数
+            elec_vol: 电解液吸液量 (μL)
+            dual_drop_mode: 电解液添加模式 (False=单次滴液, True=二次滴液)
+            dual_drop_first_volume: 二次滴液第一次排液体积 (μL)
+            dual_drop_suction_timing: 二次滴液吸液时机 (False=正常吸液, True=先吸液)
+            dual_drop_start_timing: 二次滴液开始滴液时机 (False=正极片前, True=正极片后)
+            assembly_type: 组装类型 (7=不用铝箔垫, 8=使用铝箔垫)
+            assembly_pressure: 电池压制力 (N)
+            fujipian_panshu: 负极片盘数
+            fujipian_juzhendianwei: 负极片矩阵点位
+            gemopanshu: 隔膜盘数
+            gemo_juzhendianwei: 隔膜矩阵点位
+            qiangtou_juzhendianwei: 枪头盒矩阵点位
+            lvbodian: 是否使用铝箔垫片
+            battery_pressure_mode: 是否启用压力模式
+            battery_clean_ignore: 是否忽略电池清洁
+            file_path: 实验记录保存路径
+            
+        Returns:
+            dict: 包含组装结果的字典
+            
+        注意：
+            - 第一次启动需先调用 func_pack_device_init_auto_start_combined()
+            - 后续批次直接调用此函数即可
+        """
+        logger.info("=" * 60)
+        logger.info("开始发送瓶数+简化组装流程...")
+        logger.info(f"电解液瓶数: {elec_num}, 每瓶电池数: {elec_use_num}")
+        logger.info("=" * 60)
+        
+        # 步骤1: 发送电解液瓶数（触发物料搬运）
+        logger.info("步骤1/2: 发送电解液瓶数，触发物料搬运...")
+        try:
+            self.func_pack_send_bottle_num(elec_num)
+            logger.info("✓ 瓶数发送完成，物料搬运中...")
+        except Exception as e:
+            logger.error(f"发送瓶数失败: {e}")
+            return {
+                "success": False,
+                "error": f"发送瓶数失败: {e}",
+                "total_batteries": 0,
+                "batteries": []
+            }
+        
+        # 步骤2: 执行简化组装流程
+        logger.info("步骤2/2: 开始简化组装流程...")
+        result = self.func_allpack_cmd_simp(
+            elec_num=elec_num,
+            elec_use_num=elec_use_num,
+            elec_vol=elec_vol,
+            dual_drop_mode=dual_drop_mode,
+            dual_drop_first_volume=dual_drop_first_volume,
+            dual_drop_suction_timing=dual_drop_suction_timing,
+            dual_drop_start_timing=dual_drop_start_timing,
+            assembly_type=assembly_type,
+            assembly_pressure=assembly_pressure,
+            fujipian_panshu=fujipian_panshu,
+            fujipian_juzhendianwei=fujipian_juzhendianwei,
+            gemopanshu=gemopanshu,
+            gemo_juzhendianwei=gemo_juzhendianwei,
+            qiangtou_juzhendianwei=qiangtou_juzhendianwei,
+            lvbodian=lvbodian,
+            battery_pressure_mode=battery_pressure_mode,
+            battery_clean_ignore=battery_clean_ignore,
+            file_path=file_path
+        )
+        
+        logger.info("=" * 60)
+        logger.info("发送瓶数+简化组装流程完成")
+        logger.info(f"总组装电池数: {result.get('total_batteries', 0)}")
+        logger.info("=" * 60)
+        
+        return result
+
 
     # 下发参数
     #def func_pack_send_msg_cmd(self, elec_num: int, elec_use_num: int, elec_vol: float, assembly_type: int, assembly_pressure: int) -> bool:
@@ -774,14 +1109,59 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
         while self.request_send_msg_status == False:
             print("waiting for send_read_msg_status to True")
             time.sleep(1)
-        data_open_circuit_voltage = self.data_open_circuit_voltage
-        data_pole_weight = self.data_pole_weight
+        
+        # 处理开路电压 - 确保是数值类型
+        try:
+            data_open_circuit_voltage = self.data_open_circuit_voltage
+            if isinstance(data_open_circuit_voltage, (list, tuple)) and len(data_open_circuit_voltage) > 0:
+                data_open_circuit_voltage = float(data_open_circuit_voltage[0])
+            else:
+                data_open_circuit_voltage = float(data_open_circuit_voltage)
+        except Exception as e:
+            print(f"读取开路电压失败: {e}")
+            logger.error(f"读取开路电压失败: {e}")
+            data_open_circuit_voltage = 0.0
+        
+        # 处理极片质量 - 确保是数值类型
+        try:
+            data_pole_weight = self.data_pole_weight
+            if isinstance(data_pole_weight, (list, tuple)) and len(data_pole_weight) > 0:
+                data_pole_weight = float(data_pole_weight[0])
+            else:
+                data_pole_weight = float(data_pole_weight)
+        except Exception as e:
+            print(f"读取正极片重量失败: {e}")
+            logger.error(f"读取正极片重量失败: {e}")
+            data_pole_weight = 0.0
+        
         data_assembly_time = self.data_assembly_time
         data_assembly_pressure = self.data_assembly_pressure
         data_electrolyte_volume = self.data_electrolyte_volume
         data_coin_num = self.data_coin_num
-        data_electrolyte_code = self.data_electrolyte_code
-        data_coin_cell_code = self.data_coin_cell_code
+        
+        # 处理电解液二维码 - 确保是字符串类型
+        try:
+            data_electrolyte_code = self.data_electrolyte_code
+            if isinstance(data_electrolyte_code, str):
+                data_electrolyte_code = data_electrolyte_code.strip()
+            else:
+                data_electrolyte_code = str(data_electrolyte_code)
+        except Exception as e:
+            print(f"读取电解液二维码失败: {e}")
+            logger.error(f"读取电解液二维码失败: {e}")
+            data_electrolyte_code = "N/A"
+        
+        # 处理电池二维码 - 确保是字符串类型
+        try:
+            data_coin_cell_code = self.data_coin_cell_code
+            if isinstance(data_coin_cell_code, str):
+                data_coin_cell_code = data_coin_cell_code.strip()
+            else:
+                data_coin_cell_code = str(data_coin_cell_code)
+        except Exception as e:
+            print(f"读取电池二维码失败: {e}")
+            logger.error(f"读取电池二维码失败: {e}")
+            data_coin_cell_code = "N/A"
         logger.debug(f"data_open_circuit_voltage: {data_open_circuit_voltage}")
         logger.debug(f"data_pole_weight: {data_pole_weight}")
         logger.debug(f"data_assembly_time: {data_assembly_time}")
@@ -792,8 +1172,25 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
         logger.debug(f"data_coin_cell_code: {data_coin_cell_code}")
         #接收完信息后，读取完毕标志位置True
         liaopan3 = self.deck.get_resource("成品弹夹")        
-        #把物料解绑后放到另一盘上
-        battery = ElectrodeSheet(name=f"battery_{self.coin_num_N}", size_x=14, size_y=14, size_z=2)
+        
+        # 生成唯一的电池名称（使用时间戳确保唯一性）
+        timestamp_suffix = datetime.now().strftime("%Y%m%d_%H%M%S_%f")
+        battery_name = f"battery_{self.coin_num_N}_{timestamp_suffix}"
+        
+        # 检查目标位置是否已有资源，如果有则先卸载
+        target_slot = liaopan3.children[self.coin_num_N]
+        if target_slot.children:
+            logger.warning(f"位置 {self.coin_num_N} 已有资源，将先卸载旧资源")
+            try:
+                # 卸载所有现有子资源
+                for child in list(target_slot.children):
+                    target_slot.unassign_child_resource(child)
+                    logger.info(f"已卸载旧资源: {child.name}")
+            except Exception as e:
+                logger.error(f"卸载旧资源时出错: {e}")
+        
+        # 创建新的电池资源
+        battery = ElectrodeSheet(name=battery_name, size_x=14, size_y=14, size_z=2)
         battery._unilabos_state = {
                             "electrolyte_name": data_coin_cell_code,
                             "data_electrolyte_code": data_electrolyte_code,
@@ -801,7 +1198,16 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
                             "assembly_pressure": data_assembly_pressure,
                             "electrolyte_volume": data_electrolyte_volume
                             }
-        liaopan3.children[self.coin_num_N].assign_child_resource(battery, location=None)
+        
+        # 分配新资源到目标位置
+        try:
+            target_slot.assign_child_resource(battery, location=None)
+            logger.info(f"成功分配电池 {battery_name} 到位置 {self.coin_num_N}")
+        except Exception as e:
+            logger.error(f"分配电池资源失败: {e}")
+            # 如果分配失败，尝试使用更简单的方法
+            raise
+        
         #print(jipian2.parent)
         ROS2DeviceNode.run_async_func(self._ros_node.update_resource, True, **{
             "resources": [self.deck]
@@ -879,11 +1285,14 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
         
         return self.success
 
-    def func_allpack_cmd(self, elec_num, elec_use_num, elec_vol:int=50, assembly_type:int=7, assembly_pressure:int=4200, file_path: str="/Users/sml/work") -> bool:
+    def func_allpack_cmd(self, elec_num, elec_use_num, elec_vol:int=50, assembly_type:int=7, assembly_pressure:int=4200, file_path: str="/Users/sml/work") -> Dict[str, Any]:
         elec_num, elec_use_num, elec_vol, assembly_type, assembly_pressure = int(elec_num), int(elec_use_num), int(elec_vol), int(assembly_type), int(assembly_pressure)
         summary_csv_file = os.path.join(file_path, "duandian.csv")
-        # 如果断点文件存在，先读取之前的进度
         
+        # 用于收集所有电池的数据
+        battery_data_list = []
+        
+        # 如果断点文件存在，先读取之前的进度
         if os.path.exists(summary_csv_file):
             read_status_flag = True
             with open(summary_csv_file, 'r', newline='', encoding='utf-8') as csvfile:
@@ -900,7 +1309,12 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
                         print("断点文件与当前任务匹配，继续")
                     else:
                         print("断点文件中elec_num、elec_use_num与当前任务不匹配，请检查任务下发参数或修改断点文件")
-                        return False
+                        return {
+                            "success": False,
+                            "error": "断点文件参数不匹配",
+                            "total_batteries": 0,
+                            "batteries": []
+                        }
                     print(f"从断点文件读取进度: elec_num_N={elec_num_N}, elec_use_num_N={elec_use_num_N}, coin_num_N={coin_num_N}")
                      
         else:
@@ -935,13 +1349,63 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
 
             for j in range(j_start, elec_use_num):
                 print(f"开始第{last_i+i+1}瓶电解液的第{j+j_start+1}个电池组装")
+                
                 #读取电池组装数据并存入csv
                 self.func_pack_get_msg_cmd(file_path)
+                
+                # 收集当前电池的数据
+                # 处理电池二维码
+                try:
+                    battery_qr_code = self.data_coin_cell_code
+                except Exception as e:
+                    print(f"读取电池二维码失败: {e}")
+                    battery_qr_code = "N/A"
+                
+                # 处理电解液二维码
+                try:
+                    electrolyte_qr_code = self.data_electrolyte_code
+                except Exception as e:
+                    print(f"读取电解液二维码失败: {e}")
+                    electrolyte_qr_code = "N/A"
+                
+                # 处理开路电压 - 确保是数值类型
+                try:
+                    open_circuit_voltage = self.data_open_circuit_voltage
+                    if isinstance(open_circuit_voltage, (list, tuple)) and len(open_circuit_voltage) > 0:
+                        open_circuit_voltage = float(open_circuit_voltage[0])
+                    else:
+                        open_circuit_voltage = float(open_circuit_voltage)
+                except Exception as e:
+                    print(f"读取开路电压失败: {e}")
+                    open_circuit_voltage = 0.0
+                
+                # 处理极片质量 - 确保是数值类型
+                try:
+                    pole_weight = self.data_pole_weight
+                    if isinstance(pole_weight, (list, tuple)) and len(pole_weight) > 0:
+                        pole_weight = float(pole_weight[0])
+                    else:
+                        pole_weight = float(pole_weight)
+                except Exception as e:
+                    print(f"读取正极片重量失败: {e}")
+                    pole_weight = 0.0
+                
+                battery_info = {
+                    "battery_index": coin_num_N + 1,
+                    "battery_barcode": battery_qr_code,
+                    "electrolyte_barcode": electrolyte_qr_code,
+                    "open_circuit_voltage": open_circuit_voltage,
+                    "pole_weight": pole_weight,
+                    "assembly_time": self.data_assembly_time,
+                    "assembly_pressure": self.data_assembly_pressure,
+                    "electrolyte_volume": self.data_electrolyte_volume
+                }
+                battery_data_list.append(battery_info)
+                print(f"已收集第 {coin_num_N + 1} 个电池数据: 电池码={battery_info['battery_barcode']}, 电解液码={battery_info['electrolyte_barcode']}")
+                
                 time.sleep(1)
                 # TODO:读完再将电池数加一还是进入循环就将电池数加一需要考虑
 
-
-
                 # 生成断点文件
                 # 生成包含elec_num_N、coin_num_N、timestamp的CSV文件
                 timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
@@ -960,8 +1424,284 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
         os.remove(summary_csv_file)
         #全部完成后等待依华发送完成信号
         self.func_pack_send_finished_cmd()
+        
+        # 返回JSON格式数据
+        result = {
+            "success": True,
+            "total_batteries": len(battery_data_list),
+            "batteries": battery_data_list,
+            "summary": {
+                "electrolyte_bottles_used": elec_num,
+                "batteries_per_bottle": elec_use_num,
+                "electrolyte_volume": elec_vol,
+                "assembly_type": assembly_type,
+                "assembly_pressure": assembly_pressure
+            }
+        }
+        
+        print(f"\n{'='*60}")
+        print(f"组装完成统计:")
+        print(f"  总组装电池数: {result['total_batteries']}")
+        print(f"  使用电解液瓶数: {elec_num}")
+        print(f"  每瓶电池数: {elec_use_num}")
+        print(f"{'='*60}\n")
+        
+        return result
 
 
+    def func_allpack_cmd_simp(
+        self, 
+        elec_num, 
+        elec_use_num, 
+        elec_vol: int = 50,
+        # 电解液双滴模式参数
+        dual_drop_mode: bool = False,
+        dual_drop_first_volume: int = 25,
+        dual_drop_suction_timing: bool = False,
+        dual_drop_start_timing: bool = False,
+        assembly_type: int = 7, 
+        assembly_pressure: int = 4200,
+        # 来自原 qiming_coin_cell_code 的参数
+        fujipian_panshu: int = 0,
+        fujipian_juzhendianwei: int = 0,
+        gemopanshu: int = 0,
+        gemo_juzhendianwei: int = 0,
+        qiangtou_juzhendianwei: int = 0,
+        lvbodian: bool = True,
+        battery_pressure_mode: bool = True,
+        battery_clean_ignore: bool = False,
+        file_path: str = "/Users/sml/work"
+    ) -> Dict[str, Any]:
+        """
+        简化版电池组装函数，整合了原 qiming_coin_cell_code 的参数设置和双滴模式
+        
+        此函数是 func_allpack_cmd 的增强版本，自动处理以下配置：
+        - 负极片和隔膜的盘数及矩阵点位
+        - 枪头盒矩阵点位
+        - 铝箔垫片使用设置
+        - 压力模式和清洁忽略选项
+        - 电解液双滴模式（分两次滴液）
+        
+        Args:
+            elec_num: 电解液瓶数
+            elec_use_num: 每瓶电解液组装的电池数
+            elec_vol: 电解液吸液量 (μL)
+            dual_drop_mode: 电解液添加模式 (False=单次滴液, True=二次滴液)
+            dual_drop_first_volume: 二次滴液第一次排液体积 (μL)
+            dual_drop_suction_timing: 二次滴液吸液时机 (False=正常吸液, True=先吸液)
+            dual_drop_start_timing: 二次滴液开始滴液时机 (False=正极片前, True=正极片后)
+            assembly_type: 组装类型 (7=不用铝箔垫, 8=使用铝箔垫)
+            assembly_pressure: 电池压制力 (N)
+            fujipian_panshu: 负极片盘数
+            fujipian_juzhendianwei: 负极片矩阵点位
+            gemopanshu: 隔膜盘数
+            gemo_juzhendianwei: 隔膜矩阵点位
+            qiangtou_juzhendianwei: 枪头盒矩阵点位
+            lvbodian: 是否使用铝箔垫片
+            battery_pressure_mode: 是否启用压力模式
+            battery_clean_ignore: 是否忽略电池清洁
+            file_path: 实验记录保存路径
+        
+        Returns:
+            dict: 包含组装结果的字典
+        """
+        # 参数类型转换
+        elec_num = int(elec_num)
+        elec_use_num = int(elec_use_num)
+        elec_vol = int(elec_vol)
+        dual_drop_first_volume = int(dual_drop_first_volume)
+        assembly_type = int(assembly_type)
+        assembly_pressure = int(assembly_pressure)
+        fujipian_panshu = int(fujipian_panshu)
+        fujipian_juzhendianwei = int(fujipian_juzhendianwei)
+        gemopanshu = int(gemopanshu)
+        gemo_juzhendianwei = int(gemo_juzhendianwei)
+        qiangtou_juzhendianwei = int(qiangtou_juzhendianwei)
+        
+        # 步骤1: 设置设备参数（原 qiming_coin_cell_code 的功能）
+        logger.info("=" * 60)
+        logger.info("设置设备参数...")
+        logger.info(f"  负极片盘数: {fujipian_panshu}, 矩阵点位: {fujipian_juzhendianwei}")
+        logger.info(f"  隔膜盘数: {gemopanshu}, 矩阵点位: {gemo_juzhendianwei}")
+        logger.info(f"  枪头盒矩阵点位: {qiangtou_juzhendianwei}")
+        logger.info(f"  铝箔垫片: {lvbodian}, 压力模式: {battery_pressure_mode}")
+        logger.info(f"  压制力: {assembly_pressure}")
+        logger.info(f"  忽略电池清洁: {battery_clean_ignore}")
+        logger.info("=" * 60)
+        
+        # 写入基础参数到PLC
+        self.client.use_node('REG_MSG_NE_PLATE_NUM').write(fujipian_panshu)
+        self.client.use_node('REG_MSG_NE_PLATE_MATRIX').write(fujipian_juzhendianwei)
+        self.client.use_node('REG_MSG_SEPARATOR_PLATE_NUM').write(gemopanshu)
+        self.client.use_node('REG_MSG_SEPARATOR_PLATE_MATRIX').write(gemo_juzhendianwei)
+        self.client.use_node('REG_MSG_TIP_BOX_MATRIX').write(qiangtou_juzhendianwei)
+        self.client.use_node('COIL_ALUMINUM_FOIL').write(not lvbodian)
+        self.client.use_node('REG_MSG_PRESS_MODE').write(not battery_pressure_mode)
+        self.client.use_node('REG_MSG_BATTERY_CLEAN_IGNORE').write(battery_clean_ignore)
+        
+        # 设置电解液双滴模式参数
+        self.client.use_node('COIL_ELECTROLYTE_DUAL_DROP_MODE').write(dual_drop_mode)
+        self.client.use_node('REG_MSG_DUAL_DROP_FIRST_VOLUME').write(dual_drop_first_volume)
+        self.client.use_node('COIL_DUAL_DROP_SUCTION_TIMING').write(dual_drop_suction_timing)
+        self.client.use_node('COIL_DUAL_DROP_START_TIMING').write(dual_drop_start_timing)
+        
+        if dual_drop_mode:
+            logger.info(f"✓ 双滴模式已启用: 第一次排液={dual_drop_first_volume}μL, "
+                        f"吸液时机={'先吸液' if dual_drop_suction_timing else '正常吸液'}, "
+                        f"滴液时机={'正极片后' if dual_drop_start_timing else '正极片前'}")
+        else:
+            logger.info("✓ 单次滴液模式")
+        
+        logger.info("✓ 设备参数设置完成")
+        
+        # 步骤2: 执行组装流程（复用 func_allpack_cmd 的主体逻辑）
+        summary_csv_file = os.path.join(file_path, "duandian.csv")
+        
+        # 用于收集所有电池的数据
+        battery_data_list = []
+        
+        # 如果断点文件存在，先读取之前的进度
+        if os.path.exists(summary_csv_file):
+            read_status_flag = True
+            with open(summary_csv_file, 'r', newline='', encoding='utf-8') as csvfile:
+                reader = csv.reader(csvfile)
+                header = next(reader)  # 跳过标题行
+                data_row = next(reader)  # 读取数据行
+                if len(data_row) >= 2:
+                    elec_num_r = int(data_row[0])
+                    elec_use_num_r = int(data_row[1])
+                    elec_num_N = int(data_row[2])
+                    elec_use_num_N = int(data_row[3])
+                    coin_num_N = int(data_row[4])
+                    if elec_num_r == elec_num and elec_use_num_r == elec_use_num:
+                        print("断点文件与当前任务匹配，继续")
+                    else:
+                        print("断点文件中elec_num、elec_use_num与当前任务不匹配，请检查任务下发参数或修改断点文件")
+                        return {
+                            "success": False,
+                            "error": "断点文件参数不匹配",
+                            "total_batteries": 0,
+                            "batteries": []
+                        }
+                    print(f"从断点文件读取进度: elec_num_N={elec_num_N}, elec_use_num_N={elec_use_num_N}, coin_num_N={coin_num_N}")
+                     
+        else:
+            read_status_flag = False
+            print("未找到断点文件，从头开始")
+            elec_num_N = 0
+            elec_use_num_N = 0
+            coin_num_N = 0
+        
+        for i in range(20):
+            print(f"剩余电解液瓶数: {elec_num}, 已组装电池数: {elec_use_num}")
+            print(f"剩余电解液瓶数: {type(elec_num)}, 已组装电池数: {type(elec_use_num)}")
+            print(f"剩余电解液瓶数: {type(int(elec_num))}, 已组装电池数: {type(int(elec_use_num))}")
+        
+        last_i = elec_num_N
+        last_j = elec_use_num_N
+        for i in range(last_i, elec_num):
+            print(f"开始第{last_i+i+1}瓶电解液的组装")
+            # 第一个循环从上次断点继续，后续循环从0开始
+            j_start = last_j if i == last_i else 0
+            self.func_pack_send_msg_cmd(elec_use_num-j_start, elec_vol, assembly_type, assembly_pressure)
+
+            for j in range(j_start, elec_use_num):
+                print(f"开始第{last_i+i+1}瓶电解液的第{j+j_start+1}个电池组装")
+                
+                # 读取电池组装数据并存入csv
+                self.func_pack_get_msg_cmd(file_path)
+                
+                # 收集当前电池的数据
+                try:
+                    battery_qr_code = self.data_coin_cell_code
+                except Exception as e:
+                    print(f"读取电池二维码失败: {e}")
+                    battery_qr_code = "N/A"
+                
+                try:
+                    electrolyte_qr_code = self.data_electrolyte_code
+                except Exception as e:
+                    print(f"读取电解液二维码失败: {e}")
+                    electrolyte_qr_code = "N/A"
+                
+                try:
+                    open_circuit_voltage = self.data_open_circuit_voltage
+                    if isinstance(open_circuit_voltage, (list, tuple)) and len(open_circuit_voltage) > 0:
+                        open_circuit_voltage = float(open_circuit_voltage[0])
+                    else:
+                        open_circuit_voltage = float(open_circuit_voltage)
+                except Exception as e:
+                    print(f"读取开路电压失败: {e}")
+                    open_circuit_voltage = 0.0
+                
+                try:
+                    pole_weight = self.data_pole_weight
+                    if isinstance(pole_weight, (list, tuple)) and len(pole_weight) > 0:
+                        pole_weight = float(pole_weight[0])
+                    else:
+                        pole_weight = float(pole_weight)
+                except Exception as e:
+                    print(f"读取正极片重量失败: {e}")
+                    pole_weight = 0.0
+                
+                battery_info = {
+                    "battery_index": coin_num_N + 1,
+                    "battery_barcode": battery_qr_code,
+                    "electrolyte_barcode": electrolyte_qr_code,
+                    "open_circuit_voltage": open_circuit_voltage,
+                    "pole_weight": pole_weight,
+                    "assembly_time": self.data_assembly_time,
+                    "assembly_pressure": self.data_assembly_pressure,
+                    "electrolyte_volume": self.data_electrolyte_volume
+                }
+                battery_data_list.append(battery_info)
+                print(f"已收集第 {coin_num_N + 1} 个电池数据: 电池码={battery_info['battery_barcode']}, 电解液码={battery_info['electrolyte_barcode']}")
+                
+                time.sleep(1)
+
+                # 生成断点文件
+                timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+                with open(summary_csv_file, 'w', newline='', encoding='utf-8') as csvfile:
+                    writer = csv.writer(csvfile)
+                    writer.writerow(['elec_num','elec_use_num', 'elec_num_N', 'elec_use_num_N', 'coin_num_N', 'timestamp'])
+                    writer.writerow([elec_num, elec_use_num, elec_num_N, elec_use_num_N, coin_num_N, timestamp])
+                    csvfile.flush()
+                coin_num_N += 1
+                self.coin_num_N = coin_num_N
+                elec_use_num_N += 1
+            elec_num_N += 1
+            elec_use_num_N = 0
+
+        # 循环正常结束，则删除断点文件
+        os.remove(summary_csv_file)
+        # 全部完成后等待依华发送完成信号
+        self.func_pack_send_finished_cmd()
+        
+        # 返回JSON格式数据
+        result = {
+            "success": True,
+            "total_batteries": len(battery_data_list),
+            "batteries": battery_data_list,
+            "summary": {
+                "electrolyte_bottles_used": elec_num,
+                "batteries_per_bottle": elec_use_num,
+                "electrolyte_volume": elec_vol,
+                "assembly_type": assembly_type,
+                "assembly_pressure": assembly_pressure,
+                "dual_drop_mode": dual_drop_mode
+            }
+        }
+        
+        print(f"\n{'='*60}")
+        print(f"组装完成统计:")
+        print(f"  总组装电池数: {result['total_batteries']}")
+        print(f"  使用电解液瓶数: {elec_num}")
+        print(f"  每瓶电池数: {elec_use_num}")
+        print(f"  双滴模式: {'启用' if dual_drop_mode else '禁用'}")
+        print(f"{'='*60}\n")
+        
+        return result
+
     def func_pack_device_stop(self) -> bool:
         """打包指令：设备停止"""
         for i in range(3):

unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly_1105.csv

@@ -1,64 +0,0 @@
-Name,DataType,InitValue,Comment,Attribute,DeviceType,Address,
-COIL_SYS_START_CMD,BOOL,,,,coil,9010,
-COIL_SYS_STOP_CMD,BOOL,,,,coil,9020,
-COIL_SYS_RESET_CMD,BOOL,,,,coil,9030,
-COIL_SYS_HAND_CMD,BOOL,,,,coil,9040,
-COIL_SYS_AUTO_CMD,BOOL,,,,coil,9050,
-COIL_SYS_INIT_CMD,BOOL,,,,coil,9060,
-COIL_UNILAB_SEND_MSG_SUCC_CMD,BOOL,,,,coil,9700,
-COIL_UNILAB_REC_MSG_SUCC_CMD,BOOL,,,,coil,9710,unilab_rec_msg_succ_cmd
-COIL_SYS_START_STATUS,BOOL,,,,coil,9210,
-COIL_SYS_STOP_STATUS,BOOL,,,,coil,9220,
-COIL_SYS_RESET_STATUS,BOOL,,,,coil,9230,
-COIL_SYS_HAND_STATUS,BOOL,,,,coil,9240,
-COIL_SYS_AUTO_STATUS,BOOL,,,,coil,9250,
-COIL_SYS_INIT_STATUS,BOOL,,,,coil,9260,
-COIL_REQUEST_REC_MSG_STATUS,BOOL,,,,coil,9500,
-COIL_REQUEST_SEND_MSG_STATUS,BOOL,,,,coil,9510,request_send_msg_status
-REG_MSG_ELECTROLYTE_USE_NUM,INT16,,,,hold_register,17000,
-REG_MSG_ELECTROLYTE_NUM,INT16,,,,hold_register,17002,unilab_send_msg_electrolyte_num
-REG_MSG_ELECTROLYTE_VOLUME,INT16,,,,hold_register,17004,unilab_send_msg_electrolyte_vol
-REG_MSG_ASSEMBLY_TYPE,INT16,,,,hold_register,17006,unilab_send_msg_assembly_type
-REG_MSG_ASSEMBLY_PRESSURE,INT16,,,,hold_register,17008,unilab_send_msg_assembly_pressure
-REG_DATA_ASSEMBLY_COIN_CELL_NUM,INT16,,,,hold_register,16000,data_assembly_coin_cell_num
-REG_DATA_OPEN_CIRCUIT_VOLTAGE,FLOAT32,,,,hold_register,16002,data_open_circuit_voltage
-REG_DATA_AXIS_X_POS,FLOAT32,,,,hold_register,16004,
-REG_DATA_AXIS_Y_POS,FLOAT32,,,,hold_register,16006,
-REG_DATA_AXIS_Z_POS,FLOAT32,,,,hold_register,16008,
-REG_DATA_POLE_WEIGHT,FLOAT32,,,,hold_register,16010,data_pole_weight
-REG_DATA_ASSEMBLY_PER_TIME,FLOAT32,,,,hold_register,16012,data_assembly_time
-REG_DATA_ASSEMBLY_PRESSURE,INT16,,,,hold_register,16014,data_assembly_pressure
-REG_DATA_ELECTROLYTE_VOLUME,INT16,,,,hold_register,16016,data_electrolyte_volume
-REG_DATA_COIN_NUM,INT16,,,,hold_register,16018,data_coin_num
-REG_DATA_ELECTROLYTE_CODE,STRING,,,,hold_register,16020,data_electrolyte_code()
-REG_DATA_COIN_CELL_CODE,STRING,,,,hold_register,16030,data_coin_cell_code()
-REG_DATA_STACK_VISON_CODE,STRING,,,,hold_register,18004,data_stack_vision_code()
-REG_DATA_GLOVE_BOX_PRESSURE,FLOAT32,,,,hold_register,16050,data_glove_box_pressure
-REG_DATA_GLOVE_BOX_WATER_CONTENT,FLOAT32,,,,hold_register,16052,data_glove_box_water_content
-REG_DATA_GLOVE_BOX_O2_CONTENT,FLOAT32,,,,hold_register,16054,data_glove_box_o2_content
-UNILAB_SEND_ELECTROLYTE_BOTTLE_NUM,BOOL,,,,coil,9720,
-UNILAB_RECE_ELECTROLYTE_BOTTLE_NUM,BOOL,,,,coil,9520,
-REG_MSG_ELECTROLYTE_NUM_USED,INT16,,,,hold_register,17496,
-REG_DATA_ELECTROLYTE_USE_NUM,INT16,,,,hold_register,16000,
-UNILAB_SEND_FINISHED_CMD,BOOL,,,,coil,9730,
-UNILAB_RECE_FINISHED_CMD,BOOL,,,,coil,9530,
-REG_DATA_ASSEMBLY_TYPE,INT16,,,,hold_register,16018,ASSEMBLY_TYPE7or8
-COIL_ALUMINUM_FOIL,BOOL,,使用铝箔垫,,coil,9340,
-REG_MSG_NE_PLATE_MATRIX,INT16,,负极片矩阵点位,,hold_register,17440,
-REG_MSG_SEPARATOR_PLATE_MATRIX,INT16,,隔膜矩阵点位,,hold_register,17450,
-REG_MSG_TIP_BOX_MATRIX,INT16,,移液枪头矩阵点位,,hold_register,17480,
-REG_MSG_NE_PLATE_NUM,INT16,,负极片盘数,,hold_register,17443,
-REG_MSG_SEPARATOR_PLATE_NUM,INT16,,隔膜盘数,,hold_register,17453,
-REG_MSG_PRESS_MODE,BOOL,,压制模式（false:压力检测模式，True:距离模式）,,coil,9360,电池压制模式
-,,,,,,,
-,BOOL,,视觉对位（false:使用，true:忽略）,,coil,9300,视觉对位
-,BOOL,,复检（false:使用，true:忽略）,,coil,9310,视觉复检
-,BOOL,,手套箱_左仓（false:使用，true:忽略）,,coil,9320,手套箱左仓
-,BOOL,,手套箱_右仓（false:使用，true:忽略）,,coil,9420,手套箱右仓
-,BOOL,,真空检知（false:使用，true:忽略）,,coil,9350,真空检知
-,BOOL,,电解液添加模式（false:单次滴液，true:二次滴液）,,coil,9370,滴液模式
-,BOOL,,正极片称重（false:使用，true:忽略）,,coil,9380,正极片称重
-,BOOL,,正负极片组装方式（false:正装，true:倒装）,,coil,9390,正负极反装
-,BOOL,,压制清洁（false:使用，true:忽略）,,coil,9400,压制清洁
-,BOOL,,物料盘摆盘方式（false:水平摆盘，true:堆叠摆盘）,,coil,9410,负极片摆盘方式
-REG_MSG_BATTERY_CLEAN_IGNORE,BOOL,,忽略电池清洁（false:使用，true:忽略）,,coil,9460,

unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly_a.csv

@@ -1,64 +0,0 @@
-Name,DataType,InitValue,Comment,Attribute,DeviceType,Address,
-COIL_SYS_START_CMD,BOOL,,,,coil,8010,
-COIL_SYS_STOP_CMD,BOOL,,,,coil,8020,
-COIL_SYS_RESET_CMD,BOOL,,,,coil,8030,
-COIL_SYS_HAND_CMD,BOOL,,,,coil,8040,
-COIL_SYS_AUTO_CMD,BOOL,,,,coil,8050,
-COIL_SYS_INIT_CMD,BOOL,,,,coil,8060,
-COIL_UNILAB_SEND_MSG_SUCC_CMD,BOOL,,,,coil,8700,
-COIL_UNILAB_REC_MSG_SUCC_CMD,BOOL,,,,coil,8710,unilab_rec_msg_succ_cmd
-COIL_SYS_START_STATUS,BOOL,,,,coil,8210,
-COIL_SYS_STOP_STATUS,BOOL,,,,coil,8220,
-COIL_SYS_RESET_STATUS,BOOL,,,,coil,8230,
-COIL_SYS_HAND_STATUS,BOOL,,,,coil,8240,
-COIL_SYS_AUTO_STATUS,BOOL,,,,coil,8250,
-COIL_SYS_INIT_STATUS,BOOL,,,,coil,8260,
-COIL_REQUEST_REC_MSG_STATUS,BOOL,,,,coil,8500,
-COIL_REQUEST_SEND_MSG_STATUS,BOOL,,,,coil,8510,request_send_msg_status
-REG_MSG_ELECTROLYTE_USE_NUM,INT16,,,,hold_register,11000,
-REG_MSG_ELECTROLYTE_NUM,INT16,,,,hold_register,11002,unilab_send_msg_electrolyte_num
-REG_MSG_ELECTROLYTE_VOLUME,INT16,,,,hold_register,11004,unilab_send_msg_electrolyte_vol
-REG_MSG_ASSEMBLY_TYPE,INT16,,,,hold_register,11006,unilab_send_msg_assembly_type
-REG_MSG_ASSEMBLY_PRESSURE,INT16,,,,hold_register,11008,unilab_send_msg_assembly_pressure
-REG_DATA_ASSEMBLY_COIN_CELL_NUM,INT16,,,,hold_register,10000,data_assembly_coin_cell_num
-REG_DATA_OPEN_CIRCUIT_VOLTAGE,FLOAT32,,,,hold_register,10002,data_open_circuit_voltage
-REG_DATA_AXIS_X_POS,FLOAT32,,,,hold_register,10004,
-REG_DATA_AXIS_Y_POS,FLOAT32,,,,hold_register,10006,
-REG_DATA_AXIS_Z_POS,FLOAT32,,,,hold_register,10008,
-REG_DATA_POLE_WEIGHT,FLOAT32,,,,hold_register,10010,data_pole_weight
-REG_DATA_ASSEMBLY_PER_TIME,FLOAT32,,,,hold_register,10012,data_assembly_time
-REG_DATA_ASSEMBLY_PRESSURE,INT16,,,,hold_register,10014,data_assembly_pressure
-REG_DATA_ELECTROLYTE_VOLUME,INT16,,,,hold_register,10016,data_electrolyte_volume
-REG_DATA_COIN_NUM,INT16,,,,hold_register,10018,data_coin_num
-REG_DATA_ELECTROLYTE_CODE,STRING,,,,hold_register,10020,data_electrolyte_code()
-REG_DATA_COIN_CELL_CODE,STRING,,,,hold_register,10030,data_coin_cell_code()
-REG_DATA_STACK_VISON_CODE,STRING,,,,hold_register,12004,data_stack_vision_code()
-REG_DATA_GLOVE_BOX_PRESSURE,FLOAT32,,,,hold_register,10050,data_glove_box_pressure
-REG_DATA_GLOVE_BOX_WATER_CONTENT,FLOAT32,,,,hold_register,10052,data_glove_box_water_content
-REG_DATA_GLOVE_BOX_O2_CONTENT,FLOAT32,,,,hold_register,10054,data_glove_box_o2_content
-UNILAB_SEND_ELECTROLYTE_BOTTLE_NUM,BOOL,,,,coil,8720,
-UNILAB_RECE_ELECTROLYTE_BOTTLE_NUM,BOOL,,,,coil,8520,
-REG_MSG_ELECTROLYTE_NUM_USED,INT16,,,,hold_register,496,
-REG_DATA_ELECTROLYTE_USE_NUM,INT16,,,,hold_register,10000,
-UNILAB_SEND_FINISHED_CMD,BOOL,,,,coil,8730,
-UNILAB_RECE_FINISHED_CMD,BOOL,,,,coil,8530,
-REG_DATA_ASSEMBLY_TYPE,INT16,,,,hold_register,10018,ASSEMBLY_TYPE7or8
-COIL_ALUMINUM_FOIL,BOOL,,使用铝箔垫,,coil,8340,
-REG_MSG_NE_PLATE_MATRIX,INT16,,负极片矩阵点位,,hold_register,440,
-REG_MSG_SEPARATOR_PLATE_MATRIX,INT16,,隔膜矩阵点位,,hold_register,450,
-REG_MSG_TIP_BOX_MATRIX,INT16,,移液枪头矩阵点位,,hold_register,480,
-REG_MSG_NE_PLATE_NUM,INT16,,负极片盘数,,hold_register,443,
-REG_MSG_SEPARATOR_PLATE_NUM,INT16,,隔膜盘数,,hold_register,453,
-REG_MSG_PRESS_MODE,BOOL,,压制模式（false:压力检测模式，True:距离模式）,,coil,8360,电池压制模式
-,,,,,,,
-,BOOL,,视觉对位（false:使用，true:忽略）,,coil,8300,视觉对位
-,BOOL,,复检（false:使用，true:忽略）,,coil,8310,视觉复检
-,BOOL,,手套箱_左仓（false:使用，true:忽略）,,coil,8320,手套箱左仓
-,BOOL,,手套箱_右仓（false:使用，true:忽略）,,coil,8420,手套箱右仓
-,BOOL,,真空检知（false:使用，true:忽略）,,coil,8350,真空检知
-,BOOL,,电解液添加模式（false:单次滴液，true:二次滴液）,,coil,8370,滴液模式
-,BOOL,,正极片称重（false:使用，true:忽略）,,coil,8380,正极片称重
-,BOOL,,正负极片组装方式（false:正装，true:倒装）,,coil,8390,正负极反装
-,BOOL,,压制清洁（false:使用，true:忽略）,,coil,8400,压制清洁
-,BOOL,,物料盘摆盘方式（false:水平摆盘，true:堆叠摆盘）,,coil,8410,负极片摆盘方式
-REG_MSG_BATTERY_CLEAN_IGNORE,BOOL,,忽略电池清洁（false:使用，true:忽略）,,coil,8460,

unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly_b.csv

@@ -0,0 +1,130 @@
+Name,DataType,InitValue,Comment,Attribute,DeviceType,Address,
+COIL_SYS_START_CMD,BOOL,,,,coil,8010,
+COIL_SYS_STOP_CMD,BOOL,,,,coil,8020,
+COIL_SYS_RESET_CMD,BOOL,,,,coil,8030,
+COIL_SYS_HAND_CMD,BOOL,,,,coil,8040,
+COIL_SYS_AUTO_CMD,BOOL,,,,coil,8050,
+COIL_SYS_INIT_CMD,BOOL,,,,coil,8060,
+COIL_UNILAB_SEND_MSG_SUCC_CMD,BOOL,,,,coil,8700,
+COIL_UNILAB_REC_MSG_SUCC_CMD,BOOL,,,,coil,8710,unilab_rec_msg_succ_cmd
+COIL_SYS_START_STATUS,BOOL,,,,coil,8210,
+COIL_SYS_STOP_STATUS,BOOL,,,,coil,8220,
+COIL_SYS_RESET_STATUS,BOOL,,,,coil,8230,
+COIL_SYS_HAND_STATUS,BOOL,,,,coil,8240,
+COIL_SYS_AUTO_STATUS,BOOL,,,,coil,8250,
+COIL_SYS_INIT_STATUS,BOOL,,,,coil,8260,
+COIL_REQUEST_REC_MSG_STATUS,BOOL,,,,coil,8500,
+COIL_REQUEST_SEND_MSG_STATUS,BOOL,,,,coil,8510,request_send_msg_status
+REG_MSG_ELECTROLYTE_USE_NUM,INT16,,,,hold_register,11000,
+REG_MSG_ELECTROLYTE_NUM,INT16,,,,hold_register,11002,unilab_send_msg_electrolyte_num
+REG_MSG_ELECTROLYTE_VOLUME,INT16,,,,hold_register,11004,unilab_send_msg_electrolyte_vol
+REG_MSG_ASSEMBLY_TYPE,INT16,,,,hold_register,11006,unilab_send_msg_assembly_type
+REG_MSG_ASSEMBLY_PRESSURE,INT16,,,,hold_register,11008,unilab_send_msg_assembly_pressure
+REG_DATA_ASSEMBLY_COIN_CELL_NUM,INT16,,,,hold_register,10000,data_assembly_coin_cell_num
+REG_DATA_OPEN_CIRCUIT_VOLTAGE,FLOAT32,,,,hold_register,10002,data_open_circuit_voltage
+REG_DATA_AXIS_X_POS,FLOAT32,,,,hold_register,10004,
+REG_DATA_AXIS_Y_POS,FLOAT32,,,,hold_register,10006,
+REG_DATA_AXIS_Z_POS,FLOAT32,,,,hold_register,10008,
+REG_DATA_POLE_WEIGHT,FLOAT32,,,,hold_register,10010,data_pole_weight
+REG_DATA_ASSEMBLY_PER_TIME,FLOAT32,,,,hold_register,10012,data_assembly_time
+REG_DATA_ASSEMBLY_PRESSURE,INT16,,,,hold_register,10014,data_assembly_pressure
+REG_DATA_ELECTROLYTE_VOLUME,INT16,,,,hold_register,10016,data_electrolyte_volume
+REG_DATA_COIN_NUM,INT16,,,,hold_register,10018,data_coin_num
+REG_DATA_ELECTROLYTE_CODE,STRING,,,,hold_register,10020,data_electrolyte_code()
+REG_DATA_COIN_CELL_CODE,STRING,,,,hold_register,10030,data_coin_cell_code()
+REG_DATA_STACK_VISON_CODE,STRING,,,,hold_register,12004,data_stack_vision_code()
+REG_DATA_GLOVE_BOX_PRESSURE,FLOAT32,,,,hold_register,10050,data_glove_box_pressure
+REG_DATA_GLOVE_BOX_WATER_CONTENT,FLOAT32,,,,hold_register,10052,data_glove_box_water_content
+REG_DATA_GLOVE_BOX_O2_CONTENT,FLOAT32,,,,hold_register,10054,data_glove_box_o2_content
+UNILAB_SEND_ELECTROLYTE_BOTTLE_NUM,BOOL,,,,coil,8720,
+UNILAB_RECE_ELECTROLYTE_BOTTLE_NUM,BOOL,,,,coil,8520,
+REG_MSG_ELECTROLYTE_NUM_USED,INT16,,,,hold_register,496,
+REG_DATA_ELECTROLYTE_USE_NUM,INT16,,,,hold_register,10000,
+UNILAB_SEND_FINISHED_CMD,BOOL,,,,coil,8730,
+UNILAB_RECE_FINISHED_CMD,BOOL,,,,coil,8530,
+REG_DATA_ASSEMBLY_TYPE,INT16,,,,hold_register,10018,ASSEMBLY_TYPE7or8
+REG_UNILAB_INTERACT,BOOL,,,,coil,8450,
+,,,,,coil,8320,
+COIL_ALUMINUM_FOIL,BOOL,,,,coil,8340,
+REG_MSG_NE_PLATE_MATRIX,INT16,,,,hold_register,440,
+REG_MSG_SEPARATOR_PLATE_MATRIX,INT16,,,,hold_register,450,
+REG_MSG_TIP_BOX_MATRIX,INT16,,,,hold_register,480,
+REG_MSG_NE_PLATE_NUM,INT16,,,,hold_register,443,
+REG_MSG_SEPARATOR_PLATE_NUM,INT16,,,,hold_register,453,
+REG_MSG_PRESS_MODE,BOOL,,,,coil,8360,
+,BOOL,,,,coil,8300,
+,BOOL,,,,coil,8310,
+COIL_GB_L_IGNORE_CMD,BOOL,,,,coil,8320,
+COIL_GB_R_IGNORE_CMD,BOOL,,,,coil,8420,
+,BOOL,,,,coil,8350,
+COIL_ELECTROLYTE_DUAL_DROP_MODE,BOOL,,,,coil,8370,
+,BOOL,,,,coil,8380,
+,BOOL,,,,coil,8390,
+,BOOL,,,,coil,8400,
+,BOOL,,,,coil,8410,
+REG_MSG_DUAL_DROP_FIRST_VOLUME,INT16,,,,hold_register,4001,
+COIL_DUAL_DROP_SUCTION_TIMING,BOOL,,,,coil,8430,
+COIL_DUAL_DROP_START_TIMING,BOOL,,,,coil,8470,
+REG_MSG_BATTERY_CLEAN_IGNORE,BOOL,,,,coil,8460,
+COIL_ALARM_100_SYSTEM_ERROR,BOOL,,,,coil,1000,异常100-系统异常
+COIL_ALARM_101_EMERGENCY_STOP,BOOL,,,,coil,1010,异常101-急停
+COIL_ALARM_111_GLOVEBOX_EMERGENCY_STOP,BOOL,,,,coil,1110,异常111-手套箱急停
+COIL_ALARM_112_GLOVEBOX_GRATING_BLOCKED,BOOL,,,,coil,1120,异常112-手套箱内光栅遮挡
+COIL_ALARM_160_PIPETTE_TIP_SHORTAGE,BOOL,,,,coil,1600,异常160-移液枪头缺料
+COIL_ALARM_161_POSITIVE_SHELL_SHORTAGE,BOOL,,,,coil,1610,异常161-正极壳缺料
+COIL_ALARM_162_ALUMINUM_FOIL_SHORTAGE,BOOL,,,,coil,1620,异常162-铝箔垫缺料
+COIL_ALARM_163_POSITIVE_PLATE_SHORTAGE,BOOL,,,,coil,1630,异常163-正极片缺料
+COIL_ALARM_164_SEPARATOR_SHORTAGE,BOOL,,,,coil,1640,异常164-隔膜缺料
+COIL_ALARM_165_NEGATIVE_PLATE_SHORTAGE,BOOL,,,,coil,1650,异常165-负极片缺料
+COIL_ALARM_166_FLAT_WASHER_SHORTAGE,BOOL,,,,coil,1660,异常166-平垫缺料
+COIL_ALARM_167_SPRING_WASHER_SHORTAGE,BOOL,,,,coil,1670,异常167-弹垫缺料
+COIL_ALARM_168_NEGATIVE_SHELL_SHORTAGE,BOOL,,,,coil,1680,异常168-负极壳缺料
+COIL_ALARM_169_FINISHED_BATTERY_FULL,BOOL,,,,coil,1690,异常169-成品电池满料
+COIL_ALARM_201_SERVO_AXIS_01_ERROR,BOOL,,,,coil,2010,异常201-伺服轴01异常
+COIL_ALARM_202_SERVO_AXIS_02_ERROR,BOOL,,,,coil,2020,异常202-伺服轴02异常
+COIL_ALARM_203_SERVO_AXIS_03_ERROR,BOOL,,,,coil,2030,异常203-伺服轴03异常
+COIL_ALARM_204_SERVO_AXIS_04_ERROR,BOOL,,,,coil,2040,异常204-伺服轴04异常
+COIL_ALARM_205_SERVO_AXIS_05_ERROR,BOOL,,,,coil,2050,异常205-伺服轴05异常
+COIL_ALARM_206_SERVO_AXIS_06_ERROR,BOOL,,,,coil,2060,异常206-伺服轴06异常
+COIL_ALARM_207_SERVO_AXIS_07_ERROR,BOOL,,,,coil,2070,异常207-伺服轴07异常
+COIL_ALARM_208_SERVO_AXIS_08_ERROR,BOOL,,,,coil,2080,异常208-伺服轴08异常
+COIL_ALARM_209_SERVO_AXIS_09_ERROR,BOOL,,,,coil,2090,异常209-伺服轴09异常
+COIL_ALARM_210_SERVO_AXIS_10_ERROR,BOOL,,,,coil,2100,异常210-伺服轴10异常
+COIL_ALARM_211_SERVO_AXIS_11_ERROR,BOOL,,,,coil,2110,异常211-伺服轴11异常
+COIL_ALARM_212_SERVO_AXIS_12_ERROR,BOOL,,,,coil,2120,异常212-伺服轴12异常
+COIL_ALARM_213_SERVO_AXIS_13_ERROR,BOOL,,,,coil,2130,异常213-伺服轴13异常
+COIL_ALARM_214_SERVO_AXIS_14_ERROR,BOOL,,,,coil,2140,异常214-伺服轴14异常
+COIL_ALARM_250_OTHER_COMPONENT_ERROR,BOOL,,,,coil,2500,异常250-其他元件异常
+COIL_ALARM_251_PIPETTE_COMM_ERROR,BOOL,,,,coil,2510,异常251-移液枪通讯异常
+COIL_ALARM_252_PIPETTE_ALARM,BOOL,,,,coil,2520,异常252-移液枪报警
+COIL_ALARM_256_ELECTRIC_GRIPPER_ERROR,BOOL,,,,coil,2560,异常256-电爪异常
+COIL_ALARM_262_RB_UNKNOWN_POSITION_ERROR,BOOL,,,,coil,2620,异常262-RB报警：未知点位错误
+COIL_ALARM_263_RB_XYZ_PARAM_LIMIT_ERROR,BOOL,,,,coil,2630,异常263-RB报警：X、Y、Z参数超限制
+COIL_ALARM_264_RB_VISION_PARAM_ERROR,BOOL,,,,coil,2640,异常264-RB报警：视觉参数误差过大
+COIL_ALARM_265_RB_NOZZLE_1_PICK_FAIL,BOOL,,,,coil,2650,异常265-RB报警：1#吸嘴取料失败
+COIL_ALARM_266_RB_NOZZLE_2_PICK_FAIL,BOOL,,,,coil,2660,异常266-RB报警：2#吸嘴取料失败
+COIL_ALARM_267_RB_NOZZLE_3_PICK_FAIL,BOOL,,,,coil,2670,异常267-RB报警：3#吸嘴取料失败
+COIL_ALARM_268_RB_NOZZLE_4_PICK_FAIL,BOOL,,,,coil,2680,异常268-RB报警：4#吸嘴取料失败
+COIL_ALARM_269_RB_TRAY_PICK_FAIL,BOOL,,,,coil,2690,异常269-RB报警：取物料盘失败
+COIL_ALARM_280_RB_COLLISION_ERROR,BOOL,,,,coil,2800,异常280-RB碰撞异常
+COIL_ALARM_290_VISION_SYSTEM_COMM_ERROR,BOOL,,,,coil,2900,异常290-视觉系统通讯异常
+COIL_ALARM_291_VISION_ALIGNMENT_NG,BOOL,,,,coil,2910,异常291-视觉对位NG异常
+COIL_ALARM_292_BARCODE_SCANNER_COMM_ERROR,BOOL,,,,coil,2920,异常292-扫码枪通讯异常
+COIL_ALARM_310_OCV_TRANSFER_NOZZLE_SUCTION_ERROR,BOOL,,,,coil,3100,异常310-开电移载吸嘴吸真空异常
+COIL_ALARM_311_OCV_TRANSFER_NOZZLE_BREAK_ERROR,BOOL,,,,coil,3110,异常311-开电移载吸嘴破真空异常
+COIL_ALARM_312_WEIGHT_TRANSFER_NOZZLE_SUCTION_ERROR,BOOL,,,,coil,3120,异常312-称重移载吸嘴吸真空异常
+COIL_ALARM_313_WEIGHT_TRANSFER_NOZZLE_BREAK_ERROR,BOOL,,,,coil,3130,异常313-称重移载吸嘴破真空异常
+COIL_ALARM_340_OCV_NOZZLE_TRANSFER_CYLINDER_ERROR,BOOL,,,,coil,3400,异常340-开路电压吸嘴移载气缸异常
+COIL_ALARM_342_OCV_NOZZLE_LIFT_CYLINDER_ERROR,BOOL,,,,coil,3420,异常342-开路电压吸嘴升降气缸异常
+COIL_ALARM_344_OCV_CRIMPING_CYLINDER_ERROR,BOOL,,,,coil,3440,异常344-开路电压旋压气缸异常
+COIL_ALARM_350_WEIGHT_NOZZLE_TRANSFER_CYLINDER_ERROR,BOOL,,,,coil,3500,异常350-称重吸嘴移载气缸异常
+COIL_ALARM_352_WEIGHT_NOZZLE_LIFT_CYLINDER_ERROR,BOOL,,,,coil,3520,异常352-称重吸嘴升降气缸异常
+COIL_ALARM_354_CLEANING_CLOTH_TRANSFER_CYLINDER_ERROR,BOOL,,,,coil,3540,异常354-清洗无尘布移载气缸异常
+COIL_ALARM_356_CLEANING_CLOTH_PRESS_CYLINDER_ERROR,BOOL,,,,coil,3560,异常356-清洗无尘布压紧气缸异常
+COIL_ALARM_360_ELECTROLYTE_BOTTLE_POSITION_CYLINDER_ERROR,BOOL,,,,coil,3600,异常360-电解液瓶定位气缸异常
+COIL_ALARM_362_PIPETTE_TIP_BOX_POSITION_CYLINDER_ERROR,BOOL,,,,coil,3620,异常362-移液枪头盒定位气缸异常
+COIL_ALARM_364_REAGENT_BOTTLE_GRIPPER_LIFT_CYLINDER_ERROR,BOOL,,,,coil,3640,异常364-试剂瓶夹爪升降气缸异常
+COIL_ALARM_366_REAGENT_BOTTLE_GRIPPER_CYLINDER_ERROR,BOOL,,,,coil,3660,异常366-试剂瓶夹爪气缸异常
+COIL_ALARM_370_PRESS_MODULE_BLOW_CYLINDER_ERROR,BOOL,,,,coil,3700,异常370-压制模块吹气气缸异常
+COIL_ALARM_151_ELECTROLYTE_BOTTLE_POSITION_ERROR,BOOL,,,,coil,1510,异常151-电解液瓶定位在籍异常
+COIL_ALARM_152_ELECTROLYTE_BOTTLE_CAP_ERROR,BOOL,,,,coil,1520,异常152-电解液瓶盖在籍异常

unilabos/devices/workstation/coin_cell_assembly/date_20260110.csv

@@ -0,0 +1,6 @@
+Time,open_circuit_voltage,pole_weight,assembly_time,assembly_pressure,electrolyte_volume,coin_num,electrolyte_code,coin_cell_code
+20260110_153356,0.0,23.889999389648438,17.0,3609,40,7,deaoR,

+20260110_153640,3.430999994277954,23.719999313354492,162.0,3560,40,7,deaoR,

+20260110_162905,0.0,23.920000076293945,772.0,3625,30,7,LG600001,YS103130
+20260110_163526,3.430999994277954,24.010000228881836,234.0,3690,30,7,LG600001,YS102964
+20260110_164530,0.0,23.589998245239258,219.0,3690,30,7,LG600001,YS102857

unilabos/devices/workstation/coin_cell_assembly/电池资源冲突修复说明.md

@@ -0,0 +1,107 @@
+# 电池组装资源冲突问题修复说明
+
+## 问题描述
+
+在运行 `func_allpack_cmd` 函数时，遇到以下错误：
+
+```
+ValueError: Resource 'battery_0' already assigned to deck
+```
+
+**错误位置**：`coin_cell_assembly.py` 第 849 行
+```python
+liaopan3.children[self.coin_num_N].assign_child_resource(battery, location=None)
+```
+
+## 原因分析
+
+1. **资源名称冲突**：
+   - 每次创建电池资源使用固定格式 `battery_{coin_num_N}`
+   - 如果程序重启或断点恢复，`coin_num_N` 可能重置为 0
+   - Deck 上可能已存在 `battery_0` 等同名资源
+
+2. **缺少冲突处理**：
+   - 在分配资源前没有检查目标位置是否已有资源
+   - 没有清理机制来移除旧资源
+
+## 解决方案
+
+### 1. 使用时间戳确保资源名称唯一
+
+```python
+# 之前
+battery = ElectrodeSheet(name=f"battery_{self.coin_num_N}", ...)
+
+# 修复后
+timestamp_suffix = datetime.now().strftime("%Y%m%d_%H%M%S_%f")
+battery_name = f"battery_{self.coin_num_N}_{timestamp_suffix}"
+battery = ElectrodeSheet(name=battery_name, ...)
+```
+
+### 2. 添加资源冲突检查和清理
+
+```python
+# 检查目标位置是否已有资源
+target_slot = liaopan3.children[self.coin_num_N]
+if target_slot.children:
+    logger.warning(f"位置 {self.coin_num_N} 已有资源，将先卸载旧资源")
+    try:
+        # 卸载所有现有子资源
+        for child in list(target_slot.children):
+            target_slot.unassign_child_resource(child)
+            logger.info(f"已卸载旧资源: {child.name}")
+    except Exception as e:
+        logger.error(f"卸载旧资源时出错: {e}")
+```
+
+### 3. 增强错误处理
+
+```python
+# 分配新资源到目标位置
+try:
+    target_slot.assign_child_resource(battery, location=None)
+    logger.info(f"成功分配电池 {battery_name} 到位置 {self.coin_num_N}")
+except Exception as e:
+    logger.error(f"分配电池资源失败: {e}")
+    raise
+```
+
+## 修复效果
+
+✅ **不再出现重复资源名称错误**
+- 每个电池资源都有唯一的时间戳后缀
+- 即使 `coin_num_N` 相同，资源名称也不会冲突
+
+✅ **自动清理旧资源**
+- 在分配新资源前检查目标位置
+- 自动卸载已存在的旧资源
+
+✅ **增强日志记录**
+- 记录资源卸载操作
+- 记录资源分配成功/失败
+- 便于调试和问题追踪
+
+## 测试建议
+
+1. **正常运行测试**：
+   ```python
+   workstation.func_allpack_cmd(
+       elec_num=1, 
+       elec_use_num=1, 
+       elec_vol=20, 
+       file_path="..."
+   )
+   ```
+
+2. **断点恢复测试**：
+   - 运行一次后中断
+   - 再次运行相同参数
+   - 验证不会出现资源冲突错误
+
+3. **连续运行测试**：
+   - 连续多次运行
+   - 验证每次都能正常分配资源
+
+## 相关文件
+
+- `coin_cell_assembly.py` - 第 838-875 行（`func_pack_get_msg_cmd` 函数）

unilabos/registry/devices/bioyond_cell.yaml

@@ -32,7 +32,7 @@ bioyond_cell:
         feedback: {}
         goal: {}
         goal_default:
-          xlsx_path: /Users/sml/work/Unilab/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/material_template.xlsx
+          xlsx_path: D:/UniLab/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/material_template.xlsx
         handles: {}
         placeholder_keys: {}
         result: {}
@@ -42,323 +42,8 @@ bioyond_cell:
             feedback: {}
             goal:
               properties:
-                WH3_x1_y1_z3_1_materialId:
-                  default: ''
-                  type: string
-                WH3_x1_y1_z3_1_materialType:
-                  default: ''
-                  type: string
-                WH3_x1_y1_z3_1_quantity:
-                  default: 0
-                  type: number
-                WH3_x1_y2_z3_4_materialId:
-                  default: ''
-                  type: string
-                WH3_x1_y2_z3_4_materialType:
-                  default: ''
-                  type: string
-                WH3_x1_y2_z3_4_quantity:
-                  default: 0
-                  type: number
-                WH3_x1_y3_z3_7_materialId:
-                  default: ''
-                  type: string
-                WH3_x1_y3_z3_7_materialType:
-                  default: ''
-                  type: string
-                WH3_x1_y3_z3_7_quantity:
-                  default: 0
-                  type: number
-                WH3_x1_y4_z3_10_materialId:
-                  default: ''
-                  type: string
-                WH3_x1_y4_z3_10_materialType:
-                  default: ''
-                  type: string
-                WH3_x1_y4_z3_10_quantity:
-                  default: 0
-                  type: number
-                WH3_x1_y5_z3_13_materialId:
-                  default: ''
-                  type: string
-                WH3_x1_y5_z3_13_materialType:
-                  default: ''
-                  type: string
-                WH3_x1_y5_z3_13_quantity:
-                  default: 0
-                  type: number
-                WH3_x2_y1_z3_2_materialId:
-                  default: ''
-                  type: string
-                WH3_x2_y1_z3_2_materialType:
-                  default: ''
-                  type: string
-                WH3_x2_y1_z3_2_quantity:
-                  default: 0
-                  type: number
-                WH3_x2_y2_z3_5_materialId:
-                  default: ''
-                  type: string
-                WH3_x2_y2_z3_5_materialType:
-                  default: ''
-                  type: string
-                WH3_x2_y2_z3_5_quantity:
-                  default: 0
-                  type: number
-                WH3_x2_y3_z3_8_materialId:
-                  default: ''
-                  type: string
-                WH3_x2_y3_z3_8_materialType:
-                  default: ''
-                  type: string
-                WH3_x2_y3_z3_8_quantity:
-                  default: 0
-                  type: number
-                WH3_x2_y4_z3_11_materialId:
-                  default: ''
-                  type: string
-                WH3_x2_y4_z3_11_materialType:
-                  default: ''
-                  type: string
-                WH3_x2_y4_z3_11_quantity:
-                  default: 0
-                  type: number
-                WH3_x2_y5_z3_14_materialId:
-                  default: ''
-                  type: string
-                WH3_x2_y5_z3_14_materialType:
-                  default: ''
-                  type: string
-                WH3_x2_y5_z3_14_quantity:
-                  default: 0
-                  type: number
-                WH3_x3_y1_z3_3_materialId:
-                  default: ''
-                  type: string
-                WH3_x3_y1_z3_3_materialType:
-                  default: ''
-                  type: string
-                WH3_x3_y1_z3_3_quantity:
-                  default: 0
-                  type: number
-                WH3_x3_y2_z3_6_materialId:
-                  default: ''
-                  type: string
-                WH3_x3_y2_z3_6_materialType:
-                  default: ''
-                  type: string
-                WH3_x3_y2_z3_6_quantity:
-                  default: 0
-                  type: number
-                WH3_x3_y3_z3_9_materialId:
-                  default: ''
-                  type: string
-                WH3_x3_y3_z3_9_materialType:
-                  default: ''
-                  type: string
-                WH3_x3_y3_z3_9_quantity:
-                  default: 0
-                  type: number
-                WH3_x3_y4_z3_12_materialId:
-                  default: ''
-                  type: string
-                WH3_x3_y4_z3_12_materialType:
-                  default: ''
-                  type: string
-                WH3_x3_y4_z3_12_quantity:
-                  default: 0
-                  type: number
-                WH3_x3_y5_z3_15_materialId:
-                  default: ''
-                  type: string
-                WH3_x3_y5_z3_15_materialType:
-                  default: ''
-                  type: string
-                WH3_x3_y5_z3_15_quantity:
-                  default: 0
-                  type: number
-                WH4_x1_y1_z1_1_materialName:
-                  default: ''
-                  type: string
-                WH4_x1_y1_z1_1_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x1_y1_z2_1_materialName:
-                  default: ''
-                  type: string
-                WH4_x1_y1_z2_1_materialType:
-                  default: ''
-                  type: string
-                WH4_x1_y1_z2_1_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x1_y1_z2_1_targetWH:
-                  default: ''
-                  type: string
-                WH4_x1_y2_z1_6_materialName:
-                  default: ''
-                  type: string
-                WH4_x1_y2_z1_6_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x1_y2_z2_4_materialName:
-                  default: ''
-                  type: string
-                WH4_x1_y2_z2_4_materialType:
-                  default: ''
-                  type: string
-                WH4_x1_y2_z2_4_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x1_y2_z2_4_targetWH:
-                  default: ''
-                  type: string
-                WH4_x1_y3_z1_11_materialName:
-                  default: ''
-                  type: string
-                WH4_x1_y3_z1_11_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x1_y3_z2_7_materialName:
-                  default: ''
-                  type: string
-                WH4_x1_y3_z2_7_materialType:
-                  default: ''
-                  type: string
-                WH4_x1_y3_z2_7_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x1_y3_z2_7_targetWH:
-                  default: ''
-                  type: string
-                WH4_x2_y1_z1_2_materialName:
-                  default: ''
-                  type: string
-                WH4_x2_y1_z1_2_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x2_y1_z2_2_materialName:
-                  default: ''
-                  type: string
-                WH4_x2_y1_z2_2_materialType:
-                  default: ''
-                  type: string
-                WH4_x2_y1_z2_2_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x2_y1_z2_2_targetWH:
-                  default: ''
-                  type: string
-                WH4_x2_y2_z1_7_materialName:
-                  default: ''
-                  type: string
-                WH4_x2_y2_z1_7_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x2_y2_z2_5_materialName:
-                  default: ''
-                  type: string
-                WH4_x2_y2_z2_5_materialType:
-                  default: ''
-                  type: string
-                WH4_x2_y2_z2_5_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x2_y2_z2_5_targetWH:
-                  default: ''
-                  type: string
-                WH4_x2_y3_z1_12_materialName:
-                  default: ''
-                  type: string
-                WH4_x2_y3_z1_12_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x2_y3_z2_8_materialName:
-                  default: ''
-                  type: string
-                WH4_x2_y3_z2_8_materialType:
-                  default: ''
-                  type: string
-                WH4_x2_y3_z2_8_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x2_y3_z2_8_targetWH:
-                  default: ''
-                  type: string
-                WH4_x3_y1_z1_3_materialName:
-                  default: ''
-                  type: string
-                WH4_x3_y1_z1_3_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x3_y1_z2_3_materialName:
-                  default: ''
-                  type: string
-                WH4_x3_y1_z2_3_materialType:
-                  default: ''
-                  type: string
-                WH4_x3_y1_z2_3_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x3_y1_z2_3_targetWH:
-                  default: ''
-                  type: string
-                WH4_x3_y2_z1_8_materialName:
-                  default: ''
-                  type: string
-                WH4_x3_y2_z1_8_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x3_y2_z2_6_materialName:
-                  default: ''
-                  type: string
-                WH4_x3_y2_z2_6_materialType:
-                  default: ''
-                  type: string
-                WH4_x3_y2_z2_6_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x3_y2_z2_6_targetWH:
-                  default: ''
-                  type: string
-                WH4_x3_y3_z2_9_materialName:
-                  default: ''
-                  type: string
-                WH4_x3_y3_z2_9_materialType:
-                  default: ''
-                  type: string
-                WH4_x3_y3_z2_9_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x3_y3_z2_9_targetWH:
-                  default: ''
-                  type: string
-                WH4_x4_y1_z1_4_materialName:
-                  default: ''
-                  type: string
-                WH4_x4_y1_z1_4_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x4_y2_z1_9_materialName:
-                  default: ''
-                  type: string
-                WH4_x4_y2_z1_9_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x5_y1_z1_5_materialName:
-                  default: ''
-                  type: string
-                WH4_x5_y1_z1_5_quantity:
-                  default: 0.0
-                  type: number
-                WH4_x5_y2_z1_10_materialName:
-                  default: ''
-                  type: string
-                WH4_x5_y2_z1_10_quantity:
-                  default: 0.0
-                  type: number
                 xlsx_path:
-                  default: /Users/sml/work/Unilab/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/material_template.xlsx
+                  default: D:/UniLab/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/2025122301.xlsx
                   type: string
               required: []
               type: object
@@ -466,7 +151,14 @@ bioyond_cell:
         goal: {}
         goal_default:
           xlsx_path: null
-        handles: {}
+        handles:
+          output:
+          - data_key: total_orders
+            data_source: executor
+            data_type: integer
+            handler_key: bottle_count
+            io_type: sink
+            label: 配液瓶数
         placeholder_keys: {}
         result: {}
         schema:
@@ -486,6 +178,38 @@ bioyond_cell:
           title: create_orders参数
           type: object
         type: UniLabJsonCommand
+      auto-create_orders_v2:
+        feedback: {}
+        goal: {}
+        goal_default:
+          xlsx_path: null
+        handles:
+          output:
+          - data_key: total_orders
+            data_source: executor
+            data_type: integer
+            handler_key: bottle_count
+            io_type: sink
+            label: 配液瓶数
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: 从Excel解析并创建实验（V2版本）
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                xlsx_path:
+                  type: string
+              required:
+              - xlsx_path
+              type: object
+            result: {}
+          required:
+          - goal
+          title: create_orders_v2参数
+          type: object
+        type: UniLabJsonCommand
       auto-create_sample:
         feedback: {}
         goal: {}
@@ -779,6 +503,31 @@ bioyond_cell:
           title: scheduler_start参数
           type: object
         type: UniLabJsonCommand
+      auto-scheduler_start_and_auto_feeding:
+        feedback: {}
+        goal: {}
+        goal_default:
+          xlsx_path: D:/UniLab/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/material_template.xlsx
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: 组合函数:先启动调度,然后执行自动化上料
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                xlsx_path:
+                  default: D:/UniLab/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/material_template.xlsx
+                  type: string
+              required: []
+              type: object
+            result: {}
+          required:
+          - goal
+          title: scheduler_start_and_auto_feeding参数
+          type: object
+        type: UniLabJsonCommand
       auto-scheduler_stop:
         feedback: {}
         goal: {}
@@ -877,6 +626,47 @@ bioyond_cell:
           title: transfer_1_to_2参数
           type: object
         type: UniLabJsonCommand
+      auto-transfer_3_to_2:
+        feedback: {}
+        goal: {}
+        goal_default:
+          source_wh_id: 3a19debc-84b4-0359-e2d4-b3beea49348b
+          source_x: 1
+          source_y: 1
+          source_z: 1
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: 3-2 物料转运，从3号位置转运到2号位置
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                source_wh_id:
+                  default: 3a19debc-84b4-0359-e2d4-b3beea49348b
+                  description: 来源仓库ID
+                  type: string
+                source_x:
+                  default: 1
+                  description: 来源位置X坐标
+                  type: integer
+                source_y:
+                  default: 1
+                  description: 来源位置Y坐标
+                  type: integer
+                source_z:
+                  default: 1
+                  description: 来源位置Z坐标
+                  type: integer
+              required: []
+              type: object
+            result: {}
+          required:
+          - goal
+          title: transfer_3_to_2参数
+          type: object
+        type: UniLabJsonCommand
       auto-transfer_3_to_2_to_1:
         feedback: {}
         goal: {}

unilabos/registry/devices/coin_cell_workstation.yaml

@@ -115,6 +115,117 @@ coincellassemblyworkstation_device:
           title: func_allpack_cmd参数
           type: object
         type: UniLabJsonCommand
+      auto-func_allpack_cmd_simp:
+        feedback: {}
+        goal: {}
+        goal_default:
+          assembly_pressure: 4200
+          assembly_type: 7
+          battery_clean_ignore: false
+          battery_pressure_mode: true
+          dual_drop_first_volume: 25
+          dual_drop_mode: false
+          dual_drop_start_timing: false
+          dual_drop_suction_timing: false
+          elec_num: null
+          elec_use_num: null
+          elec_vol: 50
+          file_path: /Users/sml/work
+          fujipian_juzhendianwei: 0
+          fujipian_panshu: 0
+          gemo_juzhendianwei: 0
+          gemopanshu: 0
+          lvbodian: true
+          qiangtou_juzhendianwei: 0
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: 简化版电池组装函数，整合了参数设置和双滴模式
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                assembly_pressure:
+                  default: 4200
+                  description: 电池压制力(N)
+                  type: integer
+                assembly_type:
+                  default: 7
+                  description: 组装类型(7=不用铝箔垫, 8=使用铝箔垫)
+                  type: integer
+                battery_clean_ignore:
+                  default: false
+                  description: 是否忽略电池清洁步骤
+                  type: boolean
+                battery_pressure_mode:
+                  default: true
+                  description: 是否启用压力模式
+                  type: boolean
+                dual_drop_first_volume:
+                  default: 25
+                  description: 二次滴液第一次排液体积(μL)
+                  type: integer
+                dual_drop_mode:
+                  default: false
+                  description: 电解液添加模式(false=单次滴液, true=二次滴液)
+                  type: boolean
+                dual_drop_start_timing:
+                  default: false
+                  description: 二次滴液开始滴液时机(false=正极片前, true=正极片后)
+                  type: boolean
+                dual_drop_suction_timing:
+                  default: false
+                  description: 二次滴液吸液时机(false=正常吸液, true=先吸液)
+                  type: boolean
+                elec_num:
+                  description: 电解液瓶数
+                  type: string
+                elec_use_num:
+                  description: 每瓶电解液组装电池数
+                  type: string
+                elec_vol:
+                  default: 50
+                  description: 电解液吸液量(μL)
+                  type: integer
+                file_path:
+                  default: /Users/sml/work
+                  description: 实验记录保存路径
+                  type: string
+                fujipian_juzhendianwei:
+                  default: 0
+                  description: 负极片矩阵点位。盘位置从1开始计数，有效范围：1-8, 13-20 (写入值比实际位置少1，例如：写0取盘位1，写1取盘位2)
+                  type: integer
+                fujipian_panshu:
+                  default: 0
+                  description: 负极片盘数
+                  type: integer
+                gemo_juzhendianwei:
+                  default: 0
+                  description: 隔膜矩阵点位。盘位置从1开始计数，有效范围：1-8, 13-20 (写入值比实际位置少1，例如：写0取盘位1，写1取盘位2)
+                  type: integer
+                gemopanshu:
+                  default: 0
+                  description: 隔膜盘数
+                  type: integer
+                lvbodian:
+                  default: true
+                  description: 是否使用铝箔垫片
+                  type: boolean
+                qiangtou_juzhendianwei:
+                  default: 0
+                  description: 枪头盒矩阵点位。盘位置从1开始计数，有效范围：1-32, 64-96 (写入值比实际位置少1，例如：写0取盘位1，写1取盘位2)
+                  type: integer
+              required:
+              - elec_num
+              - elec_use_num
+              type: object
+            result: {}
+          required:
+          - goal
+          title: func_allpack_cmd_simp参数
+          type: object
+        type: UniLabJsonCommand
       auto-func_get_csv_export_status:
         feedback: {}
         goal: {}
@@ -178,6 +289,27 @@ coincellassemblyworkstation_device:
           title: func_pack_device_init参数
           type: object
         type: UniLabJsonCommand
+      auto-func_pack_device_init_auto_start_combined:
+        feedback: {}
+        goal: {}
+        goal_default: {}
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: 组合函数:设备初始化 + 切换自动模式 + 启动
+          properties:
+            feedback: {}
+            goal:
+              properties: {}
+              required: []
+              type: object
+            result: {}
+          required:
+          - goal
+          title: func_pack_device_init_auto_start_combined参数
+          type: object
+        type: UniLabJsonCommand
       auto-func_pack_device_start:
         feedback: {}
         goal: {}
@@ -250,7 +382,15 @@ coincellassemblyworkstation_device:
         goal: {}
         goal_default:
           bottle_num: null
-        handles: {}
+        handles:
+          input:
+          - data_key: bottle_num
+            data_source: workflow
+            data_type: integer
+            handler_key: bottle_count
+            io_type: source
+            label: 配液瓶数
+            required: true
         placeholder_keys: {}
         result: {}
         schema:
@@ -260,7 +400,7 @@ coincellassemblyworkstation_device:
             goal:
               properties:
                 bottle_num:
-                  type: string
+                  type: integer
               required:
               - bottle_num
               type: object
@@ -353,6 +493,125 @@ coincellassemblyworkstation_device:
           title: func_read_data_and_output参数
           type: object
         type: UniLabJsonCommand
+      auto-func_sendbottle_allpack_multi:
+        feedback: {}
+        goal: {}
+        goal_default:
+          assembly_pressure: 4200
+          assembly_type: 7
+          battery_clean_ignore: false
+          battery_pressure_mode: true
+          dual_drop_first_volume: 25
+          dual_drop_mode: false
+          dual_drop_start_timing: false
+          dual_drop_suction_timing: false
+          elec_num: null
+          elec_use_num: null
+          elec_vol: 50
+          file_path: /Users/sml/work
+          fujipian_juzhendianwei: 0
+          fujipian_panshu: 0
+          gemo_juzhendianwei: 0
+          gemopanshu: 0
+          lvbodian: true
+          qiangtou_juzhendianwei: 0
+        handles:
+          input:
+          - data_key: elec_num
+            data_source: workflow
+            data_type: integer
+            handler_key: bottle_count
+            io_type: source
+            label: 配液瓶数
+            required: true
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: 发送瓶数+简化组装函数(适用于第二批次及后续批次)，合并了发送瓶数和简化组装流程
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                assembly_pressure:
+                  default: 4200
+                  description: 电池压制力(N)
+                  type: integer
+                assembly_type:
+                  default: 7
+                  description: 组装类型(7=不用铝箔垫, 8=使用铝箔垫)
+                  type: integer
+                battery_clean_ignore:
+                  default: false
+                  description: 是否忽略电池清洁步骤
+                  type: boolean
+                battery_pressure_mode:
+                  default: true
+                  description: 是否启用压力模式
+                  type: boolean
+                dual_drop_first_volume:
+                  default: 25
+                  description: 二次滴液第一次排液体积(μL)
+                  type: integer
+                dual_drop_mode:
+                  default: false
+                  description: 电解液添加模式(false=单次滴液, true=二次滴液)
+                  type: boolean
+                dual_drop_start_timing:
+                  default: false
+                  description: 二次滴液开始滴液时机(false=正极片前, true=正极片后)
+                  type: boolean
+                dual_drop_suction_timing:
+                  default: false
+                  description: 二次滴液吸液时机(false=正常吸液, true=先吸液)
+                  type: boolean
+                elec_num:
+                  description: 电解液瓶数，如果在workflow中已通过handles连接上游(create_orders的bottle_count输出)，则此参数会自动从上游获取，无需手动填写；如果单独使用此函数(没有上游连接)，则必须手动填写电解液瓶数
+                  type: string
+                elec_use_num:
+                  description: 每瓶电解液组装电池数
+                  type: string
+                elec_vol:
+                  default: 50
+                  description: 电解液吸液量(μL)
+                  type: integer
+                file_path:
+                  default: /Users/sml/work
+                  description: 实验记录保存路径
+                  type: string
+                fujipian_juzhendianwei:
+                  default: 0
+                  description: 负极片矩阵点位。盘位置从1开始计数，有效范围：1-8, 13-20 (写入值比实际位置少1，例如：写0取盘位1，写1取盘位2)
+                  type: integer
+                fujipian_panshu:
+                  default: 0
+                  description: 负极片盘数
+                  type: integer
+                gemo_juzhendianwei:
+                  default: 0
+                  description: 隔膜矩阵点位。盘位置从1开始计数，有效范围：1-8, 13-20 (写入值比实际位置少1，例如：写0取盘位1，写1取盘位2)
+                  type: integer
+                gemopanshu:
+                  default: 0
+                  description: 隔膜盘数
+                  type: integer
+                lvbodian:
+                  default: true
+                  description: 是否使用铝箔垫片
+                  type: boolean
+                qiangtou_juzhendianwei:
+                  default: 0
+                  description: 枪头盒矩阵点位。盘位置从1开始计数，有效范围：1-32, 64-96 (写入值比实际位置少1，例如：写0取盘位1，写1取盘位2)
+                  type: integer
+              required:
+              - elec_num
+              - elec_use_num
+              type: object
+            result: {}
+          required:
+          - goal
+          title: func_sendbottle_allpack_multi参数
+          type: object
+        type: UniLabJsonCommand
       auto-func_stop_read_data:
         feedback: {}
         goal: {}

unilabos/registry/resources/bioyond/deck.yaml

@@ -22,7 +22,7 @@ BIOYOND_PolymerReactionStation_Deck:
   init_param_schema: {}
   registry_type: resource
   version: 1.0.0
-YB_Deck11:
+BIOYOND_YB_Deck:
   category:
   - deck
   class:
@@ -34,3 +34,15 @@ YB_Deck11:
   init_param_schema: {}
   registry_type: resource
   version: 1.0.0
+CoincellDeck:
+  category:
+  - deck
+  class:
+    module: unilabos.devices.workstation.coin_cell_assembly.YB_YH_materials:YH_Deck
+    type: pylabrobot
+  description: BIOYOND PolymerReactionStation Deck
+  handles: []
+  icon: koudian.webp
+  init_param_schema: {}
+  registry_type: resource
+  version: 1.0.0

unilabos/resources/battery/electrode_sheet.py

@@ -16,9 +16,12 @@ electrode_colors = {
 }
 
 class ElectrodeSheetState(TypedDict):
+    diameter: float  # 直径 (mm)
+    thickness: float  # 厚度 (mm)
     mass: float  # 质量 (g)
     material_type: str  # 材料类型（铜、铝、不锈钢、弹簧钢等）
     color: str  # 材料类型对应的颜色
+    info: Optional[str]  # 附加信息
 
 
 class ElectrodeSheet(ResourcePLR):
@@ -27,18 +30,23 @@ class ElectrodeSheet(ResourcePLR):
     def __init__(
         self,
         name: str = "极片",
-        size_x=10,
-        size_y=10,
-        size_z=10,
+        size_x: float = 10,
+        size_y: float = 10,
+        size_z: float = 10,
         category: str = "electrode_sheet",
         model: Optional[str] = None,
+        **kwargs
     ):
         """初始化极片
 
         Args:
             name: 极片名称
+            size_x: 长度 (mm)
+            size_y: 宽度 (mm)
+            size_z: 高度 (mm)
             category: 类别
             model: 型号
+            **kwargs: 其他参数传递给父类
         """
         super().__init__(
             name=name,
@@ -47,12 +55,14 @@ class ElectrodeSheet(ResourcePLR):
             size_z=size_z,
             category=category,
             model=model,
+            **kwargs
         )
         self._unilabos_state: ElectrodeSheetState = ElectrodeSheetState(
             diameter=14,
             thickness=0.1,
             mass=0.5,
             material_type="copper",
+            color="#8b4513",
             info=None
         )
 
@@ -72,7 +82,7 @@ class ElectrodeSheet(ResourcePLR):
 def PositiveCan(name: str) -> ElectrodeSheet:
     """创建正极壳"""
     sheet = ElectrodeSheet(name=name, size_x=12, size_y=12, size_z=3.0, model="PositiveCan")
-    sheet.load_state({"material_type": "aluminum", "color": electrode_colors["PositiveCan"]})
+    sheet.load_state({"diameter": 20.0, "thickness": 0.5, "mass": 0.5, "material_type": "aluminum", "color": electrode_colors["PositiveCan"], "info": None})
     return sheet
 
 
@@ -135,18 +145,23 @@ class Battery(Container):
     def __init__(
         self,
         name: str = "电池",
-        size_x=12,
-        size_y=12,
-        size_z=6,
+        size_x: float = 12,
+        size_y: float = 12,
+        size_z: float = 6,
         category: str = "battery",
         model: Optional[str] = None,
+        **kwargs
     ):
         """初始化电池
 
         Args:
             name: 电池名称
+            size_x: 长度 (mm)
+            size_y: 宽度 (mm)
+            size_z: 高度 (mm)
             category: 类别
             model: 型号
+            **kwargs: 其他参数传递给父类
         """
         super().__init__(
             name=name,
@@ -155,6 +170,7 @@ class Battery(Container):
             size_z=size_z,
             category=category,
             model=model,
+            **kwargs
         )
         self._unilabos_state: BatteryState = BatteryState(
             color=electrode_colors["Battery"],

unilabos/resources/bioyond/README_WAREHOUSE.md

@@ -0,0 +1,548 @@
+# Bioyond 仓库系统开发指南
+
+本文档详细说明 Bioyond 仓库（Warehouse）系统的架构、配置和使用方法，帮助开发者快速理解和维护仓库相关代码。
+
+## 📚 目录
+
+- [系统架构](#系统架构)
+- [核心概念](#核心概念)
+- [三层映射关系](#三层映射关系)
+- [warehouse_factory 详解](#warehouse_factory-详解)
+- [创建新仓库](#创建新仓库)
+- [常见问题](#常见问题)
+- [调试技巧](#调试技巧)
+
+---
+
+## 系统架构
+
+Bioyond 仓库系统采用**三层架构**，实现从前端显示到后端 API 的完整映射：
+
+```
+┌─────────────────────────────────────────────────────────┐
+│  前端显示层 (YB_warehouses.py)                          │
+│  - warehouse_factory 自动生成库位网格                   │
+│  - 生成库位名称：A01, B02, C03...                       │
+│  - 存储在 WareHouse.sites 字典中                        │
+└────────────────┬────────────────────────────────────────┘
+                 │
+                 ▼
+┌─────────────────────────────────────────────────────────┐
+│  Deck 布局层 (decks.py)                                 │
+│  - 定义仓库在 Deck 上的物理位置                         │
+│  - 组织多个仓库形成完整布局                             │
+└────────────────┬────────────────────────────────────────┘
+                 │
+                 ▼
+┌─────────────────────────────────────────────────────────┐
+│  UUID 映射层 (config.py)                                │
+│  - 将库位名称映射到 Bioyond 系统 UUID                   │
+│  - 用于 API 调用时的物料入库操作                        │
+└─────────────────────────────────────────────────────────┘
+```
+
+---
+
+## 核心概念
+
+### 仓库（Warehouse）
+
+仓库是一个**三维网格**，用于存放物料。由以下参数定义：
+
+- **num_items_x**: 列数（X 轴）
+- **num_items_y**: 行数（Y 轴）  
+- **num_items_z**: 层数（Z 轴）
+
+例如：`5行×3列×1层` = 5×3×1 = 15个库位
+
+### 库位（Site）
+
+库位是仓库中的单个存储位置，由**字母行+数字列**命名：
+
+- **字母行**：A, B, C, D, E, F...（对应 Y 轴）
+- **数字列**：01, 02, 03, 04...（对应 X 轴或 Z 轴）
+
+示例：`A01`, `B02`, `C03`
+
+### 布局模式（Layout）
+
+控制库位的排序和 Y 坐标计算：
+
+| 模式 | 说明 | 生成顺序 | Y 坐标计算 | 显示效果 |
+|------|------|----------|-----------|---------|
+| `col-major` | 列优先（默认） | A01, B01, C01, A02... | `dy + (num_y - row - 1) * item_dy` | A 可能在下 |
+| `row-major` | 行优先 | A01, A02, A03, B01... | `dy + row * item_dy` | **A 在上** ✓ |
+
+**重要：** 使用 `row-major` 可以避免上下颠倒问题！
+
+---
+
+## 三层映射关系
+
+### 示例：手动传递窗右（A01-E03）
+
+#### 1️⃣ 前端显示层 - [`YB_warehouses.py`](YB_warehouses.py)
+
+```python
+def bioyond_warehouse_5x3x1(name: str, row_offset: int = 0) -> WareHouse:
+    """创建 5行×3列×1层 仓库"""
+    return warehouse_factory(
+        name=name,
+        num_items_x=3,      # 3列
+        num_items_y=5,      # 5行
+        num_items_z=1,      # 1层
+        row_offset=row_offset,
+        layout="row-major",
+    )
+```
+
+**自动生成的库位：** A01, A02, A03, B01, B02, B03, ..., E01, E02, E03
+
+#### 2️⃣ Deck 布局层 - [`decks.py`](decks.py)
+
+```python
+self.warehouses = {
+    "手动传递窗右": bioyond_warehouse_5x3x1("手动传递窗右", row_offset=0),
+}
+self.warehouse_locations = {
+    "手动传递窗右": Coordinate(4160.0, 877.0, 0.0),
+}
+```
+
+**作用：** 
+- 创建仓库实例
+- 设置在 Deck 上的物理坐标
+
+#### 3️⃣ UUID 映射层 - [`config.py`](../../devices/workstation/bioyond_studio/config.py)
+
+```python
+WAREHOUSE_MAPPING = {
+    "手动传递窗右": {
+        "uuid": "",
+        "site_uuids": {
+            "A01": "3a19deae-2c7a-36f5-5e41-02c5b66feaea",
+            "A02": "3a19deae-2c7a-dc6d-c41e-ef285d946cfe",
+            # ... 其他库位
+        }
+    }
+}
+```
+
+**作用：**
+- 用户拖拽物料到"手动传递窗右"的"A01"位置时
+- 系统查找 `WAREHOUSE_MAPPING["手动传递窗右"]["site_uuids"]["A01"]`
+- 获取 UUID `"3a19deae-2c7a-36f5-5e41-02c5b66feaea"`
+- 调用 Bioyond API 将物料入库到该 UUID 位置
+
+---
+
+## 实际配置案例
+
+### 案例：手动传递窗左/右的完整配置
+
+本案例展示如何为"手动传递窗右"和"手动传递窗左"建立完整的三层映射。
+
+#### 背景需求
+- **手动传递窗右**: 需要 A01-E03（5行×3列=15个库位）
+- **手动传递窗左**: 需要 F01-J03（5行×3列=15个库位）
+- 这两个仓库共享同一个物理堆栈的 UUID（"手动堆栈"）
+
+#### 实施步骤
+
+**1️⃣ 修复前端布局** - [`YB_warehouses.py`](YB_warehouses.py)
+
+```python
+# 创建新的 5×3×1 仓库函数（之前是错误的 1×3×3）
+def bioyond_warehouse_5x3x1(name: str, row_offset: int = 0) -> WareHouse:
+    """创建5行×3列×1层仓库，支持行偏移生成不同字母行"""
+    return warehouse_factory(
+        name=name,
+        num_items_x=3,      # 3列
+        num_items_y=5,      # 5行  ← 修正
+        num_items_z=1,      # 1层  ← 修正
+        row_offset=row_offset,  # ← 支持 F-J 行
+        layout="row-major",     # ← 避免上下颠倒
+    )
+```
+
+**2️⃣ 更新 Deck 配置** - [`decks.py`](decks.py)
+
+```python
+from unilabos.resources.bioyond.YB_warehouses import (
+    bioyond_warehouse_5x3x1,  # 新增导入
+)
+
+class BIOYOND_YB_Deck(Deck):
+    def setup(self) -> None:
+        self.warehouses = {
+            # 修改前: bioyond_warehouse_1x3x3 (错误尺寸)
+            # 修改后: bioyond_warehouse_5x3x1 (正确尺寸)
+            "手动传递窗右": bioyond_warehouse_5x3x1("手动传递窗右", row_offset=0),  # A01-E03
+            "手动传递窗左": bioyond_warehouse_5x3x1("手动传递窗左", row_offset=5),  # F01-J03
+        }
+```
+
+**3️⃣ 添加 UUID 映射** - [`config.py`](../../devices/workstation/bioyond_studio/config.py)
+
+```python
+WAREHOUSE_MAPPING = {
+    # 保持原有的"手动堆栈"配置不变（A01-J03共30个库位）
+    "手动堆栈": {
+        "uuid": "",
+        "site_uuids": {
+            "A01": "3a19deae-2c7a-36f5-5e41-02c5b66feaea",
+            # ... A02-E03 共15个
+            "F01": "3a19deae-2c7a-d594-fd6a-0d20de3c7c4a",
+            # ... F02-J03 共15个
+        }
+    },
+    
+    # [新增] 手动传递窗右 - 复用"手动堆栈"的 A01-E03 UUID
+    "手动传递窗右": {
+        "uuid": "",
+        "site_uuids": {
+            "A01": "3a19deae-2c7a-36f5-5e41-02c5b66feaea",  # ← 与手动堆栈A01相同
+            "A02": "3a19deae-2c7a-dc6d-c41e-ef285d946cfe",
+            "A03": "3a19deae-2c7a-5876-c454-6b7e224ca927",
+            "B01": "3a19deae-2c7a-2426-6d71-e9de3cb158b1",
+            "B02": "3a19deae-2c7a-79b0-5e44-efaafd1e4cf3",
+            "B03": "3a19deae-2c7a-b9eb-f4e3-e308e0cf839a",
+            "C01": "3a19deae-2c7a-32bc-768e-556647e292f3",
+            "C02": "3a19deae-2c7a-e97a-8484-f5a4599447c4",
+            "C03": "3a19deae-2c7a-3056-6504-10dc73fbc276",
+            "D01": "3a19deae-2c7a-ffad-875e-8c4cda61d440",
+            "D02": "3a19deae-2c7a-61be-601c-b6fb5610499a",
+            "D03": "3a19deae-2c7a-c0f7-05a7-e3fe2491e560",
+            "E01": "3a19deae-2c7a-a6f4-edd1-b436a7576363",
+            "E02": "3a19deae-2c7a-4367-96dd-1ca2186f4910",
+            "E03": "3a19deae-2c7a-b163-2219-23df15200311",
+        }
+    },
+    
+    # [新增] 手动传递窗左 - 复用"手动堆栈"的 F01-J03 UUID
+    "手动传递窗左": {
+        "uuid": "",
+        "site_uuids": {
+            "F01": "3a19deae-2c7a-d594-fd6a-0d20de3c7c4a",  # ← 与手动堆栈F01相同
+            "F02": "3a19deae-2c7a-a194-ea63-8b342b8d8679",
+            "F03": "3a19deae-2c7a-f7c4-12bd-425799425698",
+            "G01": "3a19deae-2c7a-0b56-72f1-8ab86e53b955",
+            "G02": "3a19deae-2c7a-204e-95ed-1f1950f28343",
+            "G03": "3a19deae-2c7a-392b-62f1-4907c66343f8",
+            "H01": "3a19deae-2c7a-5602-e876-d27aca4e3201",
+            "H02": "3a19deae-2c7a-f15c-70e0-25b58a8c9702",
+            "H03": "3a19deae-2c7a-780b-8965-2e1345f7e834",
+            "I01": "3a19deae-2c7a-8849-e172-07de14ede928",
+            "I02": "3a19deae-2c7a-4772-a37f-ff99270bafc0",
+            "I03": "3a19deae-2c7a-cce7-6e4a-25ea4a2068c4",
+            "J01": "3a19deae-2c7a-1848-de92-b5d5ed054cc6",
+            "J02": "3a19deae-2c7a-1d45-b4f8-6f866530e205",
+            "J03": "3a19deae-2c7a-f237-89d9-8fe19025dee9"
+        }
+    },
+}
+```
+
+#### 关键要点
+
+1. **UUID 可以复用**: 三个仓库（手动堆栈、手动传递窗右、手动传递窗左）可以共享相同的物理库位 UUID
+2. **库位名称必须匹配**: 前端生成的库位名称（如 F01）必须与 config.py 中的键名完全一致
+3. **row_offset 的妙用**: 
+   - `row_offset=0` → 生成 A-E 行
+   - `row_offset=5` → 生成 F-J 行（跳过前5个字母）
+
+#### 验证结果
+
+配置完成后，拖拽测试：
+
+| 拖拽位置 | 前端库位 | 查找路径 | UUID | 结果 |
+|---------|---------|---------|------|------|
+| 手动传递窗右/A01 | A01 | `WAREHOUSE_MAPPING["手动传递窗右"]["site_uuids"]["A01"]` | `3a19...eaea` | ✅ 正确入库 |
+| 手动传递窗左/F01 | F01 | `WAREHOUSE_MAPPING["手动传递窗左"]["site_uuids"]["F01"]` | `3a19...c4a` | ✅ 正确入库 |
+| 手动堆栈/A01 | A01 | `WAREHOUSE_MAPPING["手动堆栈"]["site_uuids"]["A01"]` | `3a19...eaea` | ✅ 仍然正常 |
+
+
+---
+
+## warehouse_factory 详解
+
+### 函数签名
+
+```python
+def warehouse_factory(
+    name: str,
+    num_items_x: int = 1,      # 列数
+    num_items_y: int = 4,      # 行数
+    num_items_z: int = 4,      # 层数
+    dx: float = 137.0,         # X 起始偏移
+    dy: float = 96.0,          # Y 起始偏移
+    dz: float = 120.0,         # Z 起始偏移
+    item_dx: float = 10.0,     # X 间距
+    item_dy: float = 10.0,     # Y 间距
+    item_dz: float = 10.0,     # Z 间距
+    col_offset: int = 0,       # 列偏移（影响数字）
+    row_offset: int = 0,       # 行偏移（影响字母）
+    layout: str = "col-major", # 布局模式
+) -> WareHouse:
+```
+
+### 参数说明
+
+#### 尺寸参数
+- **num_items_x, y, z**: 定义仓库的网格尺寸
+- **注意**: 当 `num_items_z > 1` 时，Z 轴会被映射为数字列
+
+#### 位置参数
+- **dx, dy, dz**: 第一个库位的起始坐标
+- **item_dx, dy, dz**: 库位之间的间距
+
+#### 偏移参数
+- **col_offset**: 列起始偏移，用于生成 A05-D08 等命名
+  ```python
+  col_offset=4  # 生成 A05, A06, A07, A08
+  ```
+
+- **row_offset**: 行起始偏移，用于生成 F01-J03 等命名
+  ```python
+  row_offset=5  # 生成 F01, F02, F03（跳过 A-E）
+  ```
+
+#### 布局参数
+- **layout**: 
+  - `"col-major"`: 列优先（默认），可能导致上下颠倒
+  - `"row-major"`: 行优先，**推荐使用**，A 显示在上
+
+### 库位生成逻辑
+
+```python
+# row-major 模式（推荐）
+keys = [f"{LETTERS[j + row_offset]}{i + 1 + col_offset:02d}" 
+        for j in range(num_y) 
+        for i in range(num_x)]
+
+# 示例：num_y=2, num_x=3, row_offset=0, col_offset=0
+# 生成：A01, A02, A03, B01, B02, B03
+```
+
+### Y 坐标计算
+
+```python
+if layout == "row-major":
+    # A 在上（Y 较小）
+    y = dy + row * item_dy
+else:
+    # A 在下（Y 较大）- 不推荐
+    y = dy + (num_items_y - row - 1) * item_dy
+```
+
+---
+
+## 创建新仓库
+
+### 步骤 1: 在 YB_warehouses.py 中创建函数
+
+```python
+def bioyond_warehouse_3x4x1(name: str) -> WareHouse:
+    """创建 3行×4列×1层 仓库
+    
+    布局:
+    A01 | A02 | A03 | A04
+    B01 | B02 | B03 | B04
+    C01 | C02 | C03 | C04
+    """
+    return warehouse_factory(
+        name=name,
+        num_items_x=4,      # 4列
+        num_items_y=3,      # 3行
+        num_items_z=1,      # 1层
+        dx=10.0,
+        dy=10.0,
+        dz=10.0,
+        item_dx=137.0,
+        item_dy=120.0,
+        item_dz=120.0,
+        category="warehouse",
+        layout="row-major",  # ⭐ 推荐使用
+    )
+```
+
+### 步骤 2: 在 decks.py 中使用
+
+```python
+# 1. 导入函数
+from unilabos.resources.bioyond.YB_warehouses import (
+    bioyond_warehouse_3x4x1,  # 新增
+)
+
+# 2. 在 setup() 中添加
+self.warehouses = {
+    "我的新仓库": bioyond_warehouse_3x4x1("我的新仓库"),
+}
+self.warehouse_locations = {
+    "我的新仓库": Coordinate(100.0, 200.0, 0.0),
+}
+```
+
+### 步骤 3: 在 config.py 中配置 UUID（可选）
+
+```python
+WAREHOUSE_MAPPING = {
+    "我的新仓库": {
+        "uuid": "",
+        "site_uuids": {
+            "A01": "从 Bioyond 系统获取的 UUID",
+            "A02": "从 Bioyond 系统获取的 UUID",
+            # ... 其他 11 个库位
+        }
+    }
+}
+```
+
+**注意：** 如果不需要拖拽入库功能，可跳过此步骤。
+
+---
+
+## 常见问题
+
+### Q1: 为什么库位显示上下颠倒（C 在上，A 在下）？
+
+**原因：** 使用了默认的 `col-major` 布局。
+
+**解决：** 在 `warehouse_factory` 中添加 `layout="row-major"`
+
+```python
+return warehouse_factory(
+    ...
+    layout="row-major",  # ← 添加这行
+)
+```
+
+### Q2: 我需要 1×3×3 还是 3×3×1？
+
+**判断方法：**
+- **1×3×3**: 1列×3行×3**层**（垂直堆叠，有高度）
+- **3×3×1**: 3行×3列×1**层**（平面网格）
+
+**推荐：** 大多数情况使用 `X×Y×1`（平面网格）更直观。
+
+### Q3: 如何生成 F01-J03 而非 A01-E03？
+
+**方法：** 使用 `row_offset` 参数
+
+```python
+bioyond_warehouse_5x3x1("仓库名", row_offset=5)
+# row_offset=5 跳过 A-E，从 F 开始
+```
+
+### Q4: 拖拽物料后找不到 UUID 怎么办？
+
+**检查清单：**
+1. `config.py` 中是否有该仓库的配置？
+2. 仓库名称是否完全匹配？
+3. 库位名称（如 A01）是否在 `site_uuids` 中？
+
+**示例错误：**
+```python
+# decks.py
+"手动传递窗右": bioyond_warehouse_5x3x1(...)
+
+# config.py - ❌ 名称不匹配
+"手动传递窗": { ... }  # 缺少"右"字
+```
+
+### Q5: 库位重叠怎么办？
+
+**原因：** 间距（`item_dx/dy/dz`）太小。
+
+**解决：** 增大间距参数
+
+```python
+item_dx=150.0,  # 增大 X 间距
+item_dy=130.0,  # 增大 Y 间距
+```
+
+---
+
+## 调试技巧
+
+### 1. 查看生成的库位
+
+```python
+warehouse = bioyond_warehouse_5x3x1("测试仓库")
+print(list(warehouse.sites.keys()))
+# 输出：['A01', 'A02', 'A03', 'B01', 'B02', ...]
+```
+
+### 2. 检查库位坐标
+
+```python
+for name, site in warehouse.sites.items():
+    print(f"{name}: {site.location}")
+# 输出：
+# A01: Coordinate(x=10.0, y=10.0, z=120.0)
+# A02: Coordinate(x=147.0, y=10.0, z=120.0)
+# ...
+```
+
+### 3. 验证 UUID 映射
+
+```python
+from unilabos.devices.workstation.bioyond_studio.config import WAREHOUSE_MAPPING
+
+warehouse_name = "手动传递窗右"
+location_code = "A01"
+
+if warehouse_name in WAREHOUSE_MAPPING:
+    uuid = WAREHOUSE_MAPPING[warehouse_name]["site_uuids"].get(location_code)
+    print(f"{warehouse_name}/{location_code} → {uuid}")
+else:
+    print(f"❌ 未找到仓库: {warehouse_name}")
+```
+
+---
+
+## 文件关系图
+
+```
+unilabos/
+├── resources/
+│   ├── warehouse.py              # warehouse_factory 核心实现
+│   └── bioyond/
+│       ├── YB_warehouses.py      # ⭐ 仓库函数定义
+│       ├── decks.py              # ⭐ Deck 布局配置
+│       └── README_WAREHOUSE.md   # 📖 本文档
+└── devices/
+    └── workstation/
+        └── bioyond_studio/
+            ├── config.py         # ⭐ UUID 映射配置
+            └── bioyond_cell/
+                └── bioyond_cell_workstation.py  # 业务逻辑
+```
+
+---
+
+## 版本历史
+
+- **v1.1** (2026-01-08): 补充实际配置案例
+  - 添加"手动传递窗右"和"手动传递窗左"的完整配置示例
+  - 展示 UUID 复用的实际应用
+  - 说明三个仓库共享物理堆栈的配置方法
+  
+- **v1.0** (2026-01-07): 初始版本
+  - 新增 `row_offset` 参数支持
+  - 创建 `bioyond_warehouse_5x3x1` 和 `bioyond_warehouse_2x2x1`
+  - 修复多个仓库的上下颠倒问题
+
+---
+
+## 相关资源
+
+- [warehouse.py](../warehouse.py) - 核心工厂函数实现
+- [YB_warehouses.py](YB_warehouses.py) - 所有仓库定义
+- [decks.py](decks.py) - Deck 布局配置
+- [config.py](../../devices/workstation/bioyond_studio/config.py) - UUID 映射
+
+---
+
+**维护者：** Uni-Lab-OS 开发团队  
+**最后更新：** 2026-01-07

unilabos/resources/bioyond/YB_warehouses.py

@@ -166,7 +166,14 @@ def bioyond_warehouse_1x4x2(name: str) -> WareHouse:
     )
 
 def bioyond_warehouse_1x2x2(name: str) -> WareHouse:
-    """创建BioYond 1x2x2仓库"""
+    """创建BioYond 1x2x2仓库（1列×2行×2层）- 旧版本，已弃用
+    
+    布局（2层）:
+    层1: A01
+         B01
+    层2: A02
+         B02
+    """
     return warehouse_factory(
         name=name,
         num_items_x=1,
@@ -179,8 +186,32 @@ def bioyond_warehouse_1x2x2(name: str) -> WareHouse:
         item_dy=96.0,
         item_dz=120.0,
         category="warehouse",
+        layout="row-major",  # 使用行优先避免上下颠倒
     )
 
+def bioyond_warehouse_2x2x1(name: str) -> WareHouse:
+    """创建BioYond 2x2x1仓库（2行×2列×1层）
+    
+    布局:
+    A01 | A02
+    B01 | B02
+    """
+    return warehouse_factory(
+        name=name,
+        num_items_x=2,      # 2列
+        num_items_y=2,      # 2行
+        num_items_z=1,      # 1层
+        dx=10.0,
+        dy=10.0,
+        dz=10.0,
+        item_dx=137.0,
+        item_dy=96.0,
+        item_dz=120.0,
+        category="warehouse",
+        layout="row-major",  # 使用行优先避免上下颠倒
+    )
+
+
 def bioyond_warehouse_10x1x1(name: str) -> WareHouse:
     """创建BioYond 10x1x1仓库"""
     return warehouse_factory(
@@ -208,11 +239,61 @@ def bioyond_warehouse_1x3x3(name: str) -> WareHouse:
         dy=10.0,
         dz=10.0,
         item_dx=137.0,
-        item_dy=96.0,
+        item_dy=120.0,  # 增大Y方向间距以避免重叠
         item_dz=120.0,
         category="warehouse",
     )
 
+def bioyond_warehouse_5x3x1(name: str, row_offset: int = 0) -> WareHouse:
+    """创建BioYond 5x3x1仓库（5行×3列×1层）
+    
+    标准布局（row_offset=0）:
+    A01 | A02 | A03
+    B01 | B02 | B03
+    C01 | C02 | C03
+    D01 | D02 | D03
+    E01 | E02 | E03
+    
+    带偏移布局（row_offset=5）:
+    F01 | F02 | F03
+    G01 | G02 | G03
+    H01 | H02 | H03
+    I01 | I02 | I03
+    J01 | J02 | J03
+    """
+    return warehouse_factory(
+        name=name,
+        num_items_x=3,      # 3列
+        num_items_y=5,      # 5行
+        num_items_z=1,      # 1层
+        dx=10.0,
+        dy=10.0,
+        dz=10.0,
+        item_dx=137.0,
+        item_dy=120.0,
+        item_dz=120.0,
+        category="warehouse",
+        col_offset=0,
+        row_offset=row_offset,  # 支持行偏移
+        layout="row-major",  # 使用行优先避免颠倒
+    )
+
+
+def bioyond_warehouse_3x3x1(name: str) -> WareHouse:
+    """创建BioYond 3x3x1仓库"""
+    return warehouse_factory(
+        name=name,
+        num_items_x=3,
+        num_items_y=3,
+        num_items_z=1,
+        dx=10.0,
+        dy=10.0,
+        dz=10.0,
+        item_dx=137.0,
+        item_dy=96.0,
+        item_dz=120.0,
+        category="warehouse",
+    )
 def bioyond_warehouse_2x1x3(name: str) -> WareHouse:
     """创建BioYond 2x1x3仓库"""
     return warehouse_factory(

unilabos/resources/bioyond/decks.py

@@ -1,14 +1,16 @@
 from os import name
 from pylabrobot.resources import Deck, Coordinate, Rotation
 
-from unilabos.resources.bioyond.warehouses import (
+from unilabos.resources.bioyond.YB_warehouses import (
     bioyond_warehouse_1x4x4,
     bioyond_warehouse_1x4x4_right,  # 新增：右侧仓库 (A05～D08)
     bioyond_warehouse_1x4x2,
     bioyond_warehouse_reagent_stack,  # 新增：试剂堆栈 (A1-B4)
     bioyond_warehouse_liquid_and_lid_handling,
     bioyond_warehouse_1x2x2,
+    bioyond_warehouse_2x2x1,  # 新增：321和43窗口 (2行×2列)
     bioyond_warehouse_1x3x3,
+    bioyond_warehouse_5x3x1,  # 新增：手动传递窗仓库 (5行×3列)
     bioyond_warehouse_10x1x1,
     bioyond_warehouse_3x3x1,
     bioyond_warehouse_3x3x1_2,
@@ -115,10 +117,10 @@ class BIOYOND_YB_Deck(Deck):
     def setup(self) -> None:
         # 添加仓库
         self.warehouses = {
-            "321窗口": bioyond_warehouse_1x2x2("321窗口"),
-            "43窗口": bioyond_warehouse_1x2x2("43窗口"),
-            "手动传递窗左": bioyond_warehouse_1x3x3("手动传递窗左"),
-            "手动传递窗右": bioyond_warehouse_1x3x3("手动传递窗右"),
+            "321窗口": bioyond_warehouse_2x2x1("321窗口"),  # 2行×2列
+            "43窗口": bioyond_warehouse_2x2x1("43窗口"),  # 2行×2列
+            "手动传递窗右": bioyond_warehouse_5x3x1("手动传递窗右", row_offset=0),  # A01-E03
+            "手动传递窗左": bioyond_warehouse_5x3x1("手动传递窗左", row_offset=5),  # F01-J03
             "加样头堆栈左": bioyond_warehouse_10x1x1("加样头堆栈左"),
             "加样头堆栈右": bioyond_warehouse_10x1x1("加样头堆栈右"),
 

unilabos/resources/warehouse.py

@@ -27,6 +27,7 @@ def warehouse_factory(
     category: str = "warehouse",
     model: Optional[str] = None,
     col_offset: int = 0,  # 列起始偏移量，用于生成A05-D08等命名
+    row_offset: int = 0,  # 行起始偏移量，用于生成F01-J03等命名
     layout: str = "col-major",  # 新增：排序方式，"col-major"=列优先，"row-major"=行优先
 ):
     # 创建位置坐标
@@ -65,10 +66,10 @@ def warehouse_factory(
     if layout == "row-major":
         # 行优先顺序: A01,A02,A03,A04, B01,B02,B03,B04
         # locations[0] 对应 row=0, y最大（前端顶部）→ 应该是 A01
-        keys = [f"{LETTERS[j]}{i + 1 + col_offset:02d}" for j in range(len_y) for i in range(len_x)]
+        keys = [f"{LETTERS[j + row_offset]}{i + 1 + col_offset:02d}" for j in range(len_y) for i in range(len_x)]
     else:
         # 列优先顺序: A01,B01,C01,D01, A02,B02,C02,D02
-        keys = [f"{LETTERS[j]}{i + 1 + col_offset:02d}" for i in range(len_x) for j in range(len_y)]
+        keys = [f"{LETTERS[j + row_offset]}{i + 1 + col_offset:02d}" for i in range(len_x) for j in range(len_y)]
 
     sites = {i: site for i, site in zip(keys, _sites.values())}