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 ce199b2b..498c795c 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 @@ -1087,9 +1087,9 @@ class BioyondCellWorkstation(BioyondWorkstation): for idx, item in enumerate(formulation): materials = item.get("materials", []) + item.get("liquids", []) # 兼容两种物料列表命名 if idx < len(order_names) and order_names[idx]: - order_name = order_names[idx] + order_name = str(order_names[idx]) else: - order_name = item.get("order_name", f"{batch_id}_order_{idx + 1}") + order_name = str(item.get("order_name", f"{batch_id}_order_{idx + 1}")) mats: List[Dict[str, Any]] = [] total_mass = 0.0 @@ -1104,7 +1104,10 @@ class BioyondCellWorkstation(BioyondWorkstation): logger.warning(f"[create_orders_formulation] 第 {idx + 1} 个配方无有效物料,跳过") continue - raw_mix_time = mix_time[idx] if idx < len(mix_time) else None + if isinstance(mix_time, (int, float)): + raw_mix_time = mix_time + else: + raw_mix_time = mix_time[idx] if idx < len(mix_time) else None try: item_mix_time = int(raw_mix_time) if raw_mix_time not in (None, "", "null") else 0 except (ValueError, TypeError): diff --git a/unilabos/resources/bioyond/YB_bottles.py b/unilabos/resources/bioyond/YB_bottles.py index 54f3e2a9..60163881 100644 --- a/unilabos/resources/bioyond/YB_bottles.py +++ b/unilabos/resources/bioyond/YB_bottles.py @@ -131,7 +131,7 @@ def YB_PrepBottle_15mL( name: str, diameter: float = 35.0, height: float = 60.0, - max_volume: float = 30000.0, # 30mL + max_volume: float = 15000.0, # 15mL barcode: str = None, ) -> Bottle: """创建配液瓶(小)""" @@ -149,7 +149,7 @@ def YB_PrepBottle_60mL( name: str, diameter: float = 55.0, height: float = 100.0, - max_volume: float = 150000.0, # 150mL + max_volume: float = 60000.0, # 60mL barcode: str = None, ) -> Bottle: """创建配液瓶(大)"""