From 538891fcbea5e02335ab3a9753e673170c3b24e4 Mon Sep 17 00:00:00 2001 From: dijkstra402 Date: Sun, 9 Nov 2025 17:04:52 +0800 Subject: [PATCH] Update YB resources: add YB_ prefix to models and update deck configurations --- .../bioyond_cell/2025092701.xlsx | Bin 18162 -> 17833 bytes .../bioyond_cell/bioyond_cell_workstation.py | 3 +- .../workstation/bioyond_studio/config.py | 2 +- .../coin_cell_assembly/coin_cell_assembly.py | 2 +- .../registry/resources/bioyond/YB_bottle.yaml | 26 ++++++++ .../resources/bioyond/YB_bottle_carriers.yaml | 58 +++++++++--------- .../resources/bioyond/YB_bottle_carriers.py | 4 +- unilabos/resources/bioyond/YB_bottles.py | 2 +- unilabos/resources/bioyond/decks.py | 12 ++-- 9 files changed, 66 insertions(+), 43 deletions(-) diff --git a/unilabos/devices/workstation/bioyond_studio/bioyond_cell/2025092701.xlsx b/unilabos/devices/workstation/bioyond_studio/bioyond_cell/2025092701.xlsx index 9d0696191d2c76ff1788e485ed89d498ebf0f503..5db039c6203fca0056bb6dfb2af945f2ad81d930 100644 GIT binary patch delta 135 zcmey=%eblRTHF>-0OGcy33)P}n84Wl8(Pm^~G@ATR z*Jkp29sbFldJ2;_>3aj^|LL2Hav^k2ws#FR)60|-knFfdGZbdZ?5UG*iS@#ckUQLI4fk2WLI*?7>y@e>*)y<<(DfI*(w<;+1Vt67>>r1gSC~ljg=HiY?X>jih$x}b}j)%21cd^ zmPY0V21YjeWp+0D$x!vq#*-InD+3KHR2QCnLt9h0G{+y&Hw-a diff --git a/unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_cell_workstation.py b/unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_cell_workstation.py index 5ca2bb0f..fbedd266 100644 --- a/unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_cell_workstation.py +++ b/unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_cell_workstation.py @@ -595,7 +595,8 @@ class BioyondCellWorkstation(BioyondWorkstation): print(f"[create_orders] ⚠️ 第 {idx+1} 行未找到有效物料") orders.append(order_data) - + print("================================================") + print("orders:", orders) print(f"[create_orders] 即将提交订单数量: {len(orders)}") response = self._post_lims("/api/lims/order/orders", orders) diff --git a/unilabos/devices/workstation/bioyond_studio/config.py b/unilabos/devices/workstation/bioyond_studio/config.py index 9606c788..b2aed016 100644 --- a/unilabos/devices/workstation/bioyond_studio/config.py +++ b/unilabos/devices/workstation/bioyond_studio/config.py @@ -237,7 +237,7 @@ MATERIAL_TYPE_MAPPINGS = { "100ml液体": ("YB_100ml_yeti", "d37166b3-ecaa-481e-bd84-3032b795ba07"), "液": ("YB_ye", "3a190ca1-2add-2b23-f8e1-bbd348b7f790"), "高粘液": ("YB_gaonianye", "abe8df30-563d-43d2-85e0-cabec59ddc16"), - "加样头(大)": ("YB_jia_yang_tou_da", "3a190ca0-b2f6-9aeb-8067-547e72c11469"), + "加样头(大)": ("YB_jia_yang_tou_da_Carrier", "3a190ca0-b2f6-9aeb-8067-547e72c11469"), # "加样头(大)板": ("YB_jia_yang_tou_da", "a8e714ae-2a4e-4eb9-9614-e4c140ec3f16"), "5ml分液瓶板": ("YB_5ml_fenyepingban", "3a192fa4-007d-ec7b-456e-2a8be7a13f23"), "5ml分液瓶": ("YB_5ml_fenyeping", "3a192c2a-ebb7-58a1-480d-8b3863bf74f4"), diff --git a/unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly.py b/unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly.py index 8c2cf5f1..bd30de05 100644 --- a/unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly.py +++ b/unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly.py @@ -112,7 +112,7 @@ class CoinCellAssemblyWorkstation(WorkstationBase): def __init__(self, config: dict = None, deck=None, - address: str = "172.21.33.176", + address: str = "172.16.28.102", port: str = "502", debug_mode: bool = False, *args, diff --git a/unilabos/registry/resources/bioyond/YB_bottle.yaml b/unilabos/registry/resources/bioyond/YB_bottle.yaml index 7cafab48..87a335b6 100644 --- a/unilabos/registry/resources/bioyond/YB_bottle.yaml +++ b/unilabos/registry/resources/bioyond/YB_bottle.yaml @@ -63,3 +63,29 @@ YB_pei_ye_xiao_Bottle: init_param_schema: {} registry_type: resource version: 1.0.0 +YB_jia_yang_tou_da: + category: + - yb3 + - YB_bottle + class: + module: unilabos.resources.bioyond.YB_bottles:YB_jia_yang_tou_da + type: pylabrobot + description: YB_jia_yang_tou_da + handles: [] + icon: '' + init_param_schema: {} + registry_type: resource + version: 1.0.0 +YB_ye_Bottle: + category: + - yb3 + - YB_bottle_carriers + class: + module: unilabos.resources.bioyond.YB_bottles:YB_ye_Bottle + type: pylabrobot + description: YB_ye_Bottle + handles: [] + icon: '' + init_param_schema: {} + registry_type: resource + version: 1.0.0 \ No newline at end of file diff --git a/unilabos/registry/resources/bioyond/YB_bottle_carriers.yaml b/unilabos/registry/resources/bioyond/YB_bottle_carriers.yaml index a387ca64..2c0c6f0b 100644 --- a/unilabos/registry/resources/bioyond/YB_bottle_carriers.yaml +++ b/unilabos/registry/resources/bioyond/YB_bottle_carriers.yaml @@ -11,19 +11,19 @@ YB_100ml_yeti: init_param_schema: {} registry_type: resource version: 1.0.0 -YB_1BottleCarrier: - category: - - yb3 - - YB_bottle_carriers - class: - module: unilabos.resources.bioyond.YB_bottle_carriers:YB_1BottleCarrier - type: pylabrobot - description: YB_1BottleCarrier - handles: [] - icon: '' - init_param_schema: {} - registry_type: resource - version: 1.0.0 +# YB_1BottleCarrier: +# category: +# - yb3 +# - YB_bottle_carriers +# class: +# module: unilabos.resources.bioyond.YB_bottle_carriers:YB_1BottleCarrier +# type: pylabrobot +# description: YB_1BottleCarrier +# handles: [] +# icon: '' +# init_param_schema: {} +# registry_type: resource +# version: 1.0.0 YB_gaonianye: category: - yb3 @@ -154,19 +154,19 @@ YB_gao_nian_ye_Bottle: init_param_schema: {} registry_type: resource version: 1.0.0 -YB_jia_yang_tou_da: - category: - - yb3 - - YB_bottle_carriers - class: - module: unilabos.resources.bioyond.YB_bottles:YB_jia_yang_tou_da - type: pylabrobot - description: YB_jia_yang_tou_da - handles: [] - icon: '' - init_param_schema: {} - registry_type: resource - version: 1.0.0 +# YB_jia_yang_tou_da: +# category: +# - yb3 +# - YB_bottle_carriers +# class: +# module: unilabos.resources.bioyond.YB_bottles:YB_jia_yang_tou_da +# type: pylabrobot +# description: YB_jia_yang_tou_da +# handles: [] +# icon: '' +# init_param_schema: {} +# registry_type: resource +# version: 1.0.0 YB_jia_yang_tou_da_Carrier: category: - yb3 @@ -193,14 +193,14 @@ YB_ye_100ml_Bottle: init_param_schema: {} registry_type: resource version: 1.0.0 -YB_ye_Bottle: +YB_ye: category: - yb3 - YB_bottle_carriers class: - module: unilabos.resources.bioyond.YB_bottles:YB_ye_Bottle + module: unilabos.resources.bioyond.YB_bottle_carriers:YB_ye type: pylabrobot - description: YB_ye_Bottle + description: YB_ye_Bottle_Carrier handles: [] icon: '' init_param_schema: {} diff --git a/unilabos/resources/bioyond/YB_bottle_carriers.py b/unilabos/resources/bioyond/YB_bottle_carriers.py index 28c8fcc1..29a53242 100644 --- a/unilabos/resources/bioyond/YB_bottle_carriers.py +++ b/unilabos/resources/bioyond/YB_bottle_carriers.py @@ -206,7 +206,7 @@ def YB_6VialCarrier(name: str) -> BottleCarrier: return carrier # 1瓶载架 - 单个中央位置 -def YB_1BottleCarrier(name: str) -> BottleCarrier: +def YB_ye(name: str) -> BottleCarrier: # 载架尺寸 (mm) carrier_size_x = 127.8 @@ -233,7 +233,7 @@ def YB_1BottleCarrier(name: str) -> BottleCarrier: resource_size_y=beaker_diameter, name_prefix=name, ), - model="YB_1BottleCarrier", + model="YB_ye", ) carrier.num_items_x = 1 carrier.num_items_y = 1 diff --git a/unilabos/resources/bioyond/YB_bottles.py b/unilabos/resources/bioyond/YB_bottles.py index c8f1c950..acbbf35b 100644 --- a/unilabos/resources/bioyond/YB_bottles.py +++ b/unilabos/resources/bioyond/YB_bottles.py @@ -33,7 +33,7 @@ def YB_ye_Bottle( height=height, max_volume=max_volume, barcode=barcode, - model="Liquid_Bottle", + model="YB_ye_Bottle", ) """100ml液体""" diff --git a/unilabos/resources/bioyond/decks.py b/unilabos/resources/bioyond/decks.py index e9d7593f..98970a1c 100644 --- a/unilabos/resources/bioyond/decks.py +++ b/unilabos/resources/bioyond/decks.py @@ -89,11 +89,9 @@ class BIOYOND_YB_Deck(Deck): "自动堆栈-右": bioyond_warehouse_2x2x1("自动堆栈-右"), "手动堆栈-左": bioyond_warehouse_3x5x1("手动堆栈-左"), "手动堆栈-右": bioyond_warehouse_3x5x1("手动堆栈-右"), - "粉末加样头堆栈-左": bioyond_warehouse_10x1x1("粉末加样头堆栈-左"), - "粉末加样头堆栈-右": bioyond_warehouse_10x1x1("粉末加样头堆栈-右"), + "粉末加样头堆栈": bioyond_warehouse_20x1x1("粉末加样头堆栈"), "配液站内试剂仓库": bioyond_warehouse_3x3x1("配液站内试剂仓库"), - "试剂替换仓库-左": bioyond_warehouse_5x1x1("试剂替换仓库-左"), - "试剂替换仓库-右": bioyond_warehouse_5x1x1("试剂替换仓库-右"), + "试剂替换仓库": bioyond_warehouse_10x1x1("试剂替换仓库"), } # warehouse 的位置 self.warehouse_locations = { @@ -101,11 +99,9 @@ class BIOYOND_YB_Deck(Deck): "自动堆栈-右": Coordinate(4160.0, 158.0, 0.0), "手动堆栈-左": Coordinate(-400.0, 877.0, 0.0), "手动堆栈-右": Coordinate(4160.0, 877.0, 0.0), - "粉末加样头堆栈-左": Coordinate(415.0, 1301.0, 0.0), - "粉末加样头堆栈-右": Coordinate(2200.0, 1304.0, 0.0), + "粉末加样头堆栈": Coordinate(415.0, 1301.0, 0.0), "配液站内试剂仓库": Coordinate(2162.0, 337.0, 0.0), - "试剂替换仓库-左": Coordinate(1173.0, 702.0, 0.0), - "试剂替换仓库-右": Coordinate(2721.0, 739.0, 0.0), + "试剂替换仓库": Coordinate(1173.0, 702.0, 0.0), } for warehouse_name, warehouse in self.warehouses.items():