diff --git a/unilabos/resources/bioyond/YB_warehouses.py b/unilabos/resources/bioyond/YB_warehouses.py index 7461f3d..7b3ab51 100644 --- a/unilabos/resources/bioyond/YB_warehouses.py +++ b/unilabos/resources/bioyond/YB_warehouses.py @@ -83,13 +83,13 @@ def bioyond_warehouse_reagent_storage(name: str) -> WareHouse: category="warehouse", ) -def bioyond_warehouse_tipbox_storage_left(name: str) -> WareHouse: - """创建BioYond站内Tip盒堆栈左侧部分(A02~B03),2列2行""" +def bioyond_warehouse_tipbox_storage(name: str) -> WareHouse: + """创建BioYond站内Tip盒堆栈(A01~B03, 2行×3列)""" return warehouse_factory( name=name, - num_items_x=2, # 2列 - num_items_y=2, # 2行(A-B) - num_items_z=1, # 1层 + num_items_x=3, # 3列(01-03) + num_items_y=2, # 2行(A-B) + num_items_z=1, # 1层 dx=10.0, dy=10.0, dz=10.0, @@ -97,25 +97,7 @@ def bioyond_warehouse_tipbox_storage_left(name: str) -> WareHouse: item_dy=96.0, item_dz=120.0, category="warehouse", - col_offset=1, # 从02开始: A02, A03 - layout="row-major", - ) - -def bioyond_warehouse_tipbox_storage_right(name: str) -> WareHouse: - """创建BioYond站内Tip盒堆栈右侧部分(A01~B01),1列2行""" - return warehouse_factory( - name=name, - num_items_x=1, # 1列 - num_items_y=2, # 2行(A-B) - 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", - col_offset=0, # 从01开始: A01 + col_offset=0, layout="row-major", ) diff --git a/unilabos/resources/bioyond/decks.py b/unilabos/resources/bioyond/decks.py index d70d4a4..5f3b2c4 100644 --- a/unilabos/resources/bioyond/decks.py +++ b/unilabos/resources/bioyond/decks.py @@ -18,9 +18,11 @@ from unilabos.resources.bioyond.YB_warehouses import ( bioyond_warehouse_1x8x4, bioyond_warehouse_reagent_storage, # bioyond_warehouse_liquid_preparation, + bioyond_warehouse_density_vial, +) +from unilabos.resources.bioyond.warehouses import ( bioyond_warehouse_tipbox_storage_left, # 新增:Tip盒堆栈(左) bioyond_warehouse_tipbox_storage_right, # 新增:Tip盒堆栈(右) - bioyond_warehouse_density_vial, )