From ae014b5bb02002cb88ffb1c04898f247f0724280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?COT001=5C=E6=9D=8E=E6=97=AD=E5=85=89?= <871066422@qq.com>
Date: Mon, 9 Mar 2026 11:25:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore             |   3 +++
 backend/wrench.db      | Bin 45056 -> 0 bytes
 frontend/wrench_gui.py |  10 +---------
 wrench_controller.py   |  18 +++++++++---------
 4 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 backend/wrench.db

diff --git a/.gitignore b/.gitignore
index 5cbdb97..c6fc4e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@ backend/dist/
 venv/
 frontend/build/
 frontend/dist/
+backend/wrench.db-shm
+backend/wrench.db-wal
+backend/wrench.db
diff --git a/backend/wrench.db b/backend/wrench.db
deleted file mode 100644
index e0998d7ffcfb569aa1cc38f21c5f339645894bf9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45056
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

diff --git a/frontend/wrench_gui.py b/frontend/wrench_gui.py
index c407ec9..2d1a47c 100644
--- a/frontend/wrench_gui.py
+++ b/frontend/wrench_gui.py
@@ -636,14 +636,6 @@ class WrenchGUI:
                         orders = data.get("data", [])
                         self.root.after(0, lambda o=orders: self.update_order_list(o))
                         
-                        # 检查当前认领的工单是否被退领
-                        if self.work_order:
-                            trace_id = self.work_order.get('trace_id')
-                            process_id = self.work_order.get('process_id')
-                            # 如果当前工单出现在可用列表中，说明被退领了
-                            if any(o.get('trace_id') == trace_id and o.get('process_id') == process_id for o in orders):
-                                self.root.after(0, self.clear_claimed_order)
-                        
                         if len(orders) > 0:
                             self.root.after(0, lambda: self.poll_status_label.config(
                                 text=f"🔄 已找到 {len(orders)} 个可用工单", fg="#27ae60"
@@ -937,7 +929,7 @@ class WrenchGUI:
             self.log("✅ 已启用远程控制", "SUCCESS")
             
             # 等待扳手初始化完成
-            time.sleep(0.5)
+            time.sleep(2)
             self.log("扳手初始化完成，准备开始拧紧")
             
             # 遍历所有螺栓
diff --git a/wrench_controller.py b/wrench_controller.py
index 7c84b7e..6cd952b 100644
--- a/wrench_controller.py
+++ b/wrench_controller.py
@@ -363,9 +363,9 @@ class WrenchController:
             torque_max_nm = target_torque * 1.2  # 默认上限
 
         # 协议中扭矩以 0.1Nm 精度编码：协议值 = Nm × 10
-        target_torque_val = int(round(target_torque * 10))
-        torque_min_val = int(round(torque_min_nm * 10))
-        torque_max_val = int(round(torque_max_nm * 10))
+        target_torque_val = round(target_torque * 10)
+        torque_min_val = round(torque_min_nm * 10)
+        torque_max_val = round(torque_max_nm * 10)
         
         # 角度需要乘10
         angle_value = target_angle * 10
@@ -408,22 +408,22 @@ class WrenchController:
         data.append(mode)
         
         # 目标扭矩 (2字节，Nm×10)
-        data.extend(struct.pack('>H', target_torque_val))
+        data.extend(struct.pack('>H', int(target_torque_val)))
         
         # 扭矩下限 (2字节，Nm×10)
-        data.extend(struct.pack('>H', torque_min_val))
+        data.extend(struct.pack('>H', int(torque_min_val)))
         
         # 扭矩上限 (2字节，Nm×10)
-        data.extend(struct.pack('>H', torque_max_val))
+        data.extend(struct.pack('>H', int(torque_max_val)))
         
         # 目标角度 (2字节)
-        data.extend(struct.pack('>H', angle_value))
+        data.extend(struct.pack('>H', int(angle_value)))
         
         # 角度上限 (2字节)
-        data.extend(struct.pack('>H', angle_max_value))
+        data.extend(struct.pack('>H', int(angle_max_value)))
         
         # 角度下限 (2字节)
-        data.extend(struct.pack('>H', angle_min_value))
+        data.extend(struct.pack('>H', int(angle_min_value)))
         
         # 计算并添加校验码
         checksum = self._calculate_checksum(data)