Merge pull request #177 from sun7151887/yb4-fix

Yb4默认仿真机

new_cellconfig3c.json

@@ -1,3 +1,4 @@
+      
 {
   "nodes": [
     {
@@ -53,11 +54,6 @@
       ],
       "type": "device",
       "class":"coincellassemblyworkstation_device",
-      "position": {
-        "x": -600,
-        "y": -400,
-        "z": 0
-      },
       "config": {
         "deck": {
           "data": {
@@ -66,6 +62,14 @@
           }
         },
         "protocol_type": []
+      },
+      "position": {
+        "size": {"height": 1450, "width": 1450, "depth": 2100},
+        "position": {
+          "x": -1500,
+          "y": 0,
+          "z": 0
+        }
       }
     },
     {
@@ -75,11 +79,6 @@
       "parent": "BatteryStation",
       "type": "deck",
       "class": "CoincellDeck",
-      "position": {
-        "x": 0,
-        "y": 0,
-        "z": 0
-      },
       "config": {
         "type": "CoincellDeck",
         "setup": true,
@@ -94,4 +93,6 @@
     }
   ],
   "links": []
-}
+}
+
+    

unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_cell_workstation.py

@@ -11,6 +11,7 @@ from datetime import datetime, timedelta
 import re
 import threading
 import json
+from copy import deepcopy
 from urllib3 import response
 from unilabos.devices.workstation.bioyond_studio.station import BioyondWorkstation, BioyondResourceSynchronizer
 from unilabos.devices.workstation.bioyond_studio.config import (
@@ -544,6 +545,14 @@ class BioyondCellWorkstation(BioyondWorkstation):
             except Exception:
                 return default
 
+        def _as_float(val, default=0.0) -> float:
+            try:
+                if pd.isna(val):
+                    return default
+                return float(val)
+            except Exception:
+                return default
+
         def _as_str(val, default="") -> str:
             if val is None or (isinstance(val, float) and pd.isna(val)):
                 return default
@@ -577,9 +586,9 @@ class BioyondCellWorkstation(BioyondWorkstation):
                 "createTime": _to_ymd_slash(row[col_create_time]) if col_create_time else _to_ymd_slash(None),
                 "bottleType": _as_str(row[col_bottle_type], default="配液小瓶") if col_bottle_type else "配液小瓶",
                 "mixTime": _as_int(row[col_mix_time]) if col_mix_time else 0,
-                "loadSheddingInfo": _as_int(row[col_load]) if col_load else 0,
-                "pouchCellInfo": _as_int(row[col_pouch]) if col_pouch else 0,
-                "conductivityInfo": _as_int(row[col_cond]) if col_cond else 0,
+                "loadSheddingInfo": _as_float(row[col_load]) if col_load else 0.0,
+                "pouchCellInfo": _as_float(row[col_pouch]) if col_pouch else 0,
+                "conductivityInfo": _as_float(row[col_cond]) if col_cond else 0,
                 "conductivityBottleCount": _as_int(row[col_cond_cnt]) if col_cond_cnt else 0,
                 "materialInfos": mats,
                 "totalMass": round(total_mass, 4)  # 自动汇总
@@ -1165,7 +1174,7 @@ if __name__ == "__main__":
     # logger.info(ws.scheduler_start())
     
     # 继续后续流程
-    # logger.info(ws.auto_feeding4to3()) #搬运物料到3号箱
+    logger.info(ws.auto_feeding4to3()) #搬运物料到3号箱
     # # # 使用正斜杠或 Path 对象来指定文件路径
     # excel_path = Path("unilabos\\devices\\workstation\\bioyond_studio\\bioyond_cell\\2025092701.xlsx")
     # logger.info(ws.create_orders(excel_path))

unilabos/devices/workstation/bioyond_studio/config.py

@@ -8,8 +8,8 @@ import os
 # BioyondCellWorkstation 默认配置（包含所有必需参数）
 API_CONFIG = {
     # API 连接配置
-    "api_host": os.getenv("BIOYOND_API_HOST", "http://172.16.1.143:44389"),#实机
-    # "api_host": os.getenv("BIOYOND_API_HOST", "http://172.16.7.149:44388"),# 仿真机
+    # "api_host": os.getenv("BIOYOND_API_HOST", "http://172.16.1.143:44389"),#实机
+    "api_host": os.getenv("BIOYOND_API_HOST", "http://172.16.11.219:44388"),# 仿真机
     "api_key": os.getenv("BIOYOND_API_KEY", "8A819E5C"),
     "timeout": int(os.getenv("BIOYOND_TIMEOUT", "30")),
     
@@ -17,7 +17,7 @@ API_CONFIG = {
     "report_token": os.getenv("BIOYOND_REPORT_TOKEN", "CHANGE_ME_TOKEN"),
     
     # HTTP 服务配置
-    "HTTP_host": os.getenv("BIOYOND_HTTP_HOST", "172.16.2.140"),  # HTTP服务监听地址，监听计算机飞连ip地址
+    "HTTP_host": os.getenv("BIOYOND_HTTP_HOST", "172.16.11.2"),  # HTTP服务监听地址，监听计算机飞连ip地址
     "HTTP_port": int(os.getenv("BIOYOND_HTTP_PORT", "8080")),
     "debug_mode": False,# 调试模式
 }

unilabos/devices/workstation/coin_cell_assembly/YB_YH_materials.py

@@ -20,7 +20,7 @@ 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
-
+from unilabos.resources.battery.electrode_sheet import ElectrodeSheet
 
 
 
@@ -540,10 +540,10 @@ class CoincellDeck(Deck):
     def __init__(
         self,
         name: str = "coin_cell_deck",
-        size_x: float = 3650.0,  # 1m
-        size_y: float = 1550.0,  # 1m
-        size_z: float = 2100.0,   # 0.9m
-        origin: Coordinate = Coordinate(-4000, 2000, 0),
+        size_x: float = 1450.0,  # 1m
+        size_y: float = 1450.0,  # 1m
+        size_z: float = 100.0,   # 0.9m
+        origin: Coordinate = Coordinate(-2200, 0, 0),
         category: str = "coin_cell_deck",
         setup: bool = False,  # 是否自动执行 setup
     ):
@@ -560,11 +560,10 @@ class CoincellDeck(Deck):
         """
         super().__init__(
             name=name,
-            size_x=size_x,
-            size_y=size_y,
-            size_z=size_z,
+            size_x=1450.0,
+            size_y=1450.0,
+            size_z=100.0,
             origin=origin,
-            category=category,
         )
         if setup:
             self.setup()
@@ -575,32 +574,32 @@ class CoincellDeck(Deck):
         
         # 正极片（4个洞位，2x2布局）
         zhengji_zip = MagazineHolder_4_Cathode("正极&铝箔弹夹")
-        self.assign_child_resource(zhengji_zip, Coordinate(x=2799.0, y=356.0, z=0))
+        self.assign_child_resource(zhengji_zip, Coordinate(x=402.0, y=830.0, z=0))
         
         # 正极壳、平垫片（6个洞位，2x2+2布局）
         zhengjike_zip = MagazineHolder_6_Cathode("正极壳&平垫片弹夹")
-        self.assign_child_resource(zhengjike_zip, Coordinate(x=2586.0, y=1143.0, z=0))
+        self.assign_child_resource(zhengjike_zip, Coordinate(x=566.0, y=272.0, z=0))
         
         # 负极壳、弹垫片（6个洞位，2x2+2布局）
         fujike_zip = MagazineHolder_6_Anode("负极壳&弹垫片弹夹")
-        self.assign_child_resource(fujike_zip, Coordinate(x=2492.0, y=1144.0, z=0))
+        self.assign_child_resource(fujike_zip, Coordinate(x=474.0, y=276.0, z=0))
         
         # 成品弹夹（6个洞位，3x2布局）
         chengpindanjia_zip = MagazineHolder_6_Battery("成品弹夹")
-        self.assign_child_resource(chengpindanjia_zip, Coordinate(x=3112.0, y=1295.0, z=0))
+        self.assign_child_resource(chengpindanjia_zip, Coordinate(x=260.0, y=156.0, z=0))
         
         # ====================================== 物料板 ============================================
         # 创建物料板（料盘carrier）- 4x4布局
         # 负极料盘
         fujiliaopan = MaterialPlate(name="负极料盘", size_x=120, size_y=100, size_z=10.0, fill=True)
-        self.assign_child_resource(fujiliaopan, Coordinate(x=2107.0, y=304.0, z=0))
+        self.assign_child_resource(fujiliaopan, Coordinate(x=708.0, y=794.0, z=0))
         # for i in range(16):
         #     fujipian = ElectrodeSheet(name=f"{fujiliaopan.name}_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
         #     fujiliaopan.children[i].assign_child_resource(fujipian, location=None)
 
         # 隔膜料盘
         gemoliaopan = MaterialPlate(name="隔膜料盘", size_x=120, size_y=100, size_z=10.0, fill=True)
-        self.assign_child_resource(gemoliaopan, Coordinate(x=2107.0, y=146.0, z=0))
+        self.assign_child_resource(gemoliaopan, Coordinate(x=718.0, y=918.0, z=0))
         # for i in range(16):
         #     gemopian = ElectrodeSheet(name=f"{gemoliaopan.name}_jipian_{i}", size_x=12, size_y=12, size_z=0.1)
         #     gemoliaopan.children[i].assign_child_resource(gemopian, location=None)
@@ -623,16 +622,16 @@ class CoincellDeck(Deck):
         
         # 电解液缓存位 - 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))
+        self.assign_child_resource(bottle_rack_6x2, Coordinate(x=1050.0, y=358.0, z=0))
         # 电解液回收位6x2
         bottle_rack_6x2_2 = YIHUA_Electrolyte_12VialCarrier(name="bottle_rack_6x2_2")
-        self.assign_child_resource(bottle_rack_6x2_2, Coordinate(x=1765.0, y=869.0, z=0))
+        self.assign_child_resource(bottle_rack_6x2_2, Coordinate(x=914.0, y=358.0, z=0))
 
         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=782.0, y=514.0, 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=778.0, y=622.0, z=0))
 
 
 if __name__ == "__main__":

unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly.py

@@ -139,7 +139,7 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
                 time.sleep(2)
             if not modbus_client.client.is_socket_open():
                 raise ValueError('modbus tcp connection failed')
-            self.nodes = BaseClient.load_csv(os.path.join(os.path.dirname(__file__), 'coin_cell_assembly_a.csv'))
+            self.nodes = BaseClient.load_csv(os.path.join(os.path.dirname(__file__), 'coin_cell_assembly_1105.csv'))
             self.client = modbus_client.register_node_list(self.nodes)
         else:
             print("测试模式，跳过连接")
@@ -791,7 +791,7 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
         logger.debug(f"data_electrolyte_code: {data_electrolyte_code}")
         logger.debug(f"data_coin_cell_code: {data_coin_cell_code}")
         #接收完信息后，读取完毕标志位置True
-        liaopan3 = self.deck.get_resource("\u7535\u6c60\u6599\u76d8")        
+        liaopan3 = self.deck.get_resource("成品弹夹")        
         #把物料解绑后放到另一盘上
         battery = ElectrodeSheet(name=f"battery_{self.coin_num_N}", size_x=14, size_y=14, size_z=2)
         battery._unilabos_state = {
@@ -1008,7 +1008,7 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
             #     time.sleep(1)
             # time.sleep(40)
     # 数据读取与输出
-    def func_read_data_and_output(self, file_path: str="D:\\coin_cell_data"):
+    def func_read_data_and_output(self, file_path: str="/Users/sml/work"):
         # 检查CSV导出是否正在运行，已运行则跳出，防止同时启动两个while循环
         if self.csv_export_running:
             return False, "读取已在运行中"
@@ -1206,7 +1206,13 @@ class CoinCellAssemblyWorkstation(WorkstationBase):
 
 if __name__ == "__main__":
     # 简单测试
-    workstation = CoinCellAssemblyWorkstation()
-    workstation.qiming_coin_cell_code(fujipian_panshu=1, fujipian_juzhendianwei=2, gemopanshu=3, gemo_juzhendianwei=4, lvbodian=False, battery_pressure_mode=False, battery_pressure=4200, battery_clean_ignore=False)
-    print(f"工作站创建成功: {workstation.deck.name}")
-    print(f"料盘数量: {len(workstation.deck.children)}")
+    workstation = CoinCellAssemblyWorkstation(deck=CoincellDeck(setup=True, name="coin_cell_deck"))
+    # workstation.qiming_coin_cell_code(fujipian_panshu=1, fujipian_juzhendianwei=2, gemopanshu=3, gemo_juzhendianwei=4, lvbodian=False, battery_pressure_mode=False, battery_pressure=4200, battery_clean_ignore=False)
+    # print(f"工作站创建成功: {workstation.deck.name}")
+    # print(f"料盘数量: {len(workstation.deck.children)}")
+    workstation.func_pack_device_init()
+    workstation.func_pack_device_auto()
+    workstation.func_pack_device_start()
+    workstation.func_pack_send_bottle_num(16)
+    workstation.func_allpack_cmd(elec_num=16, elec_use_num=16, elec_vol=50, assembly_type=7, assembly_pressure=4200, file_path="/Users/calvincao/Desktop/work/Uni-Lab-OS-hhm")
+    

unilabos/registry/devices/bioyond_cell.yaml

@@ -4,7 +4,6 @@ bioyond_cell:
   class:
     action_value_mappings:
       auto-auto_batch_outbound_from_xlsx:
-        display_name: 批量导入上料
         feedback: {}
         goal: {}
         goal_default:
@@ -33,112 +32,7 @@ bioyond_cell:
         feedback: {}
         goal: {}
         goal_default:
-          WH3_x1_y1_z3_1_materialId: ''
-          WH3_x1_y1_z3_1_materialType: ''
-          WH3_x1_y1_z3_1_quantity: 0
-          WH3_x1_y2_z3_4_materialId: ''
-          WH3_x1_y2_z3_4_materialType: ''
-          WH3_x1_y2_z3_4_quantity: 0
-          WH3_x1_y3_z3_7_materialId: ''
-          WH3_x1_y3_z3_7_materialType: ''
-          WH3_x1_y3_z3_7_quantity: 0
-          WH3_x1_y4_z3_10_materialId: ''
-          WH3_x1_y4_z3_10_materialType: ''
-          WH3_x1_y4_z3_10_quantity: 0
-          WH3_x1_y5_z3_13_materialId: ''
-          WH3_x1_y5_z3_13_materialType: ''
-          WH3_x1_y5_z3_13_quantity: 0
-          WH3_x2_y1_z3_2_materialId: ''
-          WH3_x2_y1_z3_2_materialType: ''
-          WH3_x2_y1_z3_2_quantity: 0
-          WH3_x2_y2_z3_5_materialId: ''
-          WH3_x2_y2_z3_5_materialType: ''
-          WH3_x2_y2_z3_5_quantity: 0
-          WH3_x2_y3_z3_8_materialId: ''
-          WH3_x2_y3_z3_8_materialType: ''
-          WH3_x2_y3_z3_8_quantity: 0
-          WH3_x2_y4_z3_11_materialId: ''
-          WH3_x2_y4_z3_11_materialType: ''
-          WH3_x2_y4_z3_11_quantity: 0
-          WH3_x2_y5_z3_14_materialId: ''
-          WH3_x2_y5_z3_14_materialType: ''
-          WH3_x2_y5_z3_14_quantity: 0
-          WH3_x3_y1_z3_3_materialId: ''
-          WH3_x3_y1_z3_3_materialType: ''
-          WH3_x3_y1_z3_3_quantity: 0
-          WH3_x3_y2_z3_6_materialId: ''
-          WH3_x3_y2_z3_6_materialType: ''
-          WH3_x3_y2_z3_6_quantity: 0
-          WH3_x3_y3_z3_9_materialId: ''
-          WH3_x3_y3_z3_9_materialType: ''
-          WH3_x3_y3_z3_9_quantity: 0
-          WH3_x3_y4_z3_12_materialId: ''
-          WH3_x3_y4_z3_12_materialType: ''
-          WH3_x3_y4_z3_12_quantity: 0
-          WH3_x3_y5_z3_15_materialId: ''
-          WH3_x3_y5_z3_15_materialType: ''
-          WH3_x3_y5_z3_15_quantity: 0
-          WH4_x1_y1_z1_1_materialName: ''
-          WH4_x1_y1_z1_1_quantity: 0.0
-          WH4_x1_y1_z2_1_materialName: ''
-          WH4_x1_y1_z2_1_materialType: ''
-          WH4_x1_y1_z2_1_quantity: 0.0
-          WH4_x1_y1_z2_1_targetWH: ''
-          WH4_x1_y2_z1_6_materialName: ''
-          WH4_x1_y2_z1_6_quantity: 0.0
-          WH4_x1_y2_z2_4_materialName: ''
-          WH4_x1_y2_z2_4_materialType: ''
-          WH4_x1_y2_z2_4_quantity: 0.0
-          WH4_x1_y2_z2_4_targetWH: ''
-          WH4_x1_y3_z1_11_materialName: ''
-          WH4_x1_y3_z1_11_quantity: 0.0
-          WH4_x1_y3_z2_7_materialName: ''
-          WH4_x1_y3_z2_7_materialType: ''
-          WH4_x1_y3_z2_7_quantity: 0.0
-          WH4_x1_y3_z2_7_targetWH: ''
-          WH4_x2_y1_z1_2_materialName: ''
-          WH4_x2_y1_z1_2_quantity: 0.0
-          WH4_x2_y1_z2_2_materialName: ''
-          WH4_x2_y1_z2_2_materialType: ''
-          WH4_x2_y1_z2_2_quantity: 0.0
-          WH4_x2_y1_z2_2_targetWH: ''
-          WH4_x2_y2_z1_7_materialName: ''
-          WH4_x2_y2_z1_7_quantity: 0.0
-          WH4_x2_y2_z2_5_materialName: ''
-          WH4_x2_y2_z2_5_materialType: ''
-          WH4_x2_y2_z2_5_quantity: 0.0
-          WH4_x2_y2_z2_5_targetWH: ''
-          WH4_x2_y3_z1_12_materialName: ''
-          WH4_x2_y3_z1_12_quantity: 0.0
-          WH4_x2_y3_z2_8_materialName: ''
-          WH4_x2_y3_z2_8_materialType: ''
-          WH4_x2_y3_z2_8_quantity: 0.0
-          WH4_x2_y3_z2_8_targetWH: ''
-          WH4_x3_y1_z1_3_materialName: ''
-          WH4_x3_y1_z1_3_quantity: 0.0
-          WH4_x3_y1_z2_3_materialName: ''
-          WH4_x3_y1_z2_3_materialType: ''
-          WH4_x3_y1_z2_3_quantity: 0.0
-          WH4_x3_y1_z2_3_targetWH: ''
-          WH4_x3_y2_z1_8_materialName: ''
-          WH4_x3_y2_z1_8_quantity: 0.0
-          WH4_x3_y2_z2_6_materialName: ''
-          WH4_x3_y2_z2_6_materialType: ''
-          WH4_x3_y2_z2_6_quantity: 0.0
-          WH4_x3_y2_z2_6_targetWH: ''
-          WH4_x3_y3_z2_9_materialName: ''
-          WH4_x3_y3_z2_9_materialType: ''
-          WH4_x3_y3_z2_9_quantity: 0.0
-          WH4_x3_y3_z2_9_targetWH: ''
-          WH4_x4_y1_z1_4_materialName: ''
-          WH4_x4_y1_z1_4_quantity: 0.0
-          WH4_x4_y2_z1_9_materialName: ''
-          WH4_x4_y2_z1_9_quantity: 0.0
-          WH4_x5_y1_z1_5_materialName: ''
-          WH4_x5_y1_z1_5_quantity: 0.0
-          WH4_x5_y2_z1_10_materialName: ''
-          WH4_x5_y2_z1_10_quantity: 0.0
-          xlsx_path: C:/ML/GitHub/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/material_template.xlsx
+          xlsx_path: /Users/sml/work/Unilab/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/material_template.xlsx
         handles: {}
         placeholder_keys: {}
         result: {}
@@ -464,7 +358,7 @@ bioyond_cell:
                   default: 0.0
                   type: number
                 xlsx_path:
-                  default: C:/ML/GitHub/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/material_template.xlsx
+                  default: /Users/sml/work/Unilab/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/material_template.xlsx
                   type: string
               required: []
               type: object
@@ -600,6 +494,7 @@ bioyond_cell:
           bottle_type: null
           location_code: null
           name: null
+          warehouse_name: 手动堆栈
         handles: {}
         placeholder_keys: {}
         result: {}
@@ -617,6 +512,9 @@ bioyond_cell:
                   type: string
                 name:
                   type: string
+                warehouse_name:
+                  default: 手动堆栈
+                  type: string
               required:
               - name
               - board_type
@@ -785,6 +683,39 @@ bioyond_cell:
           title: report_material_change参数
           type: object
         type: UniLabJsonCommand
+      auto-resource_tree_transfer:
+        feedback: {}
+        goal: {}
+        goal_default:
+          old_parent: null
+          parent_resource: null
+          plr_resource: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                old_parent:
+                  type: object
+                parent_resource:
+                  type: object
+                plr_resource:
+                  type: object
+              required:
+              - old_parent
+              - plr_resource
+              - parent_resource
+              type: object
+            result: {}
+          required:
+          - goal
+          title: resource_tree_transfer参数
+          type: object
+        type: UniLabJsonCommand
       auto-scheduler_continue:
         feedback: {}
         goal: {}
@@ -1072,12 +1003,13 @@ bioyond_cell:
           type: object
         type: UniLabJsonCommand
     module: unilabos.devices.workstation.bioyond_studio.bioyond_cell.bioyond_cell_workstation:BioyondCellWorkstation
-    status_types: {}
+    status_types:
+      device_id: String
     type: python
   config_info: []
   description: ''
   handles: []
-  icon: ''
+  icon: benyao2.webp
   init_param_schema:
     config:
       properties:
@@ -1090,8 +1022,11 @@ bioyond_cell:
       required: []
       type: object
     data:
-      properties: {}
-      required: []
+      properties:
+        device_id:
+          type: string
+      required:
+      - device_id
       type: object
   registry_type: device
   version: 1.0.0

unilabos/registry/devices/coin_cell_workstation.yaml

@@ -79,7 +79,7 @@ coincellassemblyworkstation_device:
           elec_num: null
           elec_use_num: null
           elec_vol: 50
-          file_path: C:\Users\67484\Desktop
+          file_path: /Users/sml/work
         handles: {}
         placeholder_keys: {}
         result: {}
@@ -103,7 +103,7 @@ coincellassemblyworkstation_device:
                   default: 50
                   type: integer
                 file_path:
-                  default: C:\Users\67484\Desktop
+                  default: /Users/sml/work
                   type: string
               required:
               - elec_num
@@ -332,7 +332,7 @@ coincellassemblyworkstation_device:
         feedback: {}
         goal: {}
         goal_default:
-          file_path: D:\coin_cell_data
+          file_path: /Users/sml/work
         handles: {}
         placeholder_keys: {}
         result: {}
@@ -343,7 +343,7 @@ coincellassemblyworkstation_device:
             goal:
               properties:
                 file_path:
-                  default: D:\coin_cell_data
+                  default: /Users/sml/work
                   type: string
               required: []
               type: object
@@ -502,18 +502,20 @@ coincellassemblyworkstation_device:
   config_info: []
   description: ''
   handles: []
-  icon: coin_cell_assembly_picture.webp
+  icon: koudian.webp
   init_param_schema:
     config:
       properties:
         address:
-          default: 172.21.32.111
+          default: 172.16.28.102
           type: string
+        config:
+          type: object
         debug_mode:
           default: false
           type: boolean
         deck:
-          type: object
+          type: string
         port:
           default: '502'
           type: string

unilabos/registry/devices/liquid_handler.yaml

@@ -654,6 +654,31 @@ liquid_handler:
           title: iter_tips参数
           type: object
         type: UniLabJsonCommand
+      auto-post_init:
+        feedback: {}
+        goal: {}
+        goal_default:
+          ros_node: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                ros_node:
+                  type: string
+              required:
+              - ros_node
+              type: object
+            result: {}
+          required:
+          - goal
+          title: post_init参数
+          type: object
+        type: UniLabJsonCommand
       auto-set_group:
         feedback: {}
         goal: {}
@@ -6170,6 +6195,31 @@ liquid_handler.prcxi:
           title: move_to参数
           type: object
         type: UniLabJsonCommandAsync
+      auto-post_init:
+        feedback: {}
+        goal: {}
+        goal_default:
+          ros_node: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                ros_node:
+                  type: object
+              required:
+              - ros_node
+              type: object
+            result: {}
+          required:
+          - goal
+          title: post_init参数
+          type: object
+        type: UniLabJsonCommand
       auto-run_protocol:
         feedback: {}
         goal: {}

unilabos/registry/devices/virtual_device.yaml

@@ -45,6 +45,31 @@ virtual_centrifuge:
           title: initialize参数
           type: object
         type: UniLabJsonCommandAsync
+      auto-post_init:
+        feedback: {}
+        goal: {}
+        goal_default:
+          ros_node: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                ros_node:
+                  type: object
+              required:
+              - ros_node
+              type: object
+            result: {}
+          required:
+          - goal
+          title: post_init参数
+          type: object
+        type: UniLabJsonCommand
       centrifuge:
         feedback:
           current_speed: current_speed
@@ -335,6 +360,31 @@ virtual_column:
           title: initialize参数
           type: object
         type: UniLabJsonCommandAsync
+      auto-post_init:
+        feedback: {}
+        goal: {}
+        goal_default:
+          ros_node: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                ros_node:
+                  type: object
+              required:
+              - ros_node
+              type: object
+            result: {}
+          required:
+          - goal
+          title: post_init参数
+          type: object
+        type: UniLabJsonCommand
       run_column:
         feedback:
           current_status: current_status
@@ -732,6 +782,31 @@ virtual_filter:
           title: initialize参数
           type: object
         type: UniLabJsonCommandAsync
+      auto-post_init:
+        feedback: {}
+        goal: {}
+        goal_default:
+          ros_node: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                ros_node:
+                  type: object
+              required:
+              - ros_node
+              type: object
+            result: {}
+          required:
+          - goal
+          title: post_init参数
+          type: object
+        type: UniLabJsonCommand
       filter:
         feedback:
           current_status: current_status
@@ -1358,6 +1433,31 @@ virtual_heatchill:
           title: initialize参数
           type: object
         type: UniLabJsonCommandAsync
+      auto-post_init:
+        feedback: {}
+        goal: {}
+        goal_default:
+          ros_node: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                ros_node:
+                  type: object
+              required:
+              - ros_node
+              type: object
+            result: {}
+          required:
+          - goal
+          title: post_init参数
+          type: object
+        type: UniLabJsonCommand
       heat_chill:
         feedback:
           status: status
@@ -2358,6 +2458,31 @@ virtual_rotavap:
           title: initialize参数
           type: object
         type: UniLabJsonCommandAsync
+      auto-post_init:
+        feedback: {}
+        goal: {}
+        goal_default:
+          ros_node: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                ros_node:
+                  type: object
+              required:
+              - ros_node
+              type: object
+            result: {}
+          required:
+          - goal
+          title: post_init参数
+          type: object
+        type: UniLabJsonCommand
       evaporate:
         feedback:
           current_device: current_device
@@ -2690,6 +2815,31 @@ virtual_separator:
           title: initialize参数
           type: object
         type: UniLabJsonCommandAsync
+      auto-post_init:
+        feedback: {}
+        goal: {}
+        goal_default:
+          ros_node: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                ros_node:
+                  type: object
+              required:
+              - ros_node
+              type: object
+            result: {}
+          required:
+          - goal
+          title: post_init参数
+          type: object
+        type: UniLabJsonCommand
       separate:
         feedback:
           current_status: status
@@ -3600,6 +3750,31 @@ virtual_solenoid_valve:
           title: is_closed参数
           type: object
         type: UniLabJsonCommand
+      auto-post_init:
+        feedback: {}
+        goal: {}
+        goal_default:
+          ros_node: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                ros_node:
+                  type: object
+              required:
+              - ros_node
+              type: object
+            result: {}
+          required:
+          - goal
+          title: post_init参数
+          type: object
+        type: UniLabJsonCommand
       auto-reset:
         feedback: {}
         goal: {}
@@ -4177,6 +4352,31 @@ virtual_solid_dispenser:
           title: parse_mol_string参数
           type: object
         type: UniLabJsonCommand
+      auto-post_init:
+        feedback: {}
+        goal: {}
+        goal_default:
+          ros_node: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                ros_node:
+                  type: object
+              required:
+              - ros_node
+              type: object
+            result: {}
+          required:
+          - goal
+          title: post_init参数
+          type: object
+        type: UniLabJsonCommand
     module: unilabos.devices.virtual.virtual_solid_dispenser:VirtualSolidDispenser
     status_types:
       current_reagent: str
@@ -4278,6 +4478,31 @@ virtual_stirrer:
           title: initialize参数
           type: object
         type: UniLabJsonCommandAsync
+      auto-post_init:
+        feedback: {}
+        goal: {}
+        goal_default:
+          ros_node: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                ros_node:
+                  type: object
+              required:
+              - ros_node
+              type: object
+            result: {}
+          required:
+          - goal
+          title: post_init参数
+          type: object
+        type: UniLabJsonCommand
       start_stir:
         feedback:
           status: status
@@ -4995,6 +5220,31 @@ virtual_transfer_pump:
           title: is_full参数
           type: object
         type: UniLabJsonCommand
+      auto-post_init:
+        feedback: {}
+        goal: {}
+        goal_default:
+          ros_node: null
+        handles: {}
+        placeholder_keys: {}
+        result: {}
+        schema:
+          description: ''
+          properties:
+            feedback: {}
+            goal:
+              properties:
+                ros_node:
+                  type: object
+              required:
+              - ros_node
+              type: object
+            result: {}
+          required:
+          - goal
+          title: post_init参数
+          type: object
+        type: UniLabJsonCommand
       auto-pull_plunger:
         feedback: {}
         goal: {}

unilabos/registry/resources/bioyond/YB_bottle.yaml

@@ -1,16 +1,3 @@
-YB_qiang_tou:
-  category:
-  - yb3
-  - YB_bottle
-  class:
-    module: unilabos.resources.bioyond.YB_bottles:YB_qiang_tou
-    type: pylabrobot
-  description: YB_qiang_tou
-  handles: []
-  icon: ''
-  init_param_schema: {}
-  registry_type: resource
-  version: 1.0.0
 YB_20ml_fenyeping:
   category:
   - yb3
@@ -37,6 +24,19 @@ YB_5ml_fenyeping:
   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_pei_ye_da_Bottle:
   category:
   - yb3
@@ -63,14 +63,14 @@ YB_pei_ye_xiao_Bottle:
   init_param_schema: {}
   registry_type: resource
   version: 1.0.0
-YB_jia_yang_tou_da:
+YB_qiang_tou:
   category:
   - yb3
   - YB_bottle
   class:
-    module: unilabos.resources.bioyond.YB_bottles:YB_jia_yang_tou_da
+    module: unilabos.resources.bioyond.YB_bottles:YB_qiang_tou
     type: pylabrobot
-  description: YB_jia_yang_tou_da
+  description: YB_qiang_tou
   handles: []
   icon: ''
   init_param_schema: {}
@@ -80,6 +80,7 @@ YB_ye_Bottle:
   category:
   - yb3
   - YB_bottle_carriers
+  - YB_bottle
   class:
     module: unilabos.resources.bioyond.YB_bottles:YB_ye_Bottle
     type: pylabrobot
@@ -88,4 +89,4 @@ YB_ye_Bottle:
   icon: ''
   init_param_schema: {}
   registry_type: resource
-  version: 1.0.0
+  version: 1.0.0

unilabos/registry/resources/bioyond/YB_bottle_carriers.yaml

@@ -11,71 +11,6 @@ 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_gaonianye:
-  category:
-  - yb3
-  - YB_bottle_carriers
-  class:
-    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_gaonianye
-    type: pylabrobot
-  description: YB_gaonianye
-  handles: []
-  icon: ''
-  init_param_schema: {}
-  registry_type: resource
-  version: 1.0.0
-YB_peiyepingdaban:
-  category:
-  - yb3
-  - YB_bottle_carriers
-  class:
-    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_peiyepingdaban
-    type: pylabrobot
-  description: YB_peiyepingdaban
-  handles: []
-  icon: ''
-  init_param_schema: {}
-  registry_type: resource
-  version: 1.0.0
-YB_6StockCarrier:
-  category:
-  - yb3
-  - YB_bottle_carriers
-  class:
-    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_6StockCarrier
-    type: pylabrobot
-  description: YB_6StockCarrier
-  handles: []
-  icon: ''
-  init_param_schema: {}
-  registry_type: resource
-  version: 1.0.0
-YB_6VialCarrier:
-  category:
-  - yb3
-  - YB_bottle_carriers
-  class:
-    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_6VialCarrier
-    type: pylabrobot
-  description: YB_6VialCarrier
-  handles: []
-  icon: ''
-  init_param_schema: {}
-  registry_type: resource
-  version: 1.0.0
 YB_20ml_fenyepingban:
   category:
   - yb3
@@ -102,40 +37,27 @@ YB_5ml_fenyepingban:
   init_param_schema: {}
   registry_type: resource
   version: 1.0.0
-YB_peiyepingxiaoban:
+YB_6StockCarrier:
   category:
   - yb3
   - YB_bottle_carriers
   class:
-    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_peiyepingxiaoban
+    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_6StockCarrier
     type: pylabrobot
-  description: YB_peiyepingxiaoban
+  description: YB_6StockCarrier
   handles: []
   icon: ''
   init_param_schema: {}
   registry_type: resource
   version: 1.0.0
-YB_shi_pei_qi_kuai:
+YB_6VialCarrier:
   category:
   - yb3
   - YB_bottle_carriers
   class:
-    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_shi_pei_qi_kuai
+    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_6VialCarrier
     type: pylabrobot
-  description: YB_shi_pei_qi_kuai
-  handles: []
-  icon: ''
-  init_param_schema: {}
-  registry_type: resource
-  version: 1.0.0
-YB_qiang_tou_he:
-  category:
-  - yb3
-  - YB_bottle_carriers
-  class:
-    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_qiang_tou_he
-    type: pylabrobot
-  description: YB_qiang_tou_he
+  description: YB_6VialCarrier
   handles: []
   icon: ''
   init_param_schema: {}
@@ -154,19 +76,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_gaonianye:
+  category:
+  - yb3
+  - YB_bottle_carriers
+  class:
+    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_gaonianye
+    type: pylabrobot
+  description: YB_gaonianye
+  handles: []
+  icon: ''
+  init_param_schema: {}
+  registry_type: resource
+  version: 1.0.0
 YB_jia_yang_tou_da_Carrier:
   category:
   - yb3
@@ -180,14 +102,53 @@ YB_jia_yang_tou_da_Carrier:
   init_param_schema: {}
   registry_type: resource
   version: 1.0.0
-YB_ye_100ml_Bottle:
+YB_peiyepingdaban:
   category:
   - yb3
   - YB_bottle_carriers
   class:
-    module: unilabos.resources.bioyond.YB_bottles:YB_ye_100ml_Bottle
+    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_peiyepingdaban
     type: pylabrobot
-  description: YB_ye_100ml_Bottle
+  description: YB_peiyepingdaban
+  handles: []
+  icon: ''
+  init_param_schema: {}
+  registry_type: resource
+  version: 1.0.0
+YB_peiyepingxiaoban:
+  category:
+  - yb3
+  - YB_bottle_carriers
+  class:
+    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_peiyepingxiaoban
+    type: pylabrobot
+  description: YB_peiyepingxiaoban
+  handles: []
+  icon: ''
+  init_param_schema: {}
+  registry_type: resource
+  version: 1.0.0
+YB_qiang_tou_he:
+  category:
+  - yb3
+  - YB_bottle_carriers
+  class:
+    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_qiang_tou_he
+    type: pylabrobot
+  description: YB_qiang_tou_he
+  handles: []
+  icon: ''
+  init_param_schema: {}
+  registry_type: resource
+  version: 1.0.0
+YB_shi_pei_qi_kuai:
+  category:
+  - yb3
+  - YB_bottle_carriers
+  class:
+    module: unilabos.resources.bioyond.YB_bottle_carriers:YB_shi_pei_qi_kuai
+    type: pylabrobot
+  description: YB_shi_pei_qi_kuai
   handles: []
   icon: ''
   init_param_schema: {}
@@ -206,3 +167,16 @@ YB_ye:
   init_param_schema: {}
   registry_type: resource
   version: 1.0.0
+YB_ye_100ml_Bottle:
+  category:
+  - yb3
+  - YB_bottle_carriers
+  class:
+    module: unilabos.resources.bioyond.YB_bottles:YB_ye_100ml_Bottle
+    type: pylabrobot
+  description: YB_ye_100ml_Bottle
+  handles: []
+  icon: ''
+  init_param_schema: {}
+  registry_type: resource
+  version: 1.0.0

unilabos/resources/battery/magazine.py

@@ -52,6 +52,15 @@ class Magazine(ResourceStack):
     def size_z(self) -> float:
         return self.get_size_z()
 
+    def serialize(self) -> dict:
+        return {
+            **super().serialize(),
+            "size_x": self.size_x or 10.0,
+            "size_y": self.size_y or 10.0,
+            "size_z": self.size_z or 10.0,
+            "max_sheets": self.max_sheets,
+        }
+
 
 class MagazineHolder(ItemizedResource):
     """子弹夹类 - 有多个洞位，每个洞位放多个极片"""

unilabos/resources/bioyond/decks.py

@@ -95,13 +95,13 @@ class BIOYOND_YB_Deck(Deck):
         }
         # warehouse 的位置
         self.warehouse_locations = {
-            "自动堆栈-左": Coordinate(-300.0, 158.0, 0.0),
-            "自动堆栈-右": Coordinate(4160.0, 158.0, 0.0),
-            "手动堆栈-左": Coordinate(-400.0, 877.0, 0.0),
-            "手动堆栈-右": Coordinate(4160.0, 877.0, 0.0),
+            "自动堆栈-左": Coordinate(-100.3, 171.5, 0.0),
+            "自动堆栈-右": Coordinate(3960.1, 155.9, 0.0),
+            "手动堆栈-左": Coordinate(-213.3, 804.4, 0.0),
+            "手动堆栈-右": Coordinate(3960.1, 807.6, 0.0),
             "粉末加样头堆栈": Coordinate(415.0, 1301.0, 0.0),
-            "配液站内试剂仓库": Coordinate(2162.0, 337.0, 0.0),
-            "试剂替换仓库": Coordinate(1173.0, 702.0, 0.0),
+            "配液站内试剂仓库": Coordinate(2162.0, 437.0, 0.0),
+            "试剂替换仓库": Coordinate(1173.0, 802.0, 0.0),
         }
 
         for warehouse_name, warehouse in self.warehouses.items():