Merge dptech/workstation_dev_YB4: resolve conflicts by keeping local changes (ours)

unilabos/resources/battery/bottle_carriers.py

@@ -0,0 +1,56 @@
+from pylabrobot.resources import create_homogeneous_resources, Coordinate, ResourceHolder, create_ordered_items_2d
+
+from unilabos.resources.itemized_carrier import Bottle, BottleCarrier
+from unilabos.resources.bioyond.YB_bottles import (
+    YB_pei_ye_xiao_Bottle,
+)
+# 命名约定：试剂瓶-Bottle，烧杯-Beaker，烧瓶-Flask，小瓶-Vial
+
+
+def YIHUA_Electrolyte_12VialCarrier(name: str) -> BottleCarrier:
+    """12瓶载架 - 2x6布局"""
+    # 载架尺寸 (mm)
+    carrier_size_x = 120.0
+    carrier_size_y = 250.0
+    carrier_size_z = 50.0
+
+    # 瓶位尺寸
+    bottle_diameter = 35.0
+    bottle_spacing_x = 35.0  # X方向间距
+    bottle_spacing_y = 35.0  # Y方向间距
+
+    # 计算起始位置 (居中排列)
+    start_x = (carrier_size_x - (2 - 1) * bottle_spacing_x - bottle_diameter) / 2
+    start_y = (carrier_size_y - (6 - 1) * bottle_spacing_y - bottle_diameter) / 2
+
+    sites = create_ordered_items_2d(
+        klass=ResourceHolder,
+        num_items_x=2,
+        num_items_y=6,
+        dx=start_x,
+        dy=start_y,
+        dz=5.0,
+        item_dx=bottle_spacing_x,
+        item_dy=bottle_spacing_y,
+
+        size_x=bottle_diameter,
+        size_y=bottle_diameter,
+        size_z=carrier_size_z,
+    )
+    for k, v in sites.items():
+        v.name = f"{name}_{v.name}"
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=sites,
+        model="Electrolyte_12VialCarrier",
+    )
+    carrier.num_items_x = 2
+    carrier.num_items_y = 6
+    carrier.num_items_z = 1
+    for i in range(12):
+        carrier[i] = YB_pei_ye_xiao_Bottle(f"{name}_vial_{i+1}")
+    return carrier

unilabos/resources/battery/electrode_sheet.py

@@ -0,0 +1,179 @@
+from typing import Any, Dict, Optional, TypedDict
+
+from pylabrobot.resources import Resource as ResourcePLR
+from pylabrobot.resources import Container
+
+
+electrode_colors = {
+    "PositiveCan": "#ff0000",
+    "PositiveElectrode": "#cc3333",
+    "NegativeCan": "#000000",
+    "NegativeElectrode": "#666666",
+    "SpringWasher": "#8b7355",
+    "FlatWasher": "a9a9a9",
+    "AluminumFoil": "#ffcccc",
+    "Battery": "#00ff00",
+}
+
+class ElectrodeSheetState(TypedDict):
+    mass: float  # 质量 (g)
+    material_type: str  # 材料类型（铜、铝、不锈钢、弹簧钢等）
+    color: str  # 材料类型对应的颜色
+
+
+class ElectrodeSheet(ResourcePLR):
+    """极片类 - 包含正负极片、隔膜、弹片、垫片、铝箔等所有片状材料"""
+
+    def __init__(
+        self,
+        name: str = "极片",
+        size_x=10,
+        size_y=10,
+        size_z=10,
+        category: str = "electrode_sheet",
+        model: Optional[str] = None,
+    ):
+        """初始化极片
+
+        Args:
+            name: 极片名称
+            category: 类别
+            model: 型号
+        """
+        super().__init__(
+            name=name,
+            size_x=size_x,
+            size_y=size_y,
+            size_z=size_z,
+            category=category,
+            model=model,
+        )
+        self._unilabos_state: ElectrodeSheetState = ElectrodeSheetState(
+            diameter=14,
+            thickness=0.1,
+            mass=0.5,
+            material_type="copper",
+            info=None
+        )
+
+    # TODO: 这个还要不要？给self._unilabos_state赋值的？
+    def load_state(self, state: Dict[str, Any]) -> None:
+        """格式不变"""
+        super().load_state(state)
+        self._unilabos_state = state
+    #序列化
+    def serialize_state(self) -> Dict[str, Dict[str, Any]]:
+        """格式不变"""
+        data = super().serialize_state()
+        data.update(self._unilabos_state)  # Container自身的信息，云端物料将保存这一data，本地也通过这里的data进行读写，当前类用来表示这个物料的长宽高大小的属性，而data（state用来表示物料的内容，细节等）
+        return data
+
+
+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"]})
+    return sheet
+
+
+def PositiveElectrode(name: str) -> ElectrodeSheet:
+    """创建正极片"""
+    sheet = ElectrodeSheet(name=name, size_x=10, size_y=10, size_z=0.1, model="PositiveElectrode")
+    sheet.load_state({"material_type": "positive_electrode", "color": electrode_colors["PositiveElectrode"]})
+    return sheet
+
+
+def NegativeCan(name: str) -> ElectrodeSheet:
+    """创建负极壳"""
+    sheet = ElectrodeSheet(name=name, size_x=12, size_y=12, size_z=2.0, model="NegativeCan")
+    sheet.load_state({"material_type": "steel", "color": electrode_colors["NegativeCan"]})
+    return sheet
+
+
+def NegativeElectrode(name: str) -> ElectrodeSheet:
+    """创建负极片"""
+    sheet = ElectrodeSheet(name=name, size_x=10, size_y=10, size_z=0.1, model="NegativeElectrode")
+    sheet.load_state({"material_type": "negative_electrode", "color": electrode_colors["NegativeElectrode"]})
+    return sheet
+
+
+def SpringWasher(name: str) -> ElectrodeSheet:
+    """创建弹片"""
+    sheet = ElectrodeSheet(name=name, size_x=10, size_y=10, size_z=0.5, model="SpringWasher")
+    sheet.load_state({"material_type": "spring_steel", "color": electrode_colors["SpringWasher"]})
+    return sheet
+
+
+def FlatWasher(name: str) -> ElectrodeSheet:
+    """创建垫片"""
+    sheet = ElectrodeSheet(name=name, size_x=10, size_y=10, size_z=0.2, model="FlatWasher")
+    sheet.load_state({"material_type": "steel", "color": electrode_colors["FlatWasher"]})
+    return sheet
+
+
+def AluminumFoil(name: str) -> ElectrodeSheet:
+    """创建铝箔"""
+    sheet = ElectrodeSheet(name=name, size_x=10, size_y=10, size_z=0.05, model="AluminumFoil")
+    sheet.load_state({"material_type": "aluminum", "color": electrode_colors["AluminumFoil"]})
+    return sheet
+
+
+class BatteryState(TypedDict):
+    color: str  # 材料类型对应的颜色
+    electrolyte_name: str
+    data_electrolyte_code: str
+    open_circuit_voltage: float
+    assembly_pressure: float
+    electrolyte_volume: float
+
+    info: Optional[str]  # 附加信息
+
+
+class Battery(Container):
+    """电池类 - 包含组装好的电池"""
+
+    def __init__(
+        self,
+        name: str = "电池",
+        size_x=12,
+        size_y=12,
+        size_z=6,
+        category: str = "battery",
+        model: Optional[str] = None,
+    ):
+        """初始化电池
+
+        Args:
+            name: 电池名称
+            category: 类别
+            model: 型号
+        """
+        super().__init__(
+            name=name,
+            size_x=size_x,
+            size_y=size_y,
+            size_z=size_z,
+            category=category,
+            model=model,
+        )
+        self._unilabos_state: BatteryState = BatteryState(
+            color=electrode_colors["Battery"],
+            electrolyte_name="无",
+            data_electrolyte_code="",
+            open_circuit_voltage=0.0,
+            assembly_pressure=0.0,
+            electrolyte_volume=0.0,
+            info=None
+        )
+
+    def load_state(self, state: Dict[str, Any]) -> None:
+        """格式不变"""
+        super().load_state(state)
+        self._unilabos_state = state
+
+    #序列化
+    def serialize_state(self) -> Dict[str, Dict[str, Any]]:
+        """格式不变"""
+        data = super().serialize_state()
+        data.update(self._unilabos_state)  # Container自身的信息，云端物料将保存这一data，本地也通过这里的data进行读写，当前类用来表示这个物料的长宽高大小的属性，而data（state用来表示物料的内容，细节等）
+        return data

unilabos/resources/battery/magazine.py

@@ -0,0 +1,344 @@
+from typing import Dict, List, Optional, OrderedDict, Union, Callable
+import math
+
+from pylabrobot.resources.coordinate import Coordinate
+from pylabrobot.resources import Resource, ResourceStack, ItemizedResource
+from pylabrobot.resources.carrier import create_homogeneous_resources
+
+from unilabos.resources.battery.electrode_sheet import (
+    PositiveCan, PositiveElectrode,
+    NegativeCan, NegativeElectrode,
+    SpringWasher, FlatWasher,
+    AluminumFoil,
+    Battery
+)
+
+
+class Magazine(ResourceStack):
+    """子弹夹洞位类"""
+
+    def __init__(
+        self,
+        name: str,
+        direction: str = 'z',
+        resources: Optional[List[Resource]] = None,
+        max_sheets: int = 100,
+        **kwargs
+    ):
+        """初始化子弹夹洞位
+
+        Args:
+            name: 洞位名称
+            direction: 堆叠方向
+            resources: 资源列表
+            max_sheets: 最大极片数量
+        """
+        super().__init__(
+            name=name,
+            direction=direction,
+            resources=resources,
+        )
+        self.max_sheets = max_sheets
+
+    @property
+    def size_x(self) -> float:
+        return self.get_size_x()
+
+    @property
+    def size_y(self) -> float:
+        return self.get_size_y()
+
+    @property
+    def size_z(self) -> float:
+        return self.get_size_z()
+
+    def serialize(self) -> dict:
+        return {
+            **super().serialize(),
+            "size_x": self.size_x or 10.0,
+            "size_y": self.size_y or 10.0,
+            "size_z": self.size_z or 10.0,
+            "max_sheets": self.max_sheets,
+        }
+
+
+class MagazineHolder(ItemizedResource):
+    """子弹夹类 - 有多个洞位，每个洞位放多个极片"""
+
+    def __init__(
+        self,
+        name: str,
+        size_x: float,
+        size_y: float,
+        size_z: float,
+        ordered_items: Optional[Dict[str, Magazine]] = None,
+        ordering: Optional[OrderedDict[str, str]] = None,
+        hole_diameter: float = 14.0,
+        hole_depth: float = 10.0,
+        max_sheets_per_hole: int = 100,
+        cross_section_type: str = "circle",
+        category: str = "magazine_holder",
+        model: Optional[str] = None,
+    ):
+        """初始化子弹夹
+
+        Args:
+            name: 子弹夹名称
+            size_x: 长度 (mm)
+            size_y: 宽度 (mm)
+            size_z: 高度 (mm)
+            hole_diameter: 洞直径 (mm)
+            hole_depth: 洞深度 (mm)
+            max_sheets_per_hole: 每个洞位最大极片数量
+            category: 类别
+            model: 型号
+        """
+
+        super().__init__(
+            name=name,
+            size_x=size_x,
+            size_y=size_y,
+            size_z=size_z,
+            ordered_items=ordered_items,
+            ordering=ordering,
+            category=category,
+            model=model,
+        )
+
+        # 保存洞位的直径和深度
+        self.hole_diameter = hole_diameter
+        self.hole_depth = hole_depth
+        self.max_sheets_per_hole = max_sheets_per_hole
+        self.cross_section_type = cross_section_type
+
+    def serialize(self) -> dict:
+        return {
+            **super().serialize(),
+            "hole_diameter": self.hole_diameter,
+            "hole_depth": self.hole_depth,
+            "max_sheets_per_hole": self.max_sheets_per_hole,
+            "cross_section_type": self.cross_section_type,
+        }
+
+
+def magazine_factory(
+    name: str,
+    size_x: float,
+    size_y: float,
+    size_z: float,
+    locations: List[Coordinate],
+    klasses: Optional[List[Callable[[str], str]]] = None,
+    hole_diameter: float = 14.0,
+    hole_depth: float = 10.0,
+    max_sheets_per_hole: int = 100,
+    category: str = "magazine_holder",
+    model: Optional[str] = None,
+) -> 'MagazineHolder':
+    """工厂函数：创建子弹夹
+    
+    Args:
+        name: 子弹夹名称
+        size_x: 长度 (mm)
+        size_y: 宽度 (mm)
+        size_z: 高度 (mm)
+        locations: 洞位坐标列表
+        klasses: 每个洞位中极片的类列表
+        hole_diameter: 洞直径 (mm)
+        hole_depth: 洞深度 (mm)
+        max_sheets_per_hole: 每个洞位最大极片数量
+        category: 类别
+        model: 型号
+    """
+    for loc in locations:
+        loc.x -= hole_diameter / 2
+        loc.y -= hole_diameter / 2
+
+    # 创建洞位
+    _sites = create_homogeneous_resources(
+        klass=Magazine,
+        locations=locations,
+        resource_size_x=hole_diameter,
+        resource_size_y=hole_diameter,
+        name_prefix=name,
+        max_sheets=max_sheets_per_hole,
+    )
+    
+    # 生成编号键
+    keys = [f"A{i+1}" for i in range(len(locations))]
+    sites = dict(zip(keys, _sites.values()))
+    
+    holder = MagazineHolder(
+        name=name,
+        size_x=size_x,
+        size_y=size_y,
+        size_z=size_z,
+        ordered_items=sites,
+        hole_diameter=hole_diameter,
+        hole_depth=hole_depth,
+        max_sheets_per_hole=max_sheets_per_hole,
+        category=category,
+        model=model,
+    )
+
+    if klasses is not None:
+        for i, klass in enumerate(klasses):
+            hole_key = keys[i]
+            hole = holder.children[i]
+            for j in reversed(range(max_sheets_per_hole)):
+                item_name = f"{hole_key}_sheet{j+1}"
+                item = klass(name=item_name)
+                hole.assign_child_resource(item)
+    return holder
+
+
+def MagazineHolder_6_Cathode(
+    name: str,
+    size_x: float = 80.0,
+    size_y: float = 80.0,
+    size_z: float = 40.0,
+    hole_diameter: float = 14.0,
+    hole_depth: float = 10.0,
+    hole_spacing: float = 20.0,
+    max_sheets_per_hole: int = 100,
+) -> MagazineHolder:
+    """创建6孔子弹夹 - 六边形排布"""
+    center_x = size_x / 2
+    center_y = size_y / 2
+
+    locations = []
+
+    # 周围6个孔，按六边形排布
+    for i in range(6):
+        angle = i * 60 * math.pi / 180  # 每60度一个孔
+        x = center_x + hole_spacing * math.cos(angle)
+        y = center_y + hole_spacing * math.sin(angle)
+        locations.append(Coordinate(x, y, size_z - hole_depth))
+
+    return magazine_factory(
+        name=name,
+        size_x=size_x,
+        size_y=size_y,
+        size_z=size_z,
+        locations=locations,
+        klasses=[FlatWasher, PositiveCan, PositiveCan, FlatWasher, PositiveCan, PositiveCan],
+        hole_diameter=hole_diameter,
+        hole_depth=hole_depth,
+        max_sheets_per_hole=max_sheets_per_hole,
+        category="magazine_holder",
+        model="MagazineHolder_6_Cathode",
+    )
+
+
+def MagazineHolder_6_Anode(
+    name: str,
+    size_x: float = 80.0,
+    size_y: float = 80.0,
+    size_z: float = 40.0,
+    hole_diameter: float = 14.0,
+    hole_depth: float = 10.0,
+    hole_spacing: float = 20.0,
+    max_sheets_per_hole: int = 100,
+) -> MagazineHolder:
+    """创建6孔子弹夹 - 六边形排布"""
+    center_x = size_x / 2
+    center_y = size_y / 2
+
+    locations = []
+
+    # 周围6个孔，按六边形排布
+    for i in range(6):
+        angle = i * 60 * math.pi / 180  # 每60度一个孔
+        x = center_x + hole_spacing * math.cos(angle)
+        y = center_y + hole_spacing * math.sin(angle)
+        locations.append(Coordinate(x, y, size_z - hole_depth))
+
+    return magazine_factory(
+        name=name,
+        size_x=size_x,
+        size_y=size_y,
+        size_z=size_z,
+        locations=locations,
+        klasses=[SpringWasher, NegativeCan, NegativeCan, SpringWasher, NegativeCan, NegativeCan],
+        hole_diameter=hole_diameter,
+        hole_depth=hole_depth,
+        max_sheets_per_hole=max_sheets_per_hole,
+        category="magazine_holder",
+        model="MagazineHolder_6_Anode",
+    )
+
+
+def MagazineHolder_6_Battery(
+    name: str,
+    size_x: float = 80.0,
+    size_y: float = 80.0,
+    size_z: float = 40.0,
+    hole_diameter: float = 14.0,
+    hole_depth: float = 10.0,
+    hole_spacing: float = 20.0,
+    max_sheets_per_hole: int = 100,
+) -> MagazineHolder:
+    """创建6孔子弹夹 - 六边形排布"""
+    center_x = size_x / 2
+    center_y = size_y / 2
+
+    locations = []
+
+    # 周围6个孔，按六边形排布
+    for i in range(6):
+        angle = i * 60 * math.pi / 180  # 每60度一个孔
+        x = center_x + hole_spacing * math.cos(angle)
+        y = center_y + hole_spacing * math.sin(angle)
+        locations.append(Coordinate(x, y, size_z - hole_depth))
+
+    return magazine_factory(
+        name=name,
+        size_x=size_x,
+        size_y=size_y,
+        size_z=size_z,
+        locations=locations,
+        klasses=None, # 初始化时，不放入装好的电池
+        hole_diameter=hole_diameter,
+        hole_depth=hole_depth,
+        max_sheets_per_hole=max_sheets_per_hole,
+        category="magazine_holder",
+        model="MagazineHolder_6_Battery",
+    )
+
+
+def MagazineHolder_4_Cathode(
+    name: str,
+) -> MagazineHolder:
+    """创建4孔子弹夹 - 正方形四角排布"""
+    size_x: float = 80.0
+    size_y: float = 80.0
+    size_z: float = 10.0
+    hole_diameter: float = 14.0
+    hole_depth: float = 10.0
+    hole_spacing: float = 25.0
+    max_sheets_per_hole: int = 100
+
+    # 计算4个洞位的坐标（正方形四角排布）
+    center_x = size_x / 2
+    center_y = size_y / 2
+    offset = hole_spacing / 2
+    
+    locations = [
+        Coordinate(center_x - offset, center_y - offset, size_z - hole_depth),  # 左下
+        Coordinate(center_x + offset, center_y - offset, size_z - hole_depth),  # 右下
+        Coordinate(center_x - offset, center_y + offset, size_z - hole_depth),  # 左上
+        Coordinate(center_x + offset, center_y + offset, size_z - hole_depth),  # 右上
+    ]
+    
+    return magazine_factory(
+        name=name,
+        size_x=size_x,
+        size_y=size_y,
+        size_z=size_z,
+        locations=locations,
+        klasses=[AluminumFoil, PositiveElectrode, PositiveElectrode, PositiveElectrode],
+        hole_diameter=hole_diameter,
+        hole_depth=hole_depth,
+        max_sheets_per_hole=max_sheets_per_hole,
+        category="magazine_holder",
+        model="MagazineHolder_4_Cathode",
+    )

unilabos/resources/bioyond/YB_bottle_carriers.py

@@ -0,0 +1,653 @@
+from pylabrobot.resources import create_homogeneous_resources, Coordinate, ResourceHolder, create_ordered_items_2d
+
+from unilabos.resources.itemized_carrier import Bottle, BottleCarrier
+from unilabos.resources.bioyond.YB_bottles import (
+    YB_jia_yang_tou_da,
+    YB_ye_Bottle,
+    YB_ye_100ml_Bottle,
+    YB_gao_nian_ye_Bottle,
+    YB_5ml_fenyeping,
+    YB_20ml_fenyeping,
+    YB_pei_ye_xiao_Bottle,
+    YB_pei_ye_da_Bottle,
+    YB_qiang_tou,
+)
+# 命名约定：试剂瓶-Bottle，烧杯-Beaker，烧瓶-Flask，小瓶-Vial
+
+
+def BIOYOND_Electrolyte_6VialCarrier(name: str) -> BottleCarrier:
+    """6瓶载架 - 2x3布局"""
+
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 50.0
+
+    # 瓶位尺寸
+    bottle_diameter = 30.0
+    bottle_spacing_x = 42.0  # X方向间距
+    bottle_spacing_y = 35.0  # Y方向间距
+
+    # 计算起始位置 (居中排列)
+    start_x = (carrier_size_x - (3 - 1) * bottle_spacing_x - bottle_diameter) / 2
+    start_y = (carrier_size_y - (2 - 1) * bottle_spacing_y - bottle_diameter) / 2
+
+    sites = create_ordered_items_2d(
+        klass=ResourceHolder,
+        num_items_x=3,
+        num_items_y=2,
+        dx=start_x,
+        dy=start_y,
+        dz=5.0,
+        item_dx=bottle_spacing_x,
+        item_dy=bottle_spacing_y,
+
+        size_x=bottle_diameter,
+        size_y=bottle_diameter,
+        size_z=carrier_size_z,
+    )
+    for k, v in sites.items():
+        v.name = f"{name}_{v.name}"
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=sites,
+        model="Electrolyte_6VialCarrier",
+    )
+    carrier.num_items_x = 3
+    carrier.num_items_y = 2
+    carrier.num_items_z = 1
+    # for i in range(6):
+    #     carrier[i] = YB_Solid_Vial(f"{name}_vial_{i+1}")
+    return carrier
+
+
+def BIOYOND_Electrolyte_1BottleCarrier(name: str) -> BottleCarrier:
+    """1瓶载架 - 单个中央位置"""
+
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 100.0
+
+    # 烧杯尺寸
+    beaker_diameter = 80.0
+
+    # 计算中央位置
+    center_x = (carrier_size_x - beaker_diameter) / 2
+    center_y = (carrier_size_y - beaker_diameter) / 2
+    center_z = 5.0
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=create_homogeneous_resources(
+            klass=ResourceHolder,
+            locations=[Coordinate(center_x, center_y, center_z)],
+            resource_size_x=beaker_diameter,
+            resource_size_y=beaker_diameter,
+            name_prefix=name,
+        ),
+        model="Electrolyte_1BottleCarrier",
+    )
+    carrier.num_items_x = 1
+    carrier.num_items_y = 1
+    carrier.num_items_z = 1
+    # carrier[0] = YB_Solution_Beaker(f"{name}_beaker_1")
+    return carrier
+
+
+def YB_6StockCarrier(name: str) -> BottleCarrier:
+    """6瓶载架 - 2x3布局"""
+
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 50.0
+
+    # 瓶位尺寸
+    bottle_diameter = 20.0
+    bottle_spacing_x = 42.0  # X方向间距
+    bottle_spacing_y = 35.0  # Y方向间距
+
+    # 计算起始位置 (居中排列)
+    start_x = (carrier_size_x - (3 - 1) * bottle_spacing_x - bottle_diameter) / 2
+    start_y = (carrier_size_y - (2 - 1) * bottle_spacing_y - bottle_diameter) / 2
+
+    sites = create_ordered_items_2d(
+        klass=ResourceHolder,
+        num_items_x=3,
+        num_items_y=2,
+        dx=start_x,
+        dy=start_y,
+        dz=5.0,
+        item_dx=bottle_spacing_x,
+        item_dy=bottle_spacing_y,
+
+        size_x=bottle_diameter,
+        size_y=bottle_diameter,
+        size_z=carrier_size_z,
+    )
+    for k, v in sites.items():
+        v.name = f"{name}_{v.name}"
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=sites,
+        model="6StockCarrier",
+    )
+    carrier.num_items_x = 3
+    carrier.num_items_y = 2
+    carrier.num_items_z = 1
+    ordering = ["A1", "A2", "A3", "B1", "B2", "B3"]  # 自定义顺序
+    # for i in range(6):
+    #     carrier[i] = YB_Solid_Stock(f"{name}_vial_{ordering[i]}")
+    return carrier
+
+
+def YB_6VialCarrier(name: str) -> BottleCarrier:
+    """6瓶载架 - 2x3布局"""
+
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 50.0
+
+    # 瓶位尺寸
+    bottle_diameter = 30.0
+    bottle_spacing_x = 42.0  # X方向间距
+    bottle_spacing_y = 35.0  # Y方向间距
+
+    # 计算起始位置 (居中排列)
+    start_x = (carrier_size_x - (3 - 1) * bottle_spacing_x - bottle_diameter) / 2
+    start_y = (carrier_size_y - (2 - 1) * bottle_spacing_y - bottle_diameter) / 2
+
+    sites = create_ordered_items_2d(
+        klass=ResourceHolder,
+        num_items_x=3,
+        num_items_y=2,
+        dx=start_x,
+        dy=start_y,
+        dz=5.0,
+        item_dx=bottle_spacing_x,
+        item_dy=bottle_spacing_y,
+
+        size_x=bottle_diameter,
+        size_y=bottle_diameter,
+        size_z=carrier_size_z,
+    )
+    for k, v in sites.items():
+        v.name = f"{name}_{v.name}"
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=sites,
+        model="6VialCarrier",
+    )
+    carrier.num_items_x = 3
+    carrier.num_items_y = 2
+    carrier.num_items_z = 1
+    ordering = ["A1", "A2", "A3", "B1", "B2", "B3"]  # 自定义顺序
+    # for i in range(3):
+    #     carrier[i] = YB_Solid_Vial(f"{name}_solidvial_{ordering[i]}")
+    # for i in range(3, 6):
+    #     carrier[i] = YB_Liquid_Vial(f"{name}_liquidvial_{ordering[i]}")
+    return carrier
+
+# 1瓶载架 - 单个中央位置
+def YB_ye(name: str) -> BottleCarrier:
+    
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 20.0
+
+    # 烧杯尺寸
+    beaker_diameter = 60.0
+
+    # 计算中央位置
+    center_x = (carrier_size_x - beaker_diameter) / 2
+    center_y = (carrier_size_y - beaker_diameter) / 2
+    center_z = 5.0
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=create_homogeneous_resources(
+            klass=ResourceHolder,
+            locations=[Coordinate(center_x, center_y, center_z)],
+            resource_size_x=beaker_diameter,
+            resource_size_y=beaker_diameter,
+            name_prefix=name,
+        ),
+        model="YB_ye",
+    )
+    carrier.num_items_x = 1
+    carrier.num_items_y = 1
+    carrier.num_items_z = 1
+    carrier[0] = YB_ye_Bottle(f"{name}_flask_1")
+    return carrier
+
+
+# 高粘液瓶载架 - 单个中央位置
+def YB_gaonianye(name: str) -> BottleCarrier:
+    
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 20.0
+
+    # 烧杯尺寸
+    beaker_diameter = 60.0
+
+    # 计算中央位置
+    center_x = (carrier_size_x - beaker_diameter) / 2
+    center_y = (carrier_size_y - beaker_diameter) / 2
+    center_z = 5.0
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=create_homogeneous_resources(
+            klass=ResourceHolder,
+            locations=[Coordinate(center_x, center_y, center_z)],
+            resource_size_x=beaker_diameter,
+            resource_size_y=beaker_diameter,
+            name_prefix=name,
+        ),
+        model="YB_gaonianye",
+    )
+    carrier.num_items_x = 1
+    carrier.num_items_y = 1
+    carrier.num_items_z = 1
+    carrier[0] = YB_gao_nian_ye_Bottle(f"{name}_flask_1")
+    return carrier
+
+
+# 100ml液体瓶载架 - 单个中央位置
+def YB_100ml_yeti(name: str) -> BottleCarrier:
+    
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 20.0
+
+    # 烧杯尺寸
+    beaker_diameter = 60.0
+
+    # 计算中央位置
+    center_x = (carrier_size_x - beaker_diameter) / 2
+    center_y = (carrier_size_y - beaker_diameter) / 2
+    center_z = 5.0
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=create_homogeneous_resources(
+            klass=ResourceHolder,
+            locations=[Coordinate(center_x, center_y, center_z)],
+            resource_size_x=beaker_diameter,
+            resource_size_y=beaker_diameter,
+            name_prefix=name,
+        ),
+        model="YB_100ml_yeti",
+    )
+    carrier.num_items_x = 1
+    carrier.num_items_y = 1
+    carrier.num_items_z = 1
+    carrier[0] = YB_ye_100ml_Bottle(f"{name}_flask_1")
+    return carrier
+
+# 5ml分液瓶板 - 4x2布局，8个位置
+def YB_5ml_fenyepingban(name: str) -> BottleCarrier:
+    
+
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 50.0
+
+    # 瓶位尺寸
+    bottle_diameter = 15.0
+    bottle_spacing_x = 42.0  # X方向间距
+    bottle_spacing_y = 35.0  # Y方向间距
+
+    # 计算起始位置 (居中排列)
+    start_x = (carrier_size_x - (4 - 1) * bottle_spacing_x - bottle_diameter) / 2
+    start_y = (carrier_size_y - (2 - 1) * bottle_spacing_y - bottle_diameter) / 2
+
+    sites = create_ordered_items_2d(
+        klass=ResourceHolder,
+        num_items_x=4,
+        num_items_y=2,
+        dx=start_x,
+        dy=start_y,
+        dz=5.0,
+        item_dx=bottle_spacing_x,
+        item_dy=bottle_spacing_y,
+        size_x=bottle_diameter,
+        size_y=bottle_diameter,
+        size_z=carrier_size_z,
+    )
+    for k, v in sites.items():
+        v.name = f"{name}_{v.name}"
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=sites,
+        model="YB_5ml_fenyepingban",
+    )
+    carrier.num_items_x = 4
+    carrier.num_items_y = 2
+    carrier.num_items_z = 1
+    ordering = ["A1", "A2", "A3", "A4", "B1", "B2", "B3", "B4"]
+    for i in range(8):
+        carrier[i] = YB_5ml_fenyeping(f"{name}_vial_{ordering[i]}")
+    return carrier
+
+# 20ml分液瓶板 - 4x2布局，8个位置
+def YB_20ml_fenyepingban(name: str) -> BottleCarrier:
+
+
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 70.0
+
+    # 瓶位尺寸
+    bottle_diameter = 20.0
+    bottle_spacing_x = 42.0  # X方向间距
+    bottle_spacing_y = 35.0  # Y方向间距
+
+    # 计算起始位置 (居中排列)
+    start_x = (carrier_size_x - (4 - 1) * bottle_spacing_x - bottle_diameter) / 2
+    start_y = (carrier_size_y - (2 - 1) * bottle_spacing_y - bottle_diameter) / 2
+
+    sites = create_ordered_items_2d(
+        klass=ResourceHolder,
+        num_items_x=4,
+        num_items_y=2,
+        dx=start_x,
+        dy=start_y,
+        dz=5.0,
+        item_dx=bottle_spacing_x,
+        item_dy=bottle_spacing_y,
+        size_x=bottle_diameter,
+        size_y=bottle_diameter,
+        size_z=carrier_size_z,
+    )
+    for k, v in sites.items():
+        v.name = f"{name}_{v.name}"
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=sites,
+        model="YB_20ml_fenyepingban",
+    )
+    carrier.num_items_x = 4
+    carrier.num_items_y = 2
+    carrier.num_items_z = 1
+    ordering = ["A1", "A2", "A3", "A4", "B1", "B2", "B3", "B4"]
+    for i in range(8):
+        carrier[i] = YB_20ml_fenyeping(f"{name}_vial_{ordering[i]}")
+    return carrier
+
+# 配液瓶(小)板 - 4x2布局，8个位置
+def YB_peiyepingxiaoban(name: str) -> BottleCarrier:
+    
+
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 65.0
+
+    # 瓶位尺寸
+    bottle_diameter = 35.0
+    bottle_spacing_x = 42.0  # X方向间距
+    bottle_spacing_y = 35.0  # Y方向间距
+
+    # 计算起始位置 (居中排列)
+    start_x = (carrier_size_x - (4 - 1) * bottle_spacing_x - bottle_diameter) / 2
+    start_y = (carrier_size_y - (2 - 1) * bottle_spacing_y - bottle_diameter) / 2
+
+    sites = create_ordered_items_2d(
+        klass=ResourceHolder,
+        num_items_x=4,
+        num_items_y=2,
+        dx=start_x,
+        dy=start_y,
+        dz=5.0,
+        item_dx=bottle_spacing_x,
+        item_dy=bottle_spacing_y,
+        size_x=bottle_diameter,
+        size_y=bottle_diameter,
+        size_z=carrier_size_z,
+    )
+    for k, v in sites.items():
+        v.name = f"{name}_{v.name}"
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=sites,
+        model="YB_peiyepingxiaoban",
+    )
+    carrier.num_items_x = 4
+    carrier.num_items_y = 2
+    carrier.num_items_z = 1
+    ordering = ["A1", "A2", "A3", "A4", "B1", "B2", "B3", "B4"]
+    for i in range(8):
+        carrier[i] = YB_pei_ye_xiao_Bottle(f"{name}_bottle_{ordering[i]}")
+    return carrier
+
+
+# 配液瓶(大)板 - 2x2布局，4个位置
+def YB_peiyepingdaban(name: str) -> BottleCarrier:
+
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 95.0
+
+    # 瓶位尺寸
+    bottle_diameter = 55.0
+    bottle_spacing_x = 60.0  # X方向间距
+    bottle_spacing_y = 60.0  # Y方向间距
+
+    # 计算起始位置 (居中排列)
+    start_x = (carrier_size_x - (2 - 1) * bottle_spacing_x - bottle_diameter) / 2
+    start_y = (carrier_size_y - (2 - 1) * bottle_spacing_y - bottle_diameter) / 2
+
+    sites = create_ordered_items_2d(
+        klass=ResourceHolder,
+        num_items_x=2,
+        num_items_y=2,
+        dx=start_x,
+        dy=start_y,
+        dz=5.0,
+        item_dx=bottle_spacing_x,
+        item_dy=bottle_spacing_y,
+        size_x=bottle_diameter,
+        size_y=bottle_diameter,
+        size_z=carrier_size_z,
+    )
+    for k, v in sites.items():
+        v.name = f"{name}_{v.name}"
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=sites,
+        model="YB_peiyepingdaban",
+    )
+    carrier.num_items_x = 2
+    carrier.num_items_y = 2
+    carrier.num_items_z = 1
+    ordering = ["A1", "A2", "B1", "B2"]
+    for i in range(4):
+        carrier[i] = YB_pei_ye_da_Bottle(f"{name}_bottle_{ordering[i]}")
+    return carrier
+
+# 加样头(大)板 - 1x1布局，1个位置
+def YB_jia_yang_tou_da_Carrier(name: str) -> BottleCarrier:
+    
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 95.0
+
+    # 瓶位尺寸
+    bottle_diameter = 35.0
+    bottle_spacing_x = 42.0  # X方向间距
+    bottle_spacing_y = 35.0  # Y方向间距
+
+    # 计算起始位置 (居中排列)
+    start_x = (carrier_size_x - (1 - 1) * bottle_spacing_x - bottle_diameter) / 2
+    start_y = (carrier_size_y - (1 - 1) * bottle_spacing_y - bottle_diameter) / 2
+
+    sites = create_ordered_items_2d(
+        klass=ResourceHolder,
+        num_items_x=1,
+        num_items_y=1,
+        dx=start_x,
+        dy=start_y,
+        dz=5.0,
+        item_dx=bottle_spacing_x,
+        item_dy=bottle_spacing_y,
+        size_x=bottle_diameter,
+        size_y=bottle_diameter,
+        size_z=carrier_size_z,
+    )
+    for k, v in sites.items():
+        v.name = f"{name}_{v.name}"
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=sites,
+        model="YB_jia_yang_tou_da_Carrier",
+    )
+    carrier.num_items_x = 1
+    carrier.num_items_y = 1
+    carrier.num_items_z = 1
+    carrier[0] = YB_jia_yang_tou_da(f"{name}_head_1")
+    return carrier
+
+
+def YB_shi_pei_qi_kuai(name: str) -> BottleCarrier:
+    """适配器块 - 单个中央位置"""
+
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 30.0
+
+    # 适配器尺寸
+    adapter_diameter = 80.0
+
+    # 计算中央位置
+    center_x = (carrier_size_x - adapter_diameter) / 2
+    center_y = (carrier_size_y - adapter_diameter) / 2
+    center_z = 0.0
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=create_homogeneous_resources(
+            klass=ResourceHolder,
+            locations=[Coordinate(center_x, center_y, center_z)],
+            resource_size_x=adapter_diameter,
+            resource_size_y=adapter_diameter,
+            name_prefix=name,
+        ),
+        model="YB_shi_pei_qi_kuai",
+    )
+    carrier.num_items_x = 1
+    carrier.num_items_y = 1
+    carrier.num_items_z = 1
+    # 适配器块本身不包含瓶子，只是一个支撑结构
+    return carrier
+
+
+def YB_qiang_tou_he(name: str) -> BottleCarrier:
+    """枪头盒 - 8x12布局，96个位置"""
+
+    # 载架尺寸 (mm)
+    carrier_size_x = 127.8
+    carrier_size_y = 85.5
+    carrier_size_z = 55.0
+
+    # 枪头尺寸
+    tip_diameter = 10.0
+    tip_spacing_x = 9.0  # X方向间距
+    tip_spacing_y = 9.0  # Y方向间距
+
+    # 计算起始位置 (居中排列)
+    start_x = (carrier_size_x - (12 - 1) * tip_spacing_x - tip_diameter) / 2
+    start_y = (carrier_size_y - (8 - 1) * tip_spacing_y - tip_diameter) / 2
+
+    sites = create_ordered_items_2d(
+        klass=ResourceHolder,
+        num_items_x=12,
+        num_items_y=8,
+        dx=start_x,
+        dy=start_y,
+        dz=5.0,
+        item_dx=tip_spacing_x,
+        item_dy=tip_spacing_y,
+        size_x=tip_diameter,
+        size_y=tip_diameter,
+        size_z=carrier_size_z,
+    )
+    for k, v in sites.items():
+        v.name = f"{name}_{v.name}"
+
+    carrier = BottleCarrier(
+        name=name,
+        size_x=carrier_size_x,
+        size_y=carrier_size_y,
+        size_z=carrier_size_z,
+        sites=sites,
+        model="YB_qiang_tou_he",
+    )
+    carrier.num_items_x = 12
+    carrier.num_items_y = 8
+    carrier.num_items_z = 1
+    # 创建96个枪头
+    for i in range(96):
+        row = chr(65 + i // 12)  # A-H
+        col = (i % 12) + 1  # 1-12
+        carrier[i] = YB_qiang_tou(f"{name}_tip_{row}{col}")
+    return carrier
+

unilabos/resources/bioyond/YB_bottles.py

@@ -0,0 +1,163 @@
+from unilabos.resources.itemized_carrier import Bottle, BottleCarrier
+# 工厂函数
+"""加样头（大）"""
+def YB_jia_yang_tou_da(
+    name: str,
+    diameter: float = 20.0,
+    height: float = 100.0,
+    max_volume: float = 30000.0,  # 30mL
+    barcode: str = None,
+) -> Bottle:
+    """创建粉末瓶"""
+    return Bottle(
+        name=name,
+        diameter=diameter,# 未知
+        height=height,
+        max_volume=max_volume,
+        barcode=barcode,
+        model="YB_jia_yang_tou_da",
+    )
+
+"""液1x1"""
+def YB_ye_Bottle(
+    name: str,
+    diameter: float = 40.0,
+    height: float = 70.0,
+    max_volume: float = 50000.0,  # 50mL
+    barcode: str = None,
+) -> Bottle:
+    """创建液体瓶"""
+    return Bottle(
+        name=name,
+        diameter=diameter,
+        height=height,
+        max_volume=max_volume,
+        barcode=barcode,
+        model="YB_ye_Bottle",
+    )
+
+"""100ml液体"""
+def YB_ye_100ml_Bottle(
+    name: str,
+    diameter: float = 50.0,
+    height: float = 90.0,
+    max_volume: float = 100000.0,  # 100mL
+    barcode: str = None,
+) -> Bottle:
+    """创建100ml液体瓶"""
+    return Bottle(
+        name=name,
+        diameter=diameter,
+        height=height,
+        max_volume=max_volume,
+        barcode=barcode,
+        model="YB_100ml_yeti",
+    )
+
+"""高粘液"""
+def YB_gao_nian_ye_Bottle(
+    name: str,
+    diameter: float = 40.0,
+    height: float = 70.0,
+    max_volume: float = 50000.0,  # 50mL
+    barcode: str = None,
+) -> Bottle:
+    """创建高粘液瓶"""
+    return Bottle(
+        name=name,
+        diameter=diameter,
+        height=height,
+        max_volume=max_volume,
+        barcode=barcode,
+        model="High_Viscosity_Liquid",
+    )
+
+"""5ml分液瓶"""
+def YB_5ml_fenyeping(
+    name: str,
+    diameter: float = 20.0,
+    height: float = 50.0,
+    max_volume: float = 5000.0,  # 5mL
+    barcode: str = None,
+) -> Bottle:
+    """创建5ml分液瓶"""
+    return Bottle(
+        name=name,
+        diameter=diameter,
+        height=height,
+        max_volume=max_volume,
+        barcode=barcode,
+        model="YB_5ml_fenyeping",
+    )
+
+"""20ml分液瓶"""
+def YB_20ml_fenyeping(
+    name: str,
+    diameter: float = 30.0,
+    height: float = 65.0,
+    max_volume: float = 20000.0,  # 20mL
+    barcode: str = None,
+) -> Bottle:
+    """创建20ml分液瓶"""
+    return Bottle(
+        name=name,
+        diameter=diameter,
+        height=height,
+        max_volume=max_volume,
+        barcode=barcode,
+        model="YB_20ml_fenyeping",
+    )
+
+"""配液瓶(小)"""
+def YB_pei_ye_xiao_Bottle(
+    name: str,
+    diameter: float = 35.0,
+    height: float = 60.0,
+    max_volume: float = 30000.0,  # 30mL
+    barcode: str = None,
+) -> Bottle:
+    """创建配液瓶(小)"""
+    return Bottle(
+        name=name,
+        diameter=diameter,
+        height=height,
+        max_volume=max_volume,
+        barcode=barcode,
+        model="YB_pei_ye_xiao_Bottle",
+    )
+
+"""配液瓶(大)"""
+def YB_pei_ye_da_Bottle(
+    name: str,
+    diameter: float = 55.0,
+    height: float = 100.0,
+    max_volume: float = 150000.0,  # 150mL
+    barcode: str = None,
+) -> Bottle:
+    """创建配液瓶(大)"""
+    return Bottle(
+        name=name,
+        diameter=diameter,
+        height=height,
+        max_volume=max_volume,
+        barcode=barcode,
+        model="YB_pei_ye_da_Bottle",
+    )
+
+"""枪头"""
+def YB_qiang_tou(
+    name: str,
+    diameter: float = 10.0,
+    height: float = 50.0,
+    max_volume: float = 1000.0,  # 1mL
+    barcode: str = None,
+) -> Bottle:
+    """创建枪头"""
+    return Bottle(
+        name=name,
+        diameter=diameter,
+        height=height,
+        max_volume=max_volume,
+        barcode=barcode,
+        model="YB_qiang_tou",
+    )    

unilabos/resources/itemized_carrier.py

@@ -29,7 +29,7 @@ class Bottle(Well):
         size_x: float = 0.0,
         size_y: float = 0.0,
         size_z: float = 0.0,
-        barcode: Optional[str] = "",
+        barcode: Optional[str] = None,
         category: str = "container",
         model: Optional[str] = None,
         **kwargs,