业务代码调整

main
COT001\李旭光 2026-03-09 11:25:42 +08:00
parent 6d45d12656
commit ae014b5bb0
4 changed files with 13 additions and 18 deletions

3
.gitignore vendored
View File

@ -4,3 +4,6 @@ backend/dist/
venv/ venv/
frontend/build/ frontend/build/
frontend/dist/ frontend/dist/
backend/wrench.db-shm
backend/wrench.db-wal
backend/wrench.db

Binary file not shown.

View File

@ -636,14 +636,6 @@ class WrenchGUI:
orders = data.get("data", []) orders = data.get("data", [])
self.root.after(0, lambda o=orders: self.update_order_list(o)) 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: if len(orders) > 0:
self.root.after(0, lambda: self.poll_status_label.config( self.root.after(0, lambda: self.poll_status_label.config(
text=f"🔄 已找到 {len(orders)} 个可用工单", fg="#27ae60" text=f"🔄 已找到 {len(orders)} 个可用工单", fg="#27ae60"
@ -937,7 +929,7 @@ class WrenchGUI:
self.log("✅ 已启用远程控制", "SUCCESS") self.log("✅ 已启用远程控制", "SUCCESS")
# 等待扳手初始化完成 # 等待扳手初始化完成
time.sleep(0.5) time.sleep(2)
self.log("扳手初始化完成,准备开始拧紧") self.log("扳手初始化完成,准备开始拧紧")
# 遍历所有螺栓 # 遍历所有螺栓

View File

@ -363,9 +363,9 @@ class WrenchController:
torque_max_nm = target_torque * 1.2 # 默认上限 torque_max_nm = target_torque * 1.2 # 默认上限
# 协议中扭矩以 0.1Nm 精度编码:协议值 = Nm × 10 # 协议中扭矩以 0.1Nm 精度编码:协议值 = Nm × 10
target_torque_val = int(round(target_torque * 10)) target_torque_val = round(target_torque * 10)
torque_min_val = int(round(torque_min_nm * 10)) torque_min_val = round(torque_min_nm * 10)
torque_max_val = int(round(torque_max_nm * 10)) torque_max_val = round(torque_max_nm * 10)
# 角度需要乘10 # 角度需要乘10
angle_value = target_angle * 10 angle_value = target_angle * 10
@ -408,22 +408,22 @@ class WrenchController:
data.append(mode) data.append(mode)
# 目标扭矩 (2字节Nm×10) # 目标扭矩 (2字节Nm×10)
data.extend(struct.pack('>H', target_torque_val)) data.extend(struct.pack('>H', int(target_torque_val)))
# 扭矩下限 (2字节Nm×10) # 扭矩下限 (2字节Nm×10)
data.extend(struct.pack('>H', torque_min_val)) data.extend(struct.pack('>H', int(torque_min_val)))
# 扭矩上限 (2字节Nm×10) # 扭矩上限 (2字节Nm×10)
data.extend(struct.pack('>H', torque_max_val)) data.extend(struct.pack('>H', int(torque_max_val)))
# 目标角度 (2字节) # 目标角度 (2字节)
data.extend(struct.pack('>H', angle_value)) data.extend(struct.pack('>H', int(angle_value)))
# 角度上限 (2字节) # 角度上限 (2字节)
data.extend(struct.pack('>H', angle_max_value)) data.extend(struct.pack('>H', int(angle_max_value)))
# 角度下限 (2字节) # 角度下限 (2字节)
data.extend(struct.pack('>H', angle_min_value)) data.extend(struct.pack('>H', int(angle_min_value)))
# 计算并添加校验码 # 计算并添加校验码
checksum = self._calculate_checksum(data) checksum = self._calculate_checksum(data)