修改了界面显示(生产进度条、上料斗位置状态)、增加了将角度信息上传opc
This commit is contained in:
@ -1,18 +1,20 @@
|
||||
from PySide6.QtCore import QTimer, Signal, QObject, Slot
|
||||
import threading
|
||||
from hardware.transmitter import TransmitterController
|
||||
from hardware.relay import RelayController
|
||||
# from hardware.transmitter import TransmitterController
|
||||
# from hardware.relay import RelayController
|
||||
from view.widgets.hopper_widget import HopperWidget
|
||||
from view.widgets.conveyor_system_widget import ConveyorSystemWidget
|
||||
from enum import Enum
|
||||
|
||||
class UpperHopperPosition(Enum):
|
||||
"""上料斗位置
|
||||
- MIXING_TOWER: 搅拌楼处,对应数值 66
|
||||
- VIBRATION_CHAMBER: 振捣室处,对应数值 5
|
||||
- MIXING_TOWER: 搅拌楼处,对应数值 1
|
||||
- VIBRATION_CHAMBER: 振捣室处,对应数值 2
|
||||
- IN_TRANSIT: 途中,对应数值 3
|
||||
"""
|
||||
MIXING_TOWER = 66 # 搅拌楼处
|
||||
VIBRATION_CHAMBER = 5 # 振捣室处
|
||||
MIXING_TOWER = 1 # 搅拌楼处
|
||||
VIBRATION_CHAMBER = 2 # 振捣室处
|
||||
IN_TRANSIT = 3 # 运输途中
|
||||
|
||||
# 信号类:后台线程向主线程传递数据
|
||||
class HopperSignals(QObject):
|
||||
@ -42,7 +44,7 @@ class HopperController:
|
||||
self._connect_signals()
|
||||
|
||||
# 开启定时器
|
||||
self.timer_angle.start()
|
||||
# self.timer_angle.start()
|
||||
# self.timer_weight.start()
|
||||
|
||||
def _connect_signals(self):
|
||||
@ -58,14 +60,14 @@ class HopperController:
|
||||
# 上料斗 "开"按钮点击
|
||||
self.hopper_view.upper_open_btn.clicked.connect(self.onUpperClampOpenBottonClicked)
|
||||
|
||||
# 上料斗 "破拱"按钮
|
||||
self.hopper_view.upper_arch_breaking_signal.connect(self.onUpperArchBreaking)
|
||||
# 上料斗 "破拱"按钮点击
|
||||
self.hopper_view.upper_arch_breaking_signal.connect(self.onUpperArchBreakingClicked)
|
||||
|
||||
# 下料斗 "开"按钮点击
|
||||
self.hopper_view.lower_open_btn.clicked.connect(self.onLowerClampOpenBottonClicked)
|
||||
|
||||
# 下料斗 "破拱"按钮
|
||||
self.hopper_view.lower_arch_breaking_signal.connect(self.onLowerArchBreaking)
|
||||
# 下料斗 "破拱"按钮点击
|
||||
self.hopper_view.lower_arch_breaking_signal.connect(self.onLowerArchBreakingClicked)
|
||||
|
||||
def handleLowerClampAngleUpdate(self):
|
||||
"""处理下料斗夹爪开合"""
|
||||
@ -102,15 +104,16 @@ class HopperController:
|
||||
@Slot()
|
||||
def handleReadUpperHopperWeight(self):
|
||||
# 后台读取上料斗重量
|
||||
def upper_weight_task():
|
||||
loc_tra = TransmitterController(RelayController())
|
||||
# 上料斗重量 (目前只有上料斗安装变送器, 可以读取到重量)
|
||||
upper_weight = loc_tra.read_data(1)
|
||||
# 发送信号到主线程更新UI
|
||||
if upper_weight is not None:
|
||||
self.signals.upper_weight_updated.emit(upper_weight)
|
||||
# def upper_weight_task():
|
||||
# loc_tra = TransmitterController(RelayController())
|
||||
# # 上料斗重量 (目前只有上料斗安装变送器, 可以读取到重量)
|
||||
# upper_weight = loc_tra.read_data(1)
|
||||
# # 发送信号到主线程更新UI
|
||||
# if upper_weight is not None:
|
||||
# self.signals.upper_weight_updated.emit(upper_weight)
|
||||
|
||||
threading.Thread(target=upper_weight_task, daemon=True).start()
|
||||
# threading.Thread(target=upper_weight_task, daemon=True).start()
|
||||
pass
|
||||
|
||||
@Slot(float)
|
||||
def onUpdateLowerClampAngle(self, angle:float):
|
||||
@ -131,36 +134,51 @@ class HopperController:
|
||||
|
||||
@Slot(int)
|
||||
def onUpdateUpperClampStatus(self, status:int):
|
||||
# 上料斗夹爪状态 1表示打开,0表示关闭
|
||||
if status:
|
||||
# 执行上料斗夹爪打开动画
|
||||
# 上料斗夹爪状态 (1:半开,2全开,0:关闭)
|
||||
if status == 1:
|
||||
# 上料斗门半开
|
||||
self.hopper_view.upper_clamp_widget.testAnimation(target_angle=30, duration=5)
|
||||
elif status == 2:
|
||||
# 上料斗门全开
|
||||
self.hopper_view.upper_clamp_widget.testAnimation(target_angle=60, duration=10)
|
||||
else:
|
||||
# 执行上料斗夹爪关闭动画
|
||||
self.hopper_view.upper_clamp_widget.testAnimation(target_angle=0, duration=10)
|
||||
elif status == 0:
|
||||
# 上料斗门关闭
|
||||
self.hopper_view.upper_clamp_widget.testAnimation(target_angle=0, duration=6)
|
||||
|
||||
def onUpdateUpperHopperPosition(self, position:int):
|
||||
# 上料斗位置
|
||||
if position == UpperHopperPosition.MIXING_TOWER.value: # 上料斗到达搅拌楼,值为66
|
||||
if position == UpperHopperPosition.MIXING_TOWER.value: # 上料斗到达搅拌楼
|
||||
# 上料斗在搅拌楼下
|
||||
self.hopper_view.hideUpperHopper() # 隐藏非传送带处的上料斗
|
||||
self.conveyor_view.moveHopperBelowMixer() # 传送带处的上料斗移动到搅料楼下
|
||||
self.conveyor_view.showHopper() # 显示传送带处的上料斗
|
||||
elif position == UpperHopperPosition.VIBRATION_CHAMBER.value: # 上料斗就绪,到达振捣室,值为5
|
||||
elif position == UpperHopperPosition.VIBRATION_CHAMBER.value: # 上料斗就绪,到达振捣室
|
||||
# 上料斗在振捣室处
|
||||
self.conveyor_view.hideHopper() # 隐藏传送带处的上料斗
|
||||
self.hopper_view.upper_clamp_widget.set_angle(0) # 上料斗夹爪角度设置为0,此时上料斗一定是关闭的
|
||||
self.hopper_view.showUpperHopper() # 显示非传送带处的上料斗
|
||||
else:
|
||||
elif position == UpperHopperPosition.IN_TRANSIT.value:
|
||||
# 上料斗在途中
|
||||
self.hopper_view.hideUpperHopper() # 隐藏非传送带处的上料斗 (下料斗处对应的上料斗叫非传送带处上料斗)
|
||||
self.conveyor_view.moveHopperToTransition() # 传送带处上料斗移动到中间过渡位置
|
||||
self.conveyor_view.showHopper() # 显示传送带处的上料斗
|
||||
|
||||
@Slot(bool)
|
||||
def onUpperArchBreaking(self, status:bool):
|
||||
"""上料斗破拱: status 为True表示 开启破拱, 为False表示 关闭破拱"""
|
||||
print("hopper_controller: onUpperArchBreaking ", status)
|
||||
def onUpperArchBreakingStatusChanged(self, status:bool):
|
||||
"""上料斗破拱状态改变: status 为True表示 破拱状态, 为False表示 不破拱状态"""
|
||||
if status == True: # 破拱状态
|
||||
self.hopper_view.upper_arch_breaking_status = True
|
||||
self.hopper_view.upper_arch_label.setHidden(False)
|
||||
else: # 不破拱状态
|
||||
self.hopper_view.upper_arch_breaking_status = False
|
||||
self.hopper_view.upper_arch_label.setHidden(True)
|
||||
|
||||
@Slot(bool)
|
||||
def onUpperArchBreakingClicked(self, status:bool):
|
||||
"""上料斗破拱按钮点击: status 为True表示 开启破拱, 为False表示 关闭破拱"""
|
||||
print("hopper_controller: onUpperArchBreakingClicked ", status)
|
||||
# 这里需要控制网络继电器,开启上料斗破拱(可能还需要同步opc的上料斗破拱状态)
|
||||
|
||||
|
||||
@Slot(int)
|
||||
def onUpperHopperStatusChanged(self, status:int):
|
||||
@ -179,9 +197,20 @@ class HopperController:
|
||||
print("hopper_controller: onLowerClampOpenBottonClicked")
|
||||
|
||||
@Slot(bool)
|
||||
def onLowerArchBreaking(self, status:bool):
|
||||
"""下料斗破拱: status 为True表示 开启破拱, 为False表示 关闭破拱"""
|
||||
print("hopper_controller: onLowerArchBreaking ", status)
|
||||
def onLowerArchBreakingStatusChanged(self, status:bool):
|
||||
"""下料斗破拱状态改变: status 为True表示 破拱状态, 为False表示 不破拱状态"""
|
||||
if status == True: # 破拱状态
|
||||
self.hopper_view.lower_arch_breaking_status = True
|
||||
self.hopper_view.lower_arch_label.setHidden(False)
|
||||
else: # 不破拱状态
|
||||
self.hopper_view.lower_arch_breaking_status = False
|
||||
self.hopper_view.lower_arch_label.setHidden(True)
|
||||
|
||||
@Slot(bool)
|
||||
def onLowerArchBreakingClicked(self, status:bool):
|
||||
"""下料斗破拱按钮点击: status 为True表示 开启破拱, 为False表示 关闭破拱"""
|
||||
print("hopper_controller: onLowerArchBreakingClicked ", status)
|
||||
# 这里需要控制网络继电器,开启下料斗破拱(可能还需要同步opc的下料斗破拱状态)
|
||||
|
||||
@Slot(int)
|
||||
def onLowerHopperStatusChanged(self, status:int):
|
||||
|
||||
@ -15,7 +15,13 @@ from service.pdrecord_query_thread import PDRecordQueryThread # 派单任务查
|
||||
from busisness.models import ArtifactInfoModel
|
||||
from busisness.models import PDRecordModel
|
||||
from typing import List
|
||||
from enum import Enum
|
||||
|
||||
class FeedStatus(Enum):
|
||||
"""下料状态
|
||||
- FEED_FINISH: 下料完成,对应数值 11
|
||||
"""
|
||||
FEED_FINISH = 11 # 下料完成
|
||||
|
||||
class MainController:
|
||||
def __init__(self):
|
||||
@ -40,6 +46,15 @@ class MainController:
|
||||
self.opc_client = OpcuaUiClient()
|
||||
self.opc_client.start()
|
||||
|
||||
# 刷新派单任务和管片任务定时器
|
||||
self.refresh_task_timer = QTimer()
|
||||
self.refresh_task_timer.setInterval(2000)
|
||||
self.refresh_task_timer.timeout.connect(self._refresh_segment_and_pd_task)
|
||||
self.refresh_task_timer.start()
|
||||
|
||||
# 下料状态
|
||||
self.feed_status = None
|
||||
|
||||
# 连接信号
|
||||
self.__connectSignals()
|
||||
|
||||
@ -86,10 +101,30 @@ class MainController:
|
||||
# 主界面的计划表单中的计划方量修改控制
|
||||
self.main_window.plan_volume_modified_signal.connect(self.handleVolumeModified) # 计划方量修改
|
||||
|
||||
def _refresh_segment_and_pd_task(self):
|
||||
"""
|
||||
定时器槽函数: 每2秒执行一次
|
||||
写入OPC节点触发管片任务/派单任务刷新
|
||||
"""
|
||||
try:
|
||||
# 1. 触发管片任务刷新
|
||||
self._update_sys_segment_refresh(1)
|
||||
# 2. 触发派单任务刷新
|
||||
self._update_sys_pd_refresh(1)
|
||||
except Exception as e:
|
||||
# 捕获异常并记录,避免定时器崩溃
|
||||
error_msg = f"定时刷新管片/派单任务失败:{str(e)}"
|
||||
self.msg_recorder.warning_record(error_msg)
|
||||
|
||||
def handleMainWindowClose(self):
|
||||
"""主界面关闭"""
|
||||
self.msg_recorder.normal_record("关闭自动智能浇筑系统")
|
||||
|
||||
# 停止管片任务和派单任务定时器
|
||||
if hasattr(self, 'refresh_task_timer') and self.refresh_task_timer.isActive():
|
||||
self.refresh_task_timer.stop()
|
||||
self.refresh_task_timer.deleteLater()
|
||||
|
||||
# 停止系统底部控制器中的线程
|
||||
if hasattr(self, 'bottom_control_controller'):
|
||||
self.bottom_control_controller.stop_threads()
|
||||
@ -102,13 +137,13 @@ class MainController:
|
||||
pd_mode: 1,自动派单 2,手动派单
|
||||
"""
|
||||
if auto_status: # 自动派单
|
||||
self.opc_client.write_value_by_name("pd_mode", 1)
|
||||
self.opc_client.write_value_by_name("pd_set_mode", 1)
|
||||
else: # 手动派单
|
||||
self.opc_client.write_value_by_name("pd_mode", 2)
|
||||
self.opc_client.write_value_by_name("pd_set_mode", 2)
|
||||
|
||||
def handleVolumeModified(self, volume_json_str:str):
|
||||
"""处理 修改方量 (计划表单中 和 派单详情中)"""
|
||||
self.opc_client.write_value_by_name("pd_plan_volume", volume_json_str)
|
||||
self.opc_client.write_value_by_name("pd_set_volume", volume_json_str)
|
||||
|
||||
def start_msg_database_clean_task(self):
|
||||
"""启动清理消息数据库(messages.db)中过期消息的定时任务"""
|
||||
@ -181,51 +216,96 @@ class MainController:
|
||||
def onUpdateUiByArtifactInfo(self, artifact_list:List[ArtifactInfoModel]):
|
||||
# 更新管片任务
|
||||
self.main_window.update_segment_tasks(artifact_list)
|
||||
# 将opc服务中的 segment_tasks的值复原为 0,以便下次触发管片更新
|
||||
self.opc_client.write_value_by_name("segment_tasks", 0)
|
||||
# 将opc服务中的 sys_segment_refresh的值复原为 0,以便下次触发管片更新
|
||||
self.opc_client.write_value_by_name("sys_segment_refresh", 0)
|
||||
|
||||
def onUpdateUiByPDRecord(self, pdrecord_list:List[PDRecordModel]):
|
||||
# 更新派单任务
|
||||
self.main_window.update_dispatch_tasks(pdrecord_list)
|
||||
# 将opc服务中的 dispatch_tasks的值复原为 0,以便下次触发派单更新
|
||||
self.opc_client.write_value_by_name("dispatch_tasks", 0)
|
||||
# 将opc服务中的 sys_pd_refresh的值复原为 0,以便下次触发派单更新
|
||||
self.opc_client.write_value_by_name("sys_pd_refresh", 0)
|
||||
|
||||
# ======================== OPCUA值更新界面方法 ======================
|
||||
# ============================= 上料斗相关 ==============
|
||||
def _update_upper_weight(self, val):
|
||||
# 更新上料斗重量
|
||||
self.hopper_controller.onUpdateUpperHopperWeight(val)
|
||||
|
||||
def _update_lower_weight(self, val):
|
||||
# 更新下料斗重量
|
||||
self.hopper_controller.onUpdateLowerHopperWeight(val)
|
||||
def _update_upper_is_arch(self, val):
|
||||
# 更新上料斗是否破拱
|
||||
self.hopper_controller.onUpperArchBreakingStatusChanged(val)
|
||||
|
||||
def _update_upper_door_closed(self, val:int):
|
||||
# 更新上料斗门的闭合状态
|
||||
# (1:半开,2全开,0:关闭)
|
||||
self.hopper_controller.onUpdateUpperClampStatus(val)
|
||||
|
||||
def _update_upper_volume(self, val):
|
||||
# 更新上料斗方量
|
||||
self.hopper_controller.onUpdateUpperHopperVolume(val)
|
||||
|
||||
def _update_production_progress(self, val):
|
||||
# 更新生产进度,限制为100, 进度为去掉百分号之后的整数
|
||||
progress = val
|
||||
self.main_window.arc_progress.setProgress(progress)
|
||||
self.main_window.production_progress.setProgress(progress)
|
||||
|
||||
def _update_lower_clamp_angle(self, val):
|
||||
# 更新下料斗夹爪角度
|
||||
self.hopper_controller.onUpdateLowerClampAngle(val)
|
||||
|
||||
def _update_upper_clamp_status(self, val):
|
||||
# 更新上料斗夹爪状态 0表示关闭 1表示打开
|
||||
self.hopper_controller.onUpdateUpperClampStatus(val)
|
||||
|
||||
def _update_upper_hopper_position(self, val):
|
||||
# 更新上料斗位置 5表示料斗到位,到达振捣室处 66表示在搅拌楼处
|
||||
def _update_upper_door_position(self, val):
|
||||
# 更新上料斗位置 2表示料斗到位,到达振捣室处 1表示在搅拌楼处
|
||||
self.hopper_controller.onUpdateUpperHopperPosition(val)
|
||||
if val == UpperHopperPosition.MIXING_TOWER.value:
|
||||
self.main_window.mixer_widget.startBladeMix()
|
||||
else:
|
||||
self.main_window.mixer_widget.stopBladeMix()
|
||||
|
||||
def _update_segment_tasks(self, val):
|
||||
# ============================= 下料斗相关 ==============
|
||||
def _update_lower_weight(self, val):
|
||||
# 更新下料斗重量
|
||||
self.hopper_controller.onUpdateLowerHopperWeight(val)
|
||||
|
||||
def _update_lower_is_arch(self, val:bool):
|
||||
# 更新下料斗是否破拱
|
||||
self.hopper_controller.onLowerArchBreakingStatusChanged(val)
|
||||
|
||||
def _update_lower_angle(self, val):
|
||||
# 更新下料斗夹爪角度
|
||||
self.hopper_controller.onUpdateLowerClampAngle(val)
|
||||
|
||||
# ========================== 模具车相关 ==============
|
||||
def _update_mould_finish_weight(self, finish_weight:int):
|
||||
# 更新模具车中的下料重量
|
||||
# finish_weight:已下料重量
|
||||
self.main_window.arc_progress.setWeight(finish_weight)
|
||||
|
||||
def _update_mould_finish_ratio(self, val:float):
|
||||
# 更新生产进度,限制为100, progress进度为去掉百分号之后的整数
|
||||
# 注意: 此时的val是浮点数的比例,需要保留两位小数后乘以100后得到progress
|
||||
if self.feed_status == FeedStatus.FEED_FINISH.value:
|
||||
return # 下料完成,不需要更新进度条,就是100%
|
||||
progress = round(val, 2) * 100 # 保留两位小数后乘100
|
||||
self.main_window.arc_progress.setProgress(progress)
|
||||
self.main_window.production_progress.setProgress(progress)
|
||||
|
||||
def _update_mould_frequency(self, val):
|
||||
# 更新振捣频率
|
||||
self.main_window.frequency_button_group.set_selected_frequency(val) # 频率选择按钮上显示的选中的频率
|
||||
self.main_window.arc_progress.setFrequency(val) # 模具车上显示的振捣频率
|
||||
|
||||
def _update_mould_vibrate_status(self, vibrate_status:bool):
|
||||
# 更新模具车上显示的振捣状态
|
||||
# vibrate_status: False:未振捣、True:振捣中
|
||||
if vibrate_status:
|
||||
self.main_window.arc_progress.setState("振捣中")
|
||||
else:
|
||||
self.main_window.arc_progress.setState("未振捣")
|
||||
self.opc_client.write_value_by_name("mould_frequency", 0) # 将振捣频率设置为0
|
||||
|
||||
def _update_feed_status(self, status:int):
|
||||
# 下料(浇筑)状态
|
||||
self.feed_status = status # 更新下料状态
|
||||
if status == FeedStatus.FEED_FINISH.value:
|
||||
# 下料完成
|
||||
# 1、将生产进度条调整为100%的状态
|
||||
self.main_window.arc_progress.setProgress(100)
|
||||
self.main_window.production_progress.setProgress(100)
|
||||
|
||||
|
||||
# ===================================== 系统状态相关 ====================
|
||||
def _update_sys_segment_refresh(self, val):
|
||||
if val: # 需要更新管片任务
|
||||
"""更新左侧的管片任务"""
|
||||
if hasattr(self, "segment_query_thread") and self.segment_query_thread.isRunning():
|
||||
@ -238,7 +318,7 @@ class MainController:
|
||||
self.segment_query_thread.query_error.connect(self.onQueryInfoError)
|
||||
self.segment_query_thread.start()
|
||||
|
||||
def _update_dispatch_tasks(self, val):
|
||||
def _update_sys_pd_refresh(self, val):
|
||||
if val: # 需要更新派单任务
|
||||
"""更新右侧的派单任务"""
|
||||
if hasattr(self, "dispatch_query_thread") and self.dispatch_query_thread.isRunning():
|
||||
@ -255,26 +335,8 @@ class MainController:
|
||||
# 查询信息失败预警
|
||||
self.msg_recorder.warning_record(error_msg)
|
||||
|
||||
def _update_vibration_frequency(self, val):
|
||||
# 更新振捣频率
|
||||
self.main_window.frequency_button_group.set_selected_frequency(val) # 频率选择按钮上显示的选中的频率
|
||||
self.main_window.arc_progress.setFrequency(val) # 模具车上显示的振捣频率
|
||||
|
||||
def _update_mould_vibrate_status(self, vibrate_status:bool):
|
||||
# 更新模具车上显示的振捣状态
|
||||
# vibrate_status: False:未振捣、True:振捣中
|
||||
if vibrate_status:
|
||||
self.main_window.arc_progress.setState("振捣中")
|
||||
else:
|
||||
self.main_window.arc_progress.setState("未振捣")
|
||||
self.opc_client.write_value_by_name("vibration_frequency", 0) # 将振捣频率设置为0
|
||||
|
||||
def _update_mould_finish_weight(self, finish_weight:int):
|
||||
# 更新模具车中的下料重量
|
||||
# finish_weight:已下料重量
|
||||
self.main_window.arc_progress.setWeight(finish_weight)
|
||||
|
||||
def _update_pd_mode(self, mode:int):
|
||||
# ========================================= 派单相关 =====================
|
||||
def _update_pd_set_mode(self, mode:int):
|
||||
# 更新计划表单中的 派单模式(主界面下发状态的下面的切换开关),自动派单/手动派单
|
||||
mode_mapping = {
|
||||
1: "自动派单",
|
||||
@ -288,4 +350,4 @@ class MainController:
|
||||
# 修改系统配置文件中的 派单状态为自动派单...
|
||||
else:
|
||||
self.main_window.plan_table_widget.set_auto_dispatch(False) # 关闭,手动派单
|
||||
# 修改系统配置文件中的 派单状态为手动派单...
|
||||
# 修改系统配置文件中的 派单状态为手动派单
|
||||
|
||||
Reference in New Issue
Block a user