Add electrode sheet and bottle rack classes; enhance coin cell deck setup with new resources and configurations

unilabos/devices/workstation/coin_cell_assembly/YB_YH_materials.py

@@ -1,3 +1,4 @@
+      
 """
 纽扣电池组装工作站物料类定义
 Button Battery Assembly Station Resource Classes
@@ -18,11 +19,67 @@ from pylabrobot.resources.tip_rack import TipRack, TipSpot
 from pylabrobot.resources.trash import Trash
 from pylabrobot.resources.utils import create_ordered_items_2d
 
-from unilabos.resources.battery.magazine import MagazineHolder_4_Cathode, MagazineHolder_6_Cathode, MagazineHolder_6_Anode, MagazineHolder_6_Battery
-from unilabos.resources.battery.bottle_carriers import YIHUA_Electrolyte_12VialCarrier
 
+class ElectrodeSheetState(TypedDict):
+    diameter: float  # 直径 (mm)
+    thickness: float  # 厚度 (mm)
+    mass: float  # 质量 (g)
+    material_type: str  # 材料类型（正极、负极、隔膜、弹片、垫片、铝箔等）
+    height: float
+    electrolyte_name: str
+    data_electrolyte_code: str
+    open_circuit_voltage: float
+    assembly_pressure: float
+    electrolyte_volume: float
 
+    info: Optional[str]  # 附加信息
 
+class ElectrodeSheet(Resource):
+    """极片类 - 包含正负极片、隔膜、弹片、垫片、铝箔等所有片状材料"""
+
+    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
 
 # TODO: 这个应该只能放一个极片
 class MaterialHoleState(TypedDict):
@@ -109,6 +166,7 @@ class MaterialHole(Resource):
         return self.children[index]
 
 
+
 class MaterialPlateState(TypedDict):
     hole_spacing_x: float
     hole_spacing_y: float
@@ -270,6 +328,132 @@ class PlateSlot(ResourceStack):
         }
 
 
+class ClipMagazineHole(Container):
+    """子弹夹洞位类"""
+
+    def __init__(
+        self,
+        name: str,
+        diameter: float,
+        depth: float,
+        max_sheets: int = 100,
+        category: str = "clip_magazine_hole",
+    ):
+        """初始化子弹夹洞位
+
+        Args:
+            name: 洞位名称
+            diameter: 洞直径 (mm)
+            depth: 洞深度 (mm)
+            max_sheets: 最大极片数量
+            category: 类别
+        """
+        super().__init__(
+            name=name,
+            size_x=diameter,
+            size_y=diameter,
+            size_z=depth,
+            category=category,
+        )
+        self.diameter = diameter
+        self.depth = depth
+        self.max_sheets = max_sheets
+        self._sheets: List[ElectrodeSheet] = []
+
+    def can_add_sheet(self, sheet: ElectrodeSheet) -> bool:
+        """检查是否可以添加极片"""
+        return (len(self._sheets) < self.max_sheets and
+                sheet.diameter <= self.diameter)
+
+    def add_sheet(self, sheet: ElectrodeSheet) -> None:
+        """添加极片"""
+        if not self.can_add_sheet(sheet):
+            raise ValueError(f"无法向洞位 {self.name} 添加极片")
+        self._sheets.append(sheet)
+
+    def take_sheet(self) -> ElectrodeSheet:
+        """取出极片"""
+        if len(self._sheets) == 0:
+            raise ValueError(f"洞位 {self.name} 没有极片")
+        return self._sheets.pop()
+
+    def get_sheet_count(self) -> int:
+        """获取极片数量"""
+        return len(self._sheets)
+
+    def serialize_state(self) -> Dict[str, Any]:
+        return {
+            "sheet_count": len(self._sheets),
+            "sheets": [sheet.serialize() for sheet in self._sheets],
+        }
+
+# TODO: 这个要改
+class ClipMagazine(ItemizedResource[ClipMagazineHole]):
+    """子弹夹类 - 有6个洞位，每个洞位放多个极片"""
+    children: List[ClipMagazineHole]
+    def __init__(
+        self,
+        name: str,
+        size_x: float,
+        size_y: float,
+        size_z: float,
+        hole_diameter: float = 14.0,
+        hole_depth: float = 10.0,
+        hole_spacing: float = 25.0,
+        max_sheets_per_hole: int = 100,
+        category: str = "clip_magazine",
+        model: Optional[str] = None,
+    ):
+        """初始化子弹夹
+
+        Args:
+            name: 子弹夹名称
+            size_x: 长度 (mm)
+            size_y: 宽度 (mm)
+            size_z: 高度 (mm)
+            hole_diameter: 洞直径 (mm)
+            hole_depth: 洞深度 (mm)
+            hole_spacing: 洞位间距 (mm)
+            max_sheets_per_hole: 每个洞位最大极片数量
+            category: 类别
+            model: 型号
+        """
+        # 创建6个洞位，排成2x3布局
+        holes = create_ordered_items_2d(
+            klass=ClipMagazineHole,
+            num_items_x=3,
+            num_items_y=2,
+            dx=(size_x - 2 * hole_spacing) / 2,  # 居中
+            dy=(size_y - hole_spacing) / 2,     # 居中
+            dz=size_z - 0,
+            item_dx=hole_spacing,
+            item_dy=hole_spacing,
+            diameter=hole_diameter,
+            depth=hole_depth,
+        )
+
+        super().__init__(
+            name=name,
+            size_x=size_x,
+            size_y=size_y,
+            size_z=size_z,
+            ordered_items=holes,
+            category=category,
+            model=model,
+        )
+
+        # 保存洞位的直径和深度
+        self.hole_diameter = hole_diameter
+        self.hole_depth = hole_depth
+        self.max_sheets_per_hole = max_sheets_per_hole
+
+    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,
+        }
 #是一种类型注解，不用self
 class BatteryState(TypedDict):
     """电池状态字典"""
@@ -412,19 +596,42 @@ class BatteryPressSlot(Resource):
     def get_battery_info(self, index: int) -> Battery:
         return self.children[0]
 
+# TODO:这个移液枪架子看一下从哪继承
+class TipBox64State(TypedDict):
+    """电池状态字典"""
+    tip_diameter: float = 5.0
+    tip_length: float = 50.0
+    with_tips: bool = True
 
-def TipBox64(
+class TipBox64(TipRack):
+    """64孔枪头盒类"""
+
+    children: List[TipSpot] = []
+    def __init__(
+        self,
         name: str,
         size_x: float = 127.8,
         size_y: float = 85.5,
         size_z: float = 60.0,
-        category: str = "tip_rack",
+        category: str = "tip_box_64",
         model: Optional[str] = None,
-):
+    ):
-    """64孔枪头盒类"""
+        """初始化64孔枪头盒
+
+        Args:
+            name: 枪头盒名称
+            size_x: 长度 (mm)
+            size_y: 宽度 (mm)
+            size_z: 高度 (mm)
+            tip_diameter: 枪头直径 (mm)
+            tip_length: 枪头长度 (mm)
+            category: 类别
+            model: 型号
+            with_tips: 是否带枪头
+        """
         from pylabrobot.resources.tip import Tip
 
-    # 创建12x8=96个枪头位
+        # 创建8x8=64个枪头位
         def make_tip():
             return Tip(
                 has_filter=False,
@@ -435,7 +642,7 @@ def TipBox64(
 
         tip_spots = create_ordered_items_2d(
             klass=TipSpot,
-        num_items_x=12,
+            num_items_x=8,
             num_items_y=8,
             dx=8.0,
             dy=8.0,
@@ -447,21 +654,18 @@ def TipBox64(
             size_z=0.0,
             make_tip=make_tip,
         )
-    idx_available = list(range(0, 32)) + list(range(64, 96))
+        self._unilabos_state: WasteTipBoxstate = WasteTipBoxstate()
-    tip_spots_available = {k: v for i, (k, v) in enumerate(tip_spots.items()) if i in idx_available}
+        super().__init__(
-    tip_rack = TipRack(
             name=name,
             size_x=size_x,
             size_y=size_y,
             size_z=size_z,
-        # ordered_items=tip_spots_available,
             ordered_items=tip_spots,
             category=category,
             model=model,
-        with_tips=False,
+            with_tips=True,
         )
-    tip_rack.set_tip_state([True]*32 + [False]*32 + [True]*32)  # 前32和后32个有枪头，中间32个无枪头
+
-    return tip_rack
 
 
 class WasteTipBoxstate(TypedDict):
@@ -479,12 +683,8 @@ class WasteTipBox(Trash):
         size_x: float = 127.8,
         size_y: float = 85.5,
         size_z: float = 60.0,
-        material_z_thickness=0,
+        category: str = "waste_tip_box",
-        max_volume=float("inf"),
+        model: Optional[str] = None,
-        category="trash",
-        model=None,
-        compute_volume_from_height=None,
-        compute_height_from_volume=None,
     ):
         """初始化废枪头盒
 
@@ -534,6 +734,253 @@ class WasteTipBox(Trash):
         return data
 
 
+class BottleRackState(TypedDict):
+    """     bottle_diameter: 瓶子直径 (mm)
+            bottle_height: 瓶子高度 (mm)
+            position_spacing: 位置间距 (mm)"""
+    bottle_diameter: float
+    bottle_height: float
+    name_to_index: dict
+
+
+
+class BottleRack(Resource):
+    """瓶架类 - 12个待配位置+12个已配位置"""
+    children: List[Resource] = []
+
+    def __init__(
+            self,
+            name: str,
+            size_x: float,
+            size_y: float,
+            size_z: float,
+            category: str = "bottle_rack",
+            model: Optional[str] = None,
+            num_items_x: int = 3,
+            num_items_y: int = 4,
+            position_spacing: float = 35.0,
+            orientation: str = "horizontal",
+            padding_x: float = 20.0,
+            padding_y: float = 20.0,
+    ):
+        """初始化瓶架
+
+        Args:
+            name: 瓶架名称
+            size_x: 长度 (mm)
+            size_y: 宽度 (mm)
+            size_z: 高度 (mm)
+            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: BottleRackState = BottleRackState(
+            bottle_diameter=30.0,
+            bottle_height=100.0,
+            position_spacing=position_spacing,
+            name_to_index={},
+        )
+        # 基于网格生成瓶位坐标映射（居中摆放）
+        # 使用内边距，避免点跑到容器外（前端渲染不按mm等比缩放时更稳妥）
+        origin_x = padding_x
+        origin_y = padding_y
+        self.index_to_pos = {}
+        for j in range(num_items_y):
+            for i in range(num_items_x):
+                idx = j * num_items_x + i
+                if orientation == "vertical":
+                    # 纵向：沿 y 方向优先排列
+                    self.index_to_pos[idx] = Coordinate(
+                        x=origin_x + j * position_spacing,
+                        y=origin_y + i * position_spacing,
+                        z=0,
+                    )
+                else:
+                    # 横向（默认）：沿 x 方向优先排列
+                    self.index_to_pos[idx] = Coordinate(
+                        x=origin_x + i * position_spacing,
+                        y=origin_y + j * position_spacing,
+                        z=0,
+                    )
+        self.name_to_index = {}
+        self.name_to_pos = {}
+        self.num_items_x = num_items_x
+        self.num_items_y = num_items_y
+        self.orientation = orientation
+        self.padding_x = padding_x
+        self.padding_y = padding_y
+
+    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
+
+    # TODO: 这里有些问题要重新写一下
+    def assign_child_resource_old(self, resource: Resource, location=Coordinate.zero(), reassign=True):
+        capacity = self.num_items_x * self.num_items_y
+        assert len(self.children) < capacity, "瓶架已满，无法添加更多瓶子"
+        index = len(self.children)
+        location = self.index_to_pos.get(index, Coordinate.zero())
+        self.name_to_pos[resource.name] = location
+        self.name_to_index[resource.name] = index
+        return super().assign_child_resource(resource, location, reassign)
+
+    def assign_child_resource(self, resource: Resource, index: int):
+        capacity = self.num_items_x * self.num_items_y
+        assert 0 <= index < capacity, "无效的瓶子索引"
+        self.name_to_index[resource.name] = index
+        location = self.index_to_pos[index]
+        return super().assign_child_resource(resource, location)
+
+    def unassign_child_resource(self, resource: Bottle):
+        super().unassign_child_resource(resource)
+        self.index_to_pos.pop(self.name_to_index.pop(resource.name, None), None)
+
+    def serialize(self) -> dict:
+        return {
+            **super().serialize(),
+            "num_items_x": self.num_items_x,
+            "num_items_y": self.num_items_y,
+            "position_spacing": self._unilabos_state.get("position_spacing", 35.0),
+            "orientation": self.orientation,
+            "padding_x": self.padding_x,
+            "padding_y": self.padding_y,
+        }
+
+class BottleState(TypedDict):
+    diameter: float
+    height: float
+    electrolyte_name: str
+    electrolyte_volume: float
+    max_volume: float
+
+class Bottle(Resource):
+    """瓶子类 - 容纳电解液"""
+
+    def __init__(
+        self,
+        name: str,
+        category: str = "bottle",
+    ):
+        """初始化瓶子
+
+        Args:
+            name: 瓶子名称
+            diameter: 直径 (mm)
+            height: 高度 (mm)
+            max_volume: 最大体积 (μL)
+            barcode: 二维码
+            category: 类别
+            model: 型号
+        """
+        super().__init__(
+            name=name,
+            size_x=1,
+            size_y=1,
+            size_z=1,
+            category=category,
+        )
+        self._unilabos_state: BottleState = BottleState()
+    
+    def aspirate_electrolyte(self, volume: float) -> bool:
+        current_volume = self._unilabos_state["electrolyte_volume"]
+        assert current_volume > volume, f"Cannot aspirate {volume}μL, only {current_volume}μL available."
+        self._unilabos_state["electrolyte_volume"] -= volume
+        return True
+
+    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
+
+class ClipMagazine_four(ItemizedResource[ClipMagazineHole]):
+    """子弹夹类 - 有4个洞位，每个洞位放多个极片"""
+    children: List[ClipMagazineHole]
+    def __init__(
+        self,
+        name: str,
+        size_x: float,
+        size_y: float,
+        size_z: float,
+        hole_diameter: float = 14.0,
+        hole_depth: float = 10.0,
+        hole_spacing: float = 25.0,
+        max_sheets_per_hole: int = 100,
+        category: str = "clip_magazine_four",
+        model: Optional[str] = None,
+    ):
+        """初始化子弹夹
+
+        Args:
+            name: 子弹夹名称
+            size_x: 长度 (mm)
+            size_y: 宽度 (mm)
+            size_z: 高度 (mm)
+            hole_diameter: 洞直径 (mm)
+            hole_depth: 洞深度 (mm)
+            hole_spacing: 洞位间距 (mm)
+            max_sheets_per_hole: 每个洞位最大极片数量
+            category: 类别
+            model: 型号
+        """
+        # 创建4个洞位，排成2x2布局
+        holes = create_ordered_items_2d(
+            klass=ClipMagazineHole,
+            num_items_x=2,
+            num_items_y=2,
+            dx=(size_x - 2 * hole_spacing) / 2,  # 居中
+            dy=(size_y - hole_spacing) / 2,     # 居中
+            dz=size_z - 0,
+            item_dx=hole_spacing,
+            item_dy=hole_spacing,
+            diameter=hole_diameter,
+            depth=hole_depth,
+        )
+
+        super().__init__(
+            name=name,
+            size_x=size_x,
+            size_y=size_y,
+            size_z=size_z,
+            ordered_items=holes,
+            category=category,
+            model=model,
+        )
+
+        # 保存洞位的直径和深度
+        self.hole_diameter = hole_diameter
+        self.hole_depth = hole_depth
+        self.max_sheets_per_hole = max_sheets_per_hole
+
+    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,
+        }
+
 class CoincellDeck(Deck):
     """纽扣电池组装工作站台面类"""
 
@@ -572,69 +1019,150 @@ class CoincellDeck(Deck):
     def setup(self) -> None:
         """设置工作站的标准布局 - 包含子弹夹、料盘、瓶架等完整配置"""
         # ====================================== 子弹夹 ============================================
+        zip_dan_jia = ClipMagazine_four("zi_dan_jia", 80, 80, 10)
+        self.assign_child_resource(zip_dan_jia, Coordinate(x=1400, y=50, z=0))
+        zip_dan_jia2 = ClipMagazine_four("zi_dan_jia2", 80, 80, 10)
+        self.assign_child_resource(zip_dan_jia2, Coordinate(x=1600, y=200, z=0))
+        zip_dan_jia3 = ClipMagazine("zi_dan_jia3", 80, 80, 10)
+        self.assign_child_resource(zip_dan_jia3, Coordinate(x=1500, y=200, z=0))
+        zip_dan_jia4 = ClipMagazine("zi_dan_jia4", 80, 80, 10)
+        self.assign_child_resource(zip_dan_jia4, Coordinate(x=1500, y=300, z=0))
+        zip_dan_jia5 = ClipMagazine("zi_dan_jia5", 80, 80, 10)
+        self.assign_child_resource(zip_dan_jia5, Coordinate(x=1600, y=300, z=0))
+        zip_dan_jia6 = ClipMagazine("zi_dan_jia6", 80, 80, 10)
+        self.assign_child_resource(zip_dan_jia6, Coordinate(x=1530, y=500, z=0))
+        zip_dan_jia7 = ClipMagazine("zi_dan_jia7", 80, 80, 10)
+        self.assign_child_resource(zip_dan_jia7, Coordinate(x=1180, y=400, z=0))
+        zip_dan_jia8 = ClipMagazine("zi_dan_jia8", 80, 80, 10)
+        self.assign_child_resource(zip_dan_jia8, Coordinate(x=1280, y=400, z=0))
         
-        # 正极片（4个洞位，2x2布局）
+        # 为子弹夹添加极片
-        zhengji_zip = MagazineHolder_4_Cathode("正极&铝箔弹夹")
+        for i in range(4):
-        self.assign_child_resource(zhengji_zip, Coordinate(x=2799.0, y=356.0, z=0))
+            jipian = ElectrodeSheet(name=f"zi_dan_jia_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
-        
+            zip_dan_jia2.children[i].assign_child_resource(jipian, location=None)
-        # 正极壳、平垫片（6个洞位，2x2+2布局）
+        for i in range(4):
-        zhengjike_zip = MagazineHolder_6_Cathode("正极壳&平垫片弹夹")
+            jipian2 = ElectrodeSheet(name=f"zi_dan_jia2_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
-        self.assign_child_resource(zhengjike_zip, Coordinate(x=2586.0, y=1143.0, z=0))
+            zip_dan_jia.children[i].assign_child_resource(jipian2, location=None)
-        
+        for i in range(6):
-        # 负极壳、弹垫片（6个洞位，2x2+2布局）
+            jipian3 = ElectrodeSheet(name=f"zi_dan_jia3_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
-        fujike_zip = MagazineHolder_6_Anode("负极壳&弹垫片弹夹")
+            zip_dan_jia3.children[i].assign_child_resource(jipian3, location=None)
-        self.assign_child_resource(fujike_zip, Coordinate(x=2492.0, y=1144.0, z=0))
+        for i in range(6):
-        
+            jipian4 = ElectrodeSheet(name=f"zi_dan_jia4_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
-        # 成品弹夹（6个洞位，3x2布局）
+            zip_dan_jia4.children[i].assign_child_resource(jipian4, location=None)
-        chengpindanjia_zip = MagazineHolder_6_Battery("成品弹夹")
+        for i in range(6):
-        self.assign_child_resource(chengpindanjia_zip, Coordinate(x=3112.0, y=1295.0, z=0))
+            jipian5 = ElectrodeSheet(name=f"zi_dan_jia5_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
+            zip_dan_jia5.children[i].assign_child_resource(jipian5, location=None)
+        for i in range(6):
+            jipian6 = ElectrodeSheet(name=f"zi_dan_jia6_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
+            zip_dan_jia6.children[i].assign_child_resource(jipian6, location=None)
+        for i in range(6):
+            jipian7 = ElectrodeSheet(name=f"zi_dan_jia7_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
+            zip_dan_jia7.children[i].assign_child_resource(jipian7, location=None)
+        for i in range(6):
+            jipian8 = ElectrodeSheet(name=f"zi_dan_jia8_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
+            zip_dan_jia8.children[i].assign_child_resource(jipian8, location=None)
         
         # ====================================== 物料板 ============================================
-        # 创建物料板（料盘carrier）- 4x4布局
+        # 创建6个4*4的物料板
-        # 负极料盘
+        liaopan1 = MaterialPlate(name="liaopan1", size_x=120, size_y=100, size_z=10.0, fill=True)
-        fujiliaopan = MaterialPlate(name="负极料盘", size_x=120, size_y=100, size_z=10.0, fill=True)
+        self.assign_child_resource(liaopan1, Coordinate(x=1010, y=50, z=0))
-        self.assign_child_resource(fujiliaopan, Coordinate(x=2107.0, y=304.0, z=0))
+        for i in range(16):
-        # for i in range(16):
+            jipian_1 = ElectrodeSheet(name=f"{liaopan1.name}_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
-        #     fujipian = ElectrodeSheet(name=f"{fujiliaopan.name}_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
+            liaopan1.children[i].assign_child_resource(jipian_1, location=None)
-        #     fujiliaopan.children[i].assign_child_resource(fujipian, location=None)
 
-        # 隔膜料盘
+        liaopan2 = MaterialPlate(name="liaopan2", size_x=120, size_y=100, size_z=10.0, fill=True)
-        gemoliaopan = MaterialPlate(name="隔膜料盘", size_x=120, size_y=100, size_z=10.0, fill=True)
+        self.assign_child_resource(liaopan2, Coordinate(x=1130, y=50, z=0))
-        self.assign_child_resource(gemoliaopan, Coordinate(x=2107.0, y=146.0, z=0))
+
-        # for i in range(16):
+        liaopan3 = MaterialPlate(name="liaopan3", size_x=120, size_y=100, size_z=10.0, fill=True)
-        #     gemopian = ElectrodeSheet(name=f"{gemoliaopan.name}_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
+        self.assign_child_resource(liaopan3, Coordinate(x=1250, y=50, z=0))
-        #     gemoliaopan.children[i].assign_child_resource(gemopian, location=None)
+
+        liaopan4 = MaterialPlate(name="liaopan4", size_x=120, size_y=100, size_z=10.0, fill=True)
+        self.assign_child_resource(liaopan4, Coordinate(x=1010, y=150, z=0))
+        for i in range(16):
+            jipian_4 = ElectrodeSheet(name=f"{liaopan4.name}_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
+            liaopan4.children[i].assign_child_resource(jipian_4, location=None)
+            
+        liaopan5 = MaterialPlate(name="liaopan5", size_x=120, size_y=100, size_z=10.0, fill=True)
+        self.assign_child_resource(liaopan5, Coordinate(x=1130, y=150, z=0))
+        
+        liaopan6 = MaterialPlate(name="liaopan6", size_x=120, size_y=100, size_z=10.0, fill=True)
+        self.assign_child_resource(liaopan6, Coordinate(x=1250, y=150, z=0))
         
         # ====================================== 瓶架、移液枪 ============================================
         # 在台面上放置 3x4 瓶架、6x2 瓶架 与 64孔移液枪头盒
-        # 奔耀上料5ml分液瓶小板 - 由奔曜跨站转运而来，不单独写，但是这里应该有一个堆栈用于摆放分液瓶小板
+        bottle_rack_3x4 = BottleRack(
+            name="bottle_rack_3x4",
+            size_x=210.0,
+            size_y=140.0,
+            size_z=100.0,
+            num_items_x=3,
+            num_items_y=4,
+            position_spacing=35.0,
+            orientation="vertical",
+        )
+        self.assign_child_resource(bottle_rack_3x4, Coordinate(x=100, y=200, z=0))
 
-        # bottle_rack_3x4 = BottleRack(
+        bottle_rack_6x2 = BottleRack(
-        #     name="bottle_rack_3x4",
+            name="bottle_rack_6x2",
-        #     size_x=210.0,
+            size_x=120.0,
-        #     size_y=140.0,
+            size_y=250.0,
-        #     size_z=100.0,
+            size_z=100.0,
-        #     num_items_x=2,
+            num_items_x=6,
-        #     num_items_y=4,
+            num_items_y=2,
-        #     position_spacing=35.0,
+            position_spacing=35.0,
-        #     orientation="vertical",
+            orientation="vertical",
-        # )
+        )
-        # self.assign_child_resource(bottle_rack_3x4, Coordinate(x=1542.0, y=717.0, z=0))
-        
-        # 电解液缓存位 - 6x2布局
-        bottle_rack_6x2 = YIHUA_Electrolyte_12VialCarrier(name="bottle_rack_6x2")
         self.assign_child_resource(bottle_rack_6x2, Coordinate(x=300, y=300, z=0))
-        # 电解液回收位6x2
+
-        bottle_rack_6x2_2 = YIHUA_Electrolyte_12VialCarrier(name="bottle_rack_6x2_2")
+        bottle_rack_6x2_2 = BottleRack(
-        self.assign_child_resource(bottle_rack_6x2_2, Coordinate(x=1765.0, y=869.0, z=0))
+            name="bottle_rack_6x2_2",
+            size_x=120.0,
+            size_y=250.0,
+            size_z=100.0,
+            num_items_x=6,
+            num_items_y=2,
+            position_spacing=35.0,
+            orientation="vertical",
+        )
+        self.assign_child_resource(bottle_rack_6x2_2, Coordinate(x=430, y=300, z=0))
+
+        # 将 ElectrodeSheet 放满 3x4 与 6x2 的所有孔位
+        for idx in range(bottle_rack_3x4.num_items_x * bottle_rack_3x4.num_items_y):
+            sheet = ElectrodeSheet(name=f"sheet_3x4_{idx}", size_x=12, size_y=12, size_z=0.1)
+            bottle_rack_3x4.assign_child_resource(sheet, index=idx)
+
+        for idx in range(bottle_rack_6x2.num_items_x * bottle_rack_6x2.num_items_y):
+            sheet = ElectrodeSheet(name=f"sheet_6x2_{idx}", size_x=12, size_y=12, size_z=0.1)
+            bottle_rack_6x2.assign_child_resource(sheet, index=idx)
 
         tip_box = TipBox64(name="tip_box_64")
-        self.assign_child_resource(tip_box, Coordinate(x=1938.0, y=743.0, z=0))
+        self.assign_child_resource(tip_box, Coordinate(x=300, y=100, z=0))
 
         waste_tip_box = WasteTipBox(name="waste_tip_box")
-        self.assign_child_resource(waste_tip_box, Coordinate(x=1960.0, y=639.0, z=0))
+        self.assign_child_resource(waste_tip_box, Coordinate(x=300, y=200, z=0))
+        
+        print(self)
+
+
+def create_coin_cell_deck(name: str = "coin_cell_deck", size_x: float = 1000.0, size_y: float = 1000.0, size_z: float = 900.0) -> CoincellDeck:
+    """创建并配置标准的纽扣电池组装工作站台面
+    
+    Args:
+        name: 台面名称
+        size_x: 长度 (mm)
+        size_y: 宽度 (mm)
+        size_z: 高度 (mm)
+    
+    Returns:
+        已配置好的 CoincellDeck 对象
+    """
+    # 创建 CoincellDeck 实例并自动执行 setup 配置
+    deck = CoincellDeck(name=name, size_x=size_x, size_y=size_y, size_z=size_z, setup=True)
+    return deck
 
 
 if __name__ == "__main__":
     deck = create_coin_cell_deck()
     print(deck)
+
+