mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2025-12-17 21:11:12 +00:00
HR物料同步，前端展示位置修复 (#135)
* 更新Bioyond工作站配置，添加新的物料类型映射和载架定义，优化物料查询逻辑 * 添加Bioyond实验配置文件，定义物料类型映射和设备配置 * 更新bioyond_warehouse_reagent_stack方法，修正试剂堆栈尺寸和布局描述 * 更新Bioyond实验配置，修正物料类型映射，优化设备配置 * 更新Bioyond资源同步逻辑，优化物料入库流程，增强错误处理和日志记录 * 更新Bioyond资源，添加配液站和反应站专用载架，优化仓库工厂函数的排序方式 * 更新Bioyond资源，添加配液站和反应站相关载架，优化试剂瓶和样品瓶配置 * 更新Bioyond实验配置，修正试剂瓶载架ID，确保与设备匹配 * 更新Bioyond资源，移除反应站单烧杯载架，添加反应站单烧瓶载架分类 * Refactor Bioyond resource synchronization and update bottle carrier definitions - Removed traceback printing in error handling for Bioyond synchronization. - Enhanced logging for existing Bioyond material ID usage during synchronization. - Added new bottle carrier definitions for single flask and updated existing ones. - Refactored dispensing station and reaction station bottle definitions for clarity and consistency. - Improved resource mapping and error handling in graphio for Bioyond resource conversion. - Introduced layout parameter in warehouse factory for better warehouse configuration. * 更新Bioyond仓库工厂，添加排序方式支持，优化坐标计算逻辑 * 更新Bioyond载架和甲板配置，调整样品板尺寸和仓库坐标 * 更新Bioyond资源同步，增强占用位置日志信息，修正坐标转换逻辑 * 更新Bioyond反应站和分配站配置，调整材料类型映射和ID，移除不必要的项 * support name change during materials change * fix json dumps * correct tip * 优化调度器API路径，更新相关方法描述 * 更新 BIOYOND 载架相关文档，调整 API 以支持自带试剂瓶的载架类型，修复资源获取时的子物料处理逻辑 * 实现资源删除时的同步处理，优化出库操作逻辑 * 修复 ItemizedCarrier 中的可见性逻辑 * 保存 Bioyond 原始信息到 unilabos_extra，以便出库时查询 * 根据 resource.capacity 判断是试剂瓶（载架）还是多瓶载架，走不同的奔曜转换 * Fix bioyond bottle_carriers ordering * 优化 Bioyond 物料同步逻辑，增强坐标解析和位置更新处理 * disable slave connect websocket * correct remove_resource stats * change uuid logger to trace level * enable slave mode * refactor(bioyond): 统一资源命名并优化物料同步逻辑 - 将DispensingStation和ReactionStation资源统一为PolymerStation命名 - 优化物料同步逻辑，支持耗材类型(typeMode=0)的查询 - 添加物料默认参数配置功能 - 调整仓库坐标布局 - 清理废弃资源定义 * feat(warehouses): 为仓库函数添加col_offset和layout参数 * refactor: 更新实验配置中的物料类型映射命名 将DispensingStation和ReactionStation的物料类型映射统一更名为PolymerStation，保持命名一致性 * fix: 更新实验配置中的载体名称从6VialCarrier到6StockCarrier * feat(bioyond): 实现物料创建与入库分离逻辑 将物料同步流程拆分为两个独立阶段：transfer阶段只创建物料，add阶段执行入库 简化状态检查接口，仅返回连接状态 * fix(reaction_station): 修正液体进料烧杯体积单位并增强返回结果 将液体进料烧杯的体积单位从μL改为g以匹配实际使用场景 在返回结果中添加merged_workflow和order_params字段，提供更完整的工作流信息 * feat(dispensing_station): 在任务创建返回结果中添加order_params信息 在create_order方法返回结果中增加order_params字段，以便调用方获取完整的任务参数 * fix(dispensing_station): 修改90%物料分配逻辑从分成3份改为直接使用 原逻辑将主称固体平均分成3份作为90%物料，现改为直接使用main_portion * feat(bioyond): 添加任务编码和任务ID的输出，支持批量任务创建后的状态监控 * refactor(registry): 简化设备配置中的任务结果处理逻辑 将多个单独的任务编码和ID字段合并为统一的return_info字段 更新相关描述以反映新的数据结构 * feat(工作站): 添加HTTP报送服务和任务完成状态跟踪 - 在graphio.py中添加API必需字段 - 实现工作站HTTP服务启动和停止逻辑 - 添加任务完成状态跟踪字典和等待方法 - 重写任务完成报送处理方法记录状态 - 支持批量任务完成等待和报告获取 * refactor(dispensing_station): 移除wait_for_order_completion_and_get_report功能 该功能已被wait_for_multiple_orders_and_get_reports替代，简化代码结构 * fix: 更新任务报告API错误 * fix(workstation_http_service): 修复状态查询中device_id获取逻辑 处理状态查询时安全获取device_id，避免因属性不存在导致的异常 * fix(bioyond_studio): 改进物料入库失败时的错误处理和日志记录 在物料入库API调用失败时，添加更详细的错误信息打印 同时修正station.py中对空响应和失败情况的判断逻辑 * refactor(bioyond): 优化瓶架载体的分配逻辑和注释说明 重构瓶架载体的分配逻辑，使用嵌套循环替代硬编码索引分配 添加更详细的坐标映射说明，明确PLR与Bioyond坐标的对应关系 * fix(bioyond_rpc): 修复物料入库成功时无data字段返回空的问题 当API返回成功但无data字段时，返回包含success标识的字典而非空字典 --------- Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com> Co-authored-by: Junhan Chang <changjh@dp.tech>
This commit is contained in:
ZiWei
GitHub
@@ -11,7 +11,7 @@ from unilabos_msgs.msg import Resource
|
||||
|
||||
from unilabos.config.config import BasicConfig
|
||||
from unilabos.resources.container import RegularContainer
|
||||
from unilabos.resources.itemized_carrier import ItemizedCarrier
|
||||
from unilabos.resources.itemized_carrier import ItemizedCarrier, BottleCarrier
|
||||
from unilabos.ros.msgs.message_converter import convert_to_ros_msg
|
||||
from unilabos.ros.nodes.resource_tracker import (
|
||||
ResourceDictInstance,
|
||||
@@ -228,7 +228,7 @@ def handle_communications(G: nx.Graph):
|
||||
if G.nodes[device_comm].get("class") == "serial":
|
||||
G.nodes[device]["config"]["port"] = device_comm
|
||||
elif G.nodes[device_comm].get("class") == "io_device":
|
||||
print(f'!!! Modify {device}\'s io_device_port to {edata["port"][device_comm]}')
|
||||
logger.warning(f'Modify {device}\'s io_device_port to {edata["port"][device_comm]}')
|
||||
G.nodes[device]["config"]["io_device_port"] = int(edata["port"][device_comm])
|
||||
|
||||
|
||||
@@ -586,7 +586,7 @@ def resource_plr_to_ulab(resource_plr: "ResourcePLR", parent_name: str = None, w
|
||||
if source in replace_info:
|
||||
return replace_info[source]
|
||||
else:
|
||||
print("转换pylabrobot的时候，出现未知类型", source)
|
||||
logger.warning(f"转换pylabrobot的时候，出现未知类型: {source}")
|
||||
return source
|
||||
|
||||
def resource_plr_to_ulab_inner(d: dict, all_states: dict, child=True) -> dict:
|
||||
@@ -621,7 +621,7 @@ def resource_bioyond_to_plr(bioyond_materials: list[dict], type_mapping: Dict[st
|
||||
|
||||
Args:
|
||||
bioyond_materials: bioyond 系统的物料查询结果列表
|
||||
type_mapping: 物料类型映射字典，格式 {bioyond_type: [plr_class_name, class_uuid]}
|
||||
type_mapping: 物料类型映射字典，格式 {model: (显示名称, UUID)} 或 {显示名称: (model, UUID)}
|
||||
location_id_mapping: 库位 ID 到名称的映射字典，格式 {location_id: location_name}
|
||||
|
||||
Returns:
|
||||
@@ -629,13 +629,41 @@ def resource_bioyond_to_plr(bioyond_materials: list[dict], type_mapping: Dict[st
|
||||
"""
|
||||
plr_materials = []
|
||||
|
||||
# 创建反向映射: {显示名称: (model, UUID)} -> 用于从 Bioyond typeName 查找 model
|
||||
# 如果 type_mapping 的 key 已经是显示名称,则直接使用;否则创建反向映射
|
||||
reverse_type_mapping = {}
|
||||
for key, value in type_mapping.items():
|
||||
# value 可能是 tuple 或 list: (显示名称, UUID) 或 [显示名称, UUID]
|
||||
display_name = value[0] if isinstance(value, (tuple, list)) and len(value) >= 1 else None
|
||||
if display_name:
|
||||
# 反向映射: {显示名称: (原始key作为model, UUID)}
|
||||
resource_uuid = value[1] if len(value) >= 2 else ""
|
||||
# 如果已存在该显示名称,跳过(保留第一个遇到的映射)
|
||||
if display_name not in reverse_type_mapping:
|
||||
reverse_type_mapping[display_name] = (key, resource_uuid)
|
||||
|
||||
logger.debug(f"[反向映射表] 共 {len(reverse_type_mapping)} 个条目: {list(reverse_type_mapping.keys())}")
|
||||
|
||||
|
||||
# 用于跟踪同名物料的计数器
|
||||
name_counter = {}
|
||||
|
||||
for material in bioyond_materials:
|
||||
className = (
|
||||
type_mapping.get(material.get("typeName"), ("RegularContainer", ""))[0] if type_mapping else "RegularContainer"
|
||||
)
|
||||
# 从反向映射中查找: typeName(显示名称) -> (model, UUID)
|
||||
type_info = reverse_type_mapping.get(material.get("typeName"))
|
||||
className = type_info[0] if type_info else "RegularContainer"
|
||||
|
||||
# 为同名物料添加唯一后缀
|
||||
base_name = material["name"]
|
||||
if base_name in name_counter:
|
||||
name_counter[base_name] += 1
|
||||
unique_name = f"{base_name}_{name_counter[base_name]}"
|
||||
else:
|
||||
name_counter[base_name] = 1
|
||||
unique_name = base_name
|
||||
|
||||
plr_material_result = initialize_resource(
|
||||
{"name": material["name"], "class": className}, resource_type=ResourcePLR
|
||||
{"name": unique_name, "class": className}, resource_type=ResourcePLR
|
||||
)
|
||||
|
||||
# initialize_resource 可能返回列表或单个对象
|
||||
@@ -649,32 +677,77 @@ def resource_bioyond_to_plr(bioyond_materials: list[dict], type_mapping: Dict[st
|
||||
|
||||
# 确保 plr_material 是 ResourcePLR 实例
|
||||
if not isinstance(plr_material, ResourcePLR):
|
||||
logger.warning(f"物料 {material['name']} 不是有效的 ResourcePLR 实例，类型: {type(plr_material)}")
|
||||
logger.warning(f"物料 {unique_name} 不是有效的 ResourcePLR 实例，类型: {type(plr_material)}")
|
||||
continue
|
||||
|
||||
plr_material.code = material.get("code", "") and material.get("barCode", "") or ""
|
||||
plr_material.unilabos_uuid = str(uuid.uuid4())
|
||||
|
||||
# ⭐ 保存 Bioyond 原始信息到 unilabos_extra（用于出库时查询）
|
||||
plr_material.unilabos_extra = {
|
||||
"material_bioyond_id": material.get("id"), # Bioyond 物料 UUID
|
||||
"material_bioyond_name": material.get("name"), # Bioyond 原始名称（如 "MDA"）
|
||||
"material_bioyond_type": material.get("typeName"), # Bioyond 物料类型名称
|
||||
}
|
||||
|
||||
logger.debug(f"[转换物料] {material['name']} (ID:{material['id']}) → {unique_name} (类型:{className})")
|
||||
|
||||
# 处理子物料（detail）
|
||||
if material.get("detail") and len(material["detail"]) > 0:
|
||||
for bottle in reversed(plr_material.children):
|
||||
plr_material.unassign_child_resource(bottle)
|
||||
child_ids = []
|
||||
|
||||
# 确定detail物料的默认类型
|
||||
# 样品板的detail通常是样品瓶
|
||||
default_detail_type = "样品瓶" if "样品板" in material.get("typeName", "") else None
|
||||
|
||||
for detail in material["detail"]:
|
||||
number = (
|
||||
(detail.get("z", 0) - 1) * plr_material.num_items_x * plr_material.num_items_y
|
||||
+ (detail.get("y", 0) - 1) * plr_material.num_items_y
|
||||
+ (detail.get("x", 0) - 1)
|
||||
)
|
||||
typeName = detail.get("typeName", detail.get("name", ""))
|
||||
if typeName in type_mapping:
|
||||
|
||||
# 检查索引是否超出范围
|
||||
max_index = plr_material.num_items_x * plr_material.num_items_y - 1
|
||||
if number < 0 or number > max_index:
|
||||
logger.warning(
|
||||
f" └─ [子物料警告] {detail['name']} 的坐标 (x={detail.get('x')}, y={detail.get('y')}, z={detail.get('z')}) "
|
||||
f"计算出索引 {number} 超出载架范围 [0-{max_index}] (布局: {plr_material.num_items_x}×{plr_material.num_items_y})，跳过"
|
||||
)
|
||||
continue
|
||||
|
||||
# detail可能没有typeName，尝试从name推断，或使用默认类型
|
||||
typeName = detail.get("typeName")
|
||||
|
||||
# 如果没有typeName，尝试根据父物料类型和位置推断
|
||||
if not typeName:
|
||||
if "分装板" in material.get("typeName", ""):
|
||||
# 分装板: 根据行(x)判断类型
|
||||
# 第一行(x=1)是10%分装小瓶，第二行(x=2)是90%分装小瓶
|
||||
x_pos = detail.get("x", 0)
|
||||
y_pos = detail.get("y", 0)
|
||||
# logger.debug(f" └─ [推断类型] {detail['name']} 坐标(x={x_pos}, y={y_pos})")
|
||||
if x_pos == 1:
|
||||
typeName = "10%分装小瓶"
|
||||
elif x_pos == 2:
|
||||
typeName = "90%分装小瓶"
|
||||
# logger.debug(f" └─ [推断结果] {detail['name']} → {typeName}")
|
||||
else:
|
||||
typeName = default_detail_type
|
||||
|
||||
if typeName and typeName in reverse_type_mapping:
|
||||
bottle = plr_material[number] = initialize_resource(
|
||||
{"name": f'{detail["name"]}_{number}', "class": type_mapping[typeName][0]}, resource_type=ResourcePLR
|
||||
{"name": f'{detail["name"]}_{number}', "class": reverse_type_mapping[typeName][0]}, resource_type=ResourcePLR
|
||||
)
|
||||
bottle.tracker.liquids = [
|
||||
(detail["name"], float(detail.get("quantity", 0)) if detail.get("quantity") else 0)
|
||||
]
|
||||
bottle.code = detail.get("code", "")
|
||||
logger.debug(f" └─ [子物料] {detail['name']} → {plr_material.name}[{number}] (类型:{typeName})")
|
||||
else:
|
||||
logger.warning(f" └─ [子物料警告] {detail['name']} 的类型 '{typeName}' 不在mapping中，跳过")
|
||||
else:
|
||||
# 只对有 capacity 属性的容器（液体容器）处理液体追踪
|
||||
if hasattr(plr_material, 'capacity'):
|
||||
@@ -686,8 +759,13 @@ def resource_bioyond_to_plr(bioyond_materials: list[dict], type_mapping: Dict[st
|
||||
plr_materials.append(plr_material)
|
||||
|
||||
if deck and hasattr(deck, "warehouses"):
|
||||
for loc in material.get("locations", []):
|
||||
locations = material.get("locations", [])
|
||||
if not locations:
|
||||
logger.debug(f"[物料位置] {unique_name} 没有location信息，跳过warehouse放置")
|
||||
|
||||
for loc in locations:
|
||||
wh_name = loc.get("whName")
|
||||
logger.debug(f"[物料位置] {unique_name} 尝试放置到 warehouse: {wh_name} (Bioyond坐标: x={loc.get('x')}, y={loc.get('y')}, z={loc.get('z')})")
|
||||
|
||||
# 特殊处理: Bioyond的"堆栈1"需要映射到"堆栈1左"或"堆栈1右"
|
||||
# 根据列号(x)判断: 1-4映射到左侧, 5-8映射到右侧
|
||||
@@ -703,6 +781,7 @@ def resource_bioyond_to_plr(bioyond_materials: list[dict], type_mapping: Dict[st
|
||||
|
||||
if hasattr(deck, "warehouses") and wh_name in deck.warehouses:
|
||||
warehouse = deck.warehouses[wh_name]
|
||||
logger.debug(f"[Warehouse匹配] 找到warehouse: {wh_name} (容量: {warehouse.capacity}, 行×列: {warehouse.num_items_x}×{warehouse.num_items_y})")
|
||||
|
||||
# Bioyond坐标映射 (重要！): x→行(1=A,2=B...), y→列(1=01,2=02...), z→层(通常=1)
|
||||
# PyLabRobot warehouse是列优先存储: A01,B01,C01,D01, A02,B02,C02,D02, ...
|
||||
@@ -721,78 +800,301 @@ def resource_bioyond_to_plr(bioyond_materials: list[dict], type_mapping: Dict[st
|
||||
idx = y - 1
|
||||
logger.debug(f"1行warehouse {wh_name}: y={y} → idx={idx}")
|
||||
else:
|
||||
# 多行warehouse: 使用列优先索引 (与Bioyond坐标系统一致)
|
||||
# warehouse keys顺序: A01,B01,C01,D01, A02,B02,C02,D02, ...
|
||||
# 索引计算: idx = (col-1) * num_rows + (row-1) + (layer-1) * (rows * cols)
|
||||
# 多行warehouse: 根据 layout 使用不同的索引计算
|
||||
row_idx = x - 1 # x表示行: 转为0-based
|
||||
col_idx = y - 1 # y表示列: 转为0-based
|
||||
layer_idx = z - 1 # 转为0-based
|
||||
idx = layer_idx * (warehouse.num_items_x * warehouse.num_items_y) + col_idx * warehouse.num_items_y + row_idx
|
||||
logger.debug(f"多行warehouse {wh_name}: x={x}(行),y={y}(列) → row={row_idx},col={col_idx} → idx={idx}")
|
||||
|
||||
# 检查 warehouse 的排序方式属性
|
||||
ordering_layout = getattr(warehouse, 'ordering_layout', 'col-major')
|
||||
logger.debug(f"🔍 Warehouse {wh_name} layout检测: hasattr={hasattr(warehouse, 'ordering_layout')}, ordering_layout值='{ordering_layout}', warehouse类型={type(warehouse).__name__}")
|
||||
|
||||
if ordering_layout == "row-major":
|
||||
# 行优先: A01,A02,A03,A04, B01,B02,B03,B04 (所有Bioyond堆栈)
|
||||
# 索引计算: idx = (row) * num_cols + (col) + (layer) * (rows * cols)
|
||||
idx = layer_idx * (warehouse.num_items_x * warehouse.num_items_y) + row_idx * warehouse.num_items_x + col_idx
|
||||
logger.debug(f"行优先warehouse {wh_name}: x={x}(行),y={y}(列) → row={row_idx},col={col_idx} → idx={idx}")
|
||||
else:
|
||||
# 列优先 (后备): A01,B01,C01,D01, A02,B02,C02,D02
|
||||
# 索引计算: idx = (col) * num_rows + (row) + (layer) * (rows * cols)
|
||||
idx = layer_idx * (warehouse.num_items_x * warehouse.num_items_y) + col_idx * warehouse.num_items_y + row_idx
|
||||
logger.debug(f"列优先warehouse {wh_name}: x={x}(行),y={y}(列) → row={row_idx},col={col_idx} → idx={idx}")
|
||||
|
||||
if 0 <= idx < warehouse.capacity:
|
||||
if warehouse[idx] is None or isinstance(warehouse[idx], ResourceHolder):
|
||||
warehouse[idx] = plr_material
|
||||
logger.debug(f"✅ 物料 {material['name']} 放置到 {wh_name}[{idx}] (Bioyond坐标: x={loc.get('x')}, y={loc.get('y')})")
|
||||
logger.debug(f"✅ 物料 {unique_name} 放置到 {wh_name}[{idx}] (Bioyond坐标: x={loc.get('x')}, y={loc.get('y')})")
|
||||
else:
|
||||
logger.warning(f"物料 {material['name']} 的索引 {idx} 超出仓库 {wh_name} 容量 {warehouse.capacity}")
|
||||
logger.warning(f"❌ 物料 {unique_name} 的索引 {idx} 超出仓库 {wh_name} 容量 {warehouse.capacity}")
|
||||
else:
|
||||
if wh_name:
|
||||
logger.warning(f"❌ 物料 {unique_name} 的warehouse '{wh_name}' 在deck中不存在。可用warehouses: {list(deck.warehouses.keys()) if hasattr(deck, 'warehouses') else '无'}")
|
||||
|
||||
return plr_materials
|
||||
|
||||
|
||||
def resource_plr_to_bioyond(plr_resources: list[ResourcePLR], type_mapping: dict = {}, warehouse_mapping: dict = {}) -> list[dict]:
|
||||
def resource_plr_to_bioyond(plr_resources: list[ResourcePLR], type_mapping: dict = {}, warehouse_mapping: dict = {}, material_params: dict = {}) -> list[dict]:
|
||||
"""
|
||||
将 PyLabRobot 资源转换为 Bioyond 格式
|
||||
|
||||
Args:
|
||||
plr_resources: PyLabRobot 资源列表
|
||||
type_mapping: 物料类型映射字典
|
||||
warehouse_mapping: 仓库映射字典
|
||||
material_params: 物料默认参数字典 (格式: {物料名称: {参数字典}})
|
||||
|
||||
Returns:
|
||||
Bioyond 格式的物料列表
|
||||
"""
|
||||
bioyond_materials = []
|
||||
|
||||
# 定义不需要发送 details 的载架类型
|
||||
# 说明：这些载架上自带试剂瓶或烧杯，作为整体物料上传即可，不需要在 details 中重复上传子物料
|
||||
CARRIERS_WITHOUT_DETAILS = {
|
||||
"BIOYOND_PolymerStation_1BottleCarrier", # 聚合站-单试剂瓶载架
|
||||
"BIOYOND_PolymerStation_1FlaskCarrier", # 聚合站-单烧杯载架
|
||||
}
|
||||
|
||||
for resource in plr_resources:
|
||||
if hasattr(resource, "capacity") and resource.capacity > 1:
|
||||
if isinstance(resource, BottleCarrier) and resource.capacity > 1:
|
||||
# 获取 BottleCarrier 的类型映射
|
||||
type_info = type_mapping.get(resource.model)
|
||||
if not type_info:
|
||||
logger.error(f"❌ [PLR→Bioyond] BottleCarrier 资源 '{resource.name}' 的 model '{resource.model}' 不在 type_mapping 中")
|
||||
logger.debug(f"[PLR→Bioyond] 可用的 type_mapping 键: {list(type_mapping.keys())}")
|
||||
raise ValueError(f"资源 model '{resource.model}' 未在 MATERIAL_TYPE_MAPPINGS 中配置")
|
||||
|
||||
material = {
|
||||
"typeId": type_mapping.get(resource.model)[1],
|
||||
"typeId": type_info[1],
|
||||
"code": "",
|
||||
"barCode": "",
|
||||
"name": resource.name,
|
||||
"unit": "个",
|
||||
"quantity": 1,
|
||||
"details": [],
|
||||
"Parameters": "{}"
|
||||
}
|
||||
for bottle in resource.children:
|
||||
if isinstance(resource, ItemizedCarrier):
|
||||
site = resource.get_child_identifier(bottle)
|
||||
else:
|
||||
site = {"x": bottle.location.x - 1, "y": bottle.location.y - 1}
|
||||
detail_item = {
|
||||
"typeId": type_mapping.get(bottle.model)[1],
|
||||
"name": bottle.name,
|
||||
"code": bottle.code if hasattr(bottle, "code") else "",
|
||||
"quantity": sum(qty for _, qty in bottle.tracker.liquids) if hasattr(bottle, "tracker") else 0,
|
||||
"x": site["x"] + 1,
|
||||
"y": site["y"] + 1,
|
||||
"molecular": 1,
|
||||
"Parameters": json.dumps({"molecular": 1})
|
||||
}
|
||||
material["details"].append(detail_item)
|
||||
else:
|
||||
bottle = resource[0] if resource.capacity > 0 else resource
|
||||
material = {
|
||||
"typeId": "3a14196b-24f2-ca49-9081-0cab8021bf1a",
|
||||
"name": resource.name if hasattr(resource, "name") else "",
|
||||
"unit": "个", # 修复：Bioyond API 要求 unit 字段不能为空
|
||||
"quantity": sum(qty for _, qty in bottle.tracker.liquids) if hasattr(bottle, "tracker") else 0,
|
||||
"Parameters": "{}"
|
||||
"Parameters": "{}" # API 实际要求的字段（必需）
|
||||
}
|
||||
|
||||
if resource.parent is not None and isinstance(resource.parent, ItemizedCarrier):
|
||||
# 如果是自带试剂瓶的载架类型，不处理子物料（details留空）
|
||||
if resource.model in CARRIERS_WITHOUT_DETAILS:
|
||||
logger.info(f"[PLR→Bioyond] 载架 '{resource.name}' (model: {resource.model}) 自带试剂瓶，不添加 details")
|
||||
else:
|
||||
# 处理其他载架类型的子物料
|
||||
for bottle in resource.children:
|
||||
if isinstance(resource, ItemizedCarrier):
|
||||
# ⭐ 优化：直接使用 get_child_identifier 获取真实的子物料坐标
|
||||
# 这个方法会遍历 resource.children 找到 bottle 对象的实际位置
|
||||
site = resource.get_child_identifier(bottle)
|
||||
|
||||
# 🔧 如果 get_child_identifier 失败或返回无效坐标 (0,0)
|
||||
# 这通常发生在子物料名称使用纯数字后缀时（如 "BTDA_0", "BTDA_4"）
|
||||
if not site or (site.get("x") == 0 and site.get("y") == 0):
|
||||
# 方法1: 尝试从名称中提取标识符并解析
|
||||
bottle_identifier = None
|
||||
if "_" in bottle.name:
|
||||
bottle_identifier = bottle.name.split("_")[-1]
|
||||
|
||||
# 只有非纯数字标识符才尝试解析（如 "A1", "B2"）
|
||||
if bottle_identifier and not bottle_identifier.isdigit():
|
||||
try:
|
||||
x_idx, y_idx, z_idx = resource._parse_identifier_to_indices(bottle_identifier, 0)
|
||||
site = {"x": x_idx, "y": y_idx, "z": z_idx, "identifier": bottle_identifier}
|
||||
logger.debug(f" 🔧 [坐标修正-方法1] 从名称 {bottle.name} 解析标识符 {bottle_identifier} → ({x_idx}, {y_idx})")
|
||||
except Exception as e:
|
||||
logger.warning(f" ⚠️ [坐标解析] 标识符 {bottle_identifier} 解析失败: {e}")
|
||||
|
||||
# 方法2: 如果方法1失败，使用线性索引反推坐标
|
||||
if not site or (site.get("x") == 0 and site.get("y") == 0):
|
||||
# 找到bottle在children中的索引位置
|
||||
try:
|
||||
# 遍历所有槽位找到bottle的实际位置
|
||||
for idx in range(resource.num_items_x * resource.num_items_y):
|
||||
if resource[idx] is bottle:
|
||||
# 根据载架布局计算行列坐标
|
||||
# ItemizedCarrier 默认是列优先布局 (A1,B1,C1,D1, A2,B2,C2,D2...)
|
||||
col_idx = idx // resource.num_items_y # 列索引 (0-based)
|
||||
row_idx = idx % resource.num_items_y # 行索引 (0-based)
|
||||
site = {"x": col_idx, "y": row_idx, "z": 0, "identifier": str(idx)}
|
||||
logger.debug(f" 🔧 [坐标修正-方法2] {bottle.name} 在索引 {idx} → 列={col_idx}, 行={row_idx}")
|
||||
break
|
||||
except Exception as e:
|
||||
logger.error(f" ❌ [坐标计算失败] {bottle.name}: {e}")
|
||||
# 最后的兜底：使用 (0,0)
|
||||
site = {"x": 0, "y": 0, "z": 0, "identifier": ""}
|
||||
else:
|
||||
site = {"x": bottle.location.x - 1, "y": bottle.location.y - 1, "identifier": ""}
|
||||
|
||||
# 获取子物料的类型映射
|
||||
bottle_type_info = type_mapping.get(bottle.model)
|
||||
if not bottle_type_info:
|
||||
logger.error(f"❌ [PLR→Bioyond] 子物料 '{bottle.name}' 的 model '{bottle.model}' 不在 type_mapping 中")
|
||||
raise ValueError(f"子物料 model '{bottle.model}' 未在 MATERIAL_TYPE_MAPPINGS 中配置")
|
||||
|
||||
# ⚠️ 坐标系转换说明:
|
||||
# _parse_identifier_to_indices 返回: x=列索引, y=行索引 (0-based)
|
||||
# Bioyond 系统要求: x=行号, y=列号 (1-based)
|
||||
# 因此需要交换 x 和 y!
|
||||
bioyond_x = site["y"] + 1 # 行索引 → Bioyond的x (行号)
|
||||
bioyond_y = site["x"] + 1 # 列索引 → Bioyond的y (列号)
|
||||
|
||||
# 🐛 调试日志
|
||||
logger.debug(f"🔍 [PLR→Bioyond] detail转换: {bottle.name} → PLR(x={site['x']},y={site['y']},id={site.get('identifier','?')}) → Bioyond(x={bioyond_x},y={bioyond_y})")
|
||||
|
||||
# 🔥 提取物料名称：从 tracker.liquids 中获取第一个液体的名称（去除PLR系统添加的后缀）
|
||||
# tracker.liquids 格式: [(物料名称, 数量), ...]
|
||||
material_name = bottle_type_info[0] # 默认使用类型名称（如"样品瓶"）
|
||||
if hasattr(bottle, "tracker") and bottle.tracker.liquids:
|
||||
# 如果有液体，使用液体的名称
|
||||
first_liquid_name = bottle.tracker.liquids[0][0]
|
||||
# 去除PLR系统为了唯一性添加的后缀（如 "_0", "_1" 等）
|
||||
if "_" in first_liquid_name and first_liquid_name.split("_")[-1].isdigit():
|
||||
material_name = "_".join(first_liquid_name.split("_")[:-1])
|
||||
else:
|
||||
material_name = first_liquid_name
|
||||
logger.debug(f" 💧 [物料名称] {bottle.name} 液体: {first_liquid_name} → 转换为: {material_name}")
|
||||
else:
|
||||
logger.debug(f" 📭 [物料名称] {bottle.name} 无液体，使用类型名: {material_name}")
|
||||
|
||||
detail_item = {
|
||||
"typeId": bottle_type_info[1],
|
||||
"code": bottle.code if hasattr(bottle, "code") else "",
|
||||
"name": material_name, # 使用物料名称（如"9090"），而不是类型名称（"样品瓶"）
|
||||
"quantity": sum(qty for _, qty in bottle.tracker.liquids) if hasattr(bottle, "tracker") else 0,
|
||||
"x": bioyond_x,
|
||||
"y": bioyond_y,
|
||||
"z": 1,
|
||||
"unit": "微升",
|
||||
"Parameters": "{}" # API 实际要求的字段（必需）
|
||||
}
|
||||
material["details"].append(detail_item)
|
||||
else:
|
||||
# 单个瓶子(非载架)类型的资源
|
||||
bottle = resource[0] if hasattr(resource, "capacity") and resource.capacity > 0 else resource
|
||||
|
||||
# 根据 resource.model 从 type_mapping 获取正确的 typeId
|
||||
type_info = type_mapping.get(resource.model)
|
||||
if type_info:
|
||||
type_id = type_info[1]
|
||||
else:
|
||||
# 如果找不到映射，记录警告并使用默认值
|
||||
logger.warning(f"[PLR→Bioyond] 资源 {resource.name} 的 model '{resource.model}' 不在 type_mapping 中，使用默认烧杯类型")
|
||||
type_id = "3a14196b-24f2-ca49-9081-0cab8021bf1a" # 默认使用烧杯类型
|
||||
|
||||
# 🔥 提取物料名称：优先使用液体名称，否则使用资源名称
|
||||
material_name = resource.name if hasattr(resource, "name") else ""
|
||||
if hasattr(bottle, "tracker") and bottle.tracker.liquids:
|
||||
# 如果有液体，使用液体的名称
|
||||
first_liquid_name = bottle.tracker.liquids[0][0]
|
||||
# 去除PLR系统为了唯一性添加的后缀（如 "_0", "_1" 等）
|
||||
if "_" in first_liquid_name and first_liquid_name.split("_")[-1].isdigit():
|
||||
material_name = "_".join(first_liquid_name.split("_")[:-1])
|
||||
else:
|
||||
material_name = first_liquid_name
|
||||
logger.debug(f" 💧 [单瓶物料] {resource.name} 液体: {first_liquid_name} → 转换为: {material_name}")
|
||||
else:
|
||||
logger.debug(f" 📭 [单瓶物料] {resource.name} 无液体，使用资源名: {material_name}")
|
||||
|
||||
# 🎯 处理物料默认参数和单位
|
||||
# 检查是否有该物料名称的默认参数配置
|
||||
default_unit = "个" # 默认单位
|
||||
material_parameters = {}
|
||||
|
||||
if material_name in material_params:
|
||||
params_config = material_params[material_name].copy()
|
||||
|
||||
# 提取 unit 字段（如果有）
|
||||
if "unit" in params_config:
|
||||
default_unit = params_config.pop("unit") # 从参数中移除，放到外层
|
||||
|
||||
# 剩余的字段放入 Parameters
|
||||
material_parameters = params_config
|
||||
logger.debug(f" 🔧 [物料参数] 为 {material_name} 应用配置: unit={default_unit}, parameters={material_parameters}")
|
||||
|
||||
# 转换为 JSON 字符串
|
||||
parameters_json = json.dumps(material_parameters) if material_parameters else "{}"
|
||||
|
||||
material = {
|
||||
"typeId": type_id,
|
||||
"code": "",
|
||||
"barCode": "",
|
||||
"name": material_name, # 使用物料名称而不是资源名称
|
||||
"unit": default_unit, # 使用配置的单位或默认单位
|
||||
"quantity": sum(qty for _, qty in bottle.tracker.liquids) if hasattr(bottle, "tracker") else 0,
|
||||
"Parameters": parameters_json # API 实际要求的字段（必需）
|
||||
}
|
||||
|
||||
# ⭐ 处理 locations 信息
|
||||
# 优先级: update_resource_site (位置更新请求) > 当前 parent 位置
|
||||
extra_info = getattr(resource, "unilabos_extra", {})
|
||||
update_site = extra_info.get("update_resource_site")
|
||||
|
||||
if update_site:
|
||||
# 情况1: 有明确的位置更新请求 (如从 A02 移动到 A03)
|
||||
# 需要从 warehouse_mapping 中查找目标库位的 UUID
|
||||
logger.debug(f"🔄 [PLR→Bioyond] 检测到位置更新请求: {resource.name} → {update_site}")
|
||||
|
||||
# 遍历所有仓库查找目标库位
|
||||
target_warehouse_name = None
|
||||
target_location_uuid = None
|
||||
|
||||
for warehouse_name, warehouse_info in warehouse_mapping.items():
|
||||
site_uuids = warehouse_info.get("site_uuids", {})
|
||||
if update_site in site_uuids:
|
||||
target_warehouse_name = warehouse_name
|
||||
target_location_uuid = site_uuids[update_site]
|
||||
break
|
||||
|
||||
if target_warehouse_name and target_location_uuid:
|
||||
# 从库位代码解析坐标 (如 "A03" -> x=1, y=3)
|
||||
# A=1, B=2, C=3, D=4...
|
||||
# 01=1, 02=2, 03=3...
|
||||
try:
|
||||
row_letter = update_site[0] # 'A', 'B', 'C', 'D'
|
||||
col_number = int(update_site[1:]) # '01', '02', '03'...
|
||||
bioyond_x = ord(row_letter) - ord('A') + 1 # A→1, B→2, C→3, D→4
|
||||
bioyond_y = col_number # 01→1, 02→2, 03→3
|
||||
|
||||
material["locations"] = [
|
||||
{
|
||||
"id": target_location_uuid,
|
||||
"whid": warehouse_mapping[target_warehouse_name].get("uuid", ""),
|
||||
"whName": target_warehouse_name,
|
||||
"x": bioyond_x,
|
||||
"y": bioyond_y,
|
||||
"z": 1,
|
||||
"quantity": 0
|
||||
}
|
||||
]
|
||||
logger.debug(f"✅ [PLR→Bioyond] 位置更新: {resource.name} → {target_warehouse_name}/{update_site} (x={bioyond_x}, y={bioyond_y})")
|
||||
except Exception as e:
|
||||
logger.error(f"❌ [PLR→Bioyond] 解析库位代码失败: {update_site}, 错误: {e}")
|
||||
else:
|
||||
logger.warning(f"⚠️ [PLR→Bioyond] 未找到库位 {update_site} 的配置")
|
||||
|
||||
elif resource.parent is not None and isinstance(resource.parent, ItemizedCarrier):
|
||||
# 情况2: 使用当前 parent 位置
|
||||
site_in_parent = resource.parent.get_child_identifier(resource)
|
||||
|
||||
# ⚠️ 坐标系转换说明:
|
||||
# get_child_identifier 返回: x_idx=列索引, y_idx=行索引 (0-based)
|
||||
# Bioyond 系统要求: x=行号, y=列号 (1-based)
|
||||
# 因此需要交换 x 和 y!
|
||||
bioyond_x = site_in_parent["y"] + 1 # 行索引 → Bioyond的x (行号)
|
||||
bioyond_y = site_in_parent["x"] + 1 # 列索引 → Bioyond的y (列号)
|
||||
|
||||
material["locations"] = [
|
||||
{
|
||||
"id": warehouse_mapping[resource.parent.name]["site_uuids"][site_in_parent["identifier"]],
|
||||
"whid": warehouse_mapping[resource.parent.name]["uuid"],
|
||||
"whName": resource.parent.name,
|
||||
"x": site_in_parent["z"] + 1,
|
||||
"y": site_in_parent["y"] + 1,
|
||||
"x": bioyond_x,
|
||||
"y": bioyond_y,
|
||||
"z": 1,
|
||||
"quantity": 0
|
||||
}
|
||||
],
|
||||
]
|
||||
logger.debug(f"🔄 [PLR→Bioyond] 坐标转换: {resource.name} 在 {resource.parent.name}[{site_in_parent['identifier']}] → UniLab(列={site_in_parent['x']},行={site_in_parent['y']}) → Bioyond(x={bioyond_x},y={bioyond_y})")
|
||||
|
||||
print(f"material_data: {material}")
|
||||
bioyond_materials.append(material)
|
||||
return bioyond_materials
|
||||
|
||||
|
||||
Reference in New Issue
Block a user