Merge pull request #167 from lixinyu1011/workstation_dev_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,
@@ -95,3 +94,5 @@
   ],
   "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 (
@@ -256,7 +257,7 @@ class BioyondCellWorkstation(BioyondWorkstation):
     def auto_feeding4to3(
         self,
         # ★ 修改点：默认模板路径
-        xlsx_path: Optional[str] = "/Users/sml/work/Unilab/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/material_template.xlsx",
+        xlsx_path: Optional[str] = "/Users/calvincao/Desktop/work/uni-lab-all/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/material_template.xlsx",
         # ---------------- WH4 - 加样头面 (Z=1, 12个点位) ----------------
         WH4_x1_y1_z1_1_materialName: str = "", WH4_x1_y1_z1_1_quantity: float = 0.0,
         WH4_x2_y1_z1_2_materialName: str = "", WH4_x2_y1_z1_2_quantity: float = 0.0,
@@ -323,6 +324,7 @@ class BioyondCellWorkstation(BioyondWorkstation):
                             "posX": int(row[2]), "posY": int(row[3]), "posZ": int(row[4]),
                             "materialName": str(row[5]).strip(),
                             "quantity": float(row[6]) if pd.notna(row[6]) else 0.0,
+                            "temperature": 0,
                         })
                 # 四号手套箱原液瓶面
                 for _, row in df.iloc[14:23, 2:9].iterrows():
@@ -334,6 +336,7 @@ class BioyondCellWorkstation(BioyondWorkstation):
                             "quantity": float(row[6]) if pd.notna(row[6]) else 0.0,
                             "materialType": str(row[7]).strip() if pd.notna(row[7]) else "",
                             "targetWH": str(row[8]).strip() if pd.notna(row[8]) else "",
+                            "temperature": 0,
                         })
                 # 三号手套箱人工堆栈
                 for _, row in df.iloc[25:40, 2:7].iterrows():
@@ -343,11 +346,12 @@ class BioyondCellWorkstation(BioyondWorkstation):
                             "posX": int(row[2]), "posY": int(row[3]), "posZ": int(row[4]),
                             "materialType": str(row[5]).strip() if pd.notna(row[5]) else "",
                             "materialId": str(row[6]).strip() if pd.notna(row[6]) else "",
-                            "quantity": 1
+                            "quantity": 1,
+                            "temperature": 0,
                         })
             else:
                 logger.warning(f"未找到 Excel 文件 {xlsx_path}，自动切换到手动参数模式。")
-
+        # TODO: 温度下面手动模式没改，上面的改了
         # ---------- 模式 2: 手动填写 ----------
         if not items:
             params = locals()
@@ -473,7 +477,7 @@ class BioyondCellWorkstation(BioyondWorkstation):
         - totalMass 自动计算为所有物料质量之和
         - createTime 缺失或为空时自动填充为当前日期（YYYY/M/D）
         """
-        default_path = Path("/Users/sml/work/Unilab/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/2025092701.xlsx")
+        default_path = Path("/Users/calvincao/Desktop/work/uni-lab-all/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/2025092701.xlsx")
         path = Path(xlsx_path) if xlsx_path else default_path
         print(f"[create_orders] 使用 Excel 路径: {path}")
         if path != default_path:
@@ -544,6 +548,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 +589,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)  # 自动汇总
@@ -1160,20 +1172,23 @@ if __name__ == "__main__":
     lab_registry.setup()
     deck = BIOYOND_YB_Deck(setup=True)
     ws = BioyondCellWorkstation(deck=deck)
-    # ws.create_sample(name="test", board_type="配液瓶(小)板", bottle_type="配液瓶(小)", location_code="B01")
-    # logger.info(ws.scheduler_stop())
+    # ws.update_push_ip() #直接修改奔耀端的报送ip地址
+    # ws.create_sample(name="配液瓶", board_type="配液瓶(小)板", bottle_type="配液瓶(小)", location_code="E01")
+    # ws.create_sample(name="分液瓶", board_type="5ml分液瓶板", bottle_type="5ml分液瓶", location_code="D01")
+
+    # # logger.info(ws.scheduler_stop())
     # logger.info(ws.scheduler_start())
     
-    # 继续后续流程
     # logger.info(ws.auto_feeding4to3()) #搬运物料到3号箱
-    # # # 使用正斜杠或 Path 对象来指定文件路径
-    # excel_path = Path("unilabos\\devices\\workstation\\bioyond_studio\\bioyond_cell\\2025092701.xlsx")
+    # 使用正斜杠或 Path 对象来指定文件路径
+    # excel_path = Path("/Users/calvincao/Desktop/work/uni-lab-all/Uni-Lab-OS/unilabos/devices/workstation/bioyond_studio/bioyond_cell/2025092701.xlsx")
     # logger.info(ws.create_orders(excel_path))
     # logger.info(ws.transfer_3_to_2_to_1())
-
     # logger.info(ws.transfer_1_to_2())
-    # logger.info(ws.scheduler_start())
 
+    # 1. location code
+    # 2. 实验文件
+    # 3. material template file
 
     while True:
         time.sleep(1)

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_1105.csv'))
+            self.nodes = BaseClient.load_csv(os.path.join(os.path.dirname(__file__), 'coin_cell_assembly_a.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("chengpindanjia")        
+        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, "读取已在运行中"

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:
@@ -138,7 +137,7 @@ bioyond_cell:
           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 +463,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 +599,7 @@ bioyond_cell:
           bottle_type: null
           location_code: null
           name: null
+          warehouse_name: 手动堆栈
         handles: {}
         placeholder_keys: {}
         result: {}
@@ -617,6 +617,9 @@ bioyond_cell:
                   type: string
                 name:
                   type: string
+                warehouse_name:
+                  default: 手动堆栈
+                  type: string
               required:
               - name
               - board_type
@@ -785,6 +788,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 +1108,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 +1127,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

@@ -502,7 +502,7 @@ coincellassemblyworkstation_device:
   config_info: []
   description: ''
   handles: []
-  icon: coin_cell_assembly_picture.webp
+  icon: koudian.webp
   init_param_schema:
     config:
       properties:

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():