diff --git a/config/app_config.json b/config/app_config.json index fda7ed6..fabab93 100644 --- a/config/app_config.json +++ b/config/app_config.json @@ -122,7 +122,7 @@ } }, "electricity": { - "auto_start": true, + "auto_start": false, "interval_minutes": 30 } } \ No newline at end of file diff --git a/db/jtDB.db b/db/jtDB.db index 739fe42..b157785 100644 Binary files a/db/jtDB.db and b/db/jtDB.db differ diff --git a/widgets/main_window.py b/widgets/main_window.py index 9ecb1fa..3fbba78 100644 --- a/widgets/main_window.py +++ b/widgets/main_window.py @@ -112,6 +112,10 @@ class MainWindow(MainWindowUI): self._is_loading_active = False # 标识上料任务是否正在进行 self._current_gc_qd = 0 # 当前工程号的强度数据 + # 添加对上料和下料对话框的引用 + self.loading_dialog = None # 上料对话框 + self.unloading_dialog = None # 下料对话框 + # 信号的连接在connect_signals方法中统一处理,不在这里连接 # 称重相关变量 @@ -651,7 +655,14 @@ class MainWindow(MainWindowUI): # 创建上料对话框 from widgets.loading_dialog_widget import LoadingDialog - dialog = LoadingDialog(parent=self,user_id=self.user_id,user_name=self.user_name,corp_id=self.corp_id) + self.loading_dialog = LoadingDialog(parent=self,user_id=self.user_id,user_name=self.user_name,corp_id=self.corp_id) + dialog = self.loading_dialog # 使用类属性引用对话框 + + # 获取当前主窗口中选择的托盘号,并设置到上料对话框中 + current_tray_id = self.tray_edit.currentText() + if current_tray_id: + dialog.tray_input.setText(current_tray_id) + logging.info(f"将主窗口当前托盘号 {current_tray_id} 设置到上料对话框") # 如果已有上料信息,作为参考显示在对话框中,但允许用户修改 if self._loading_info and self._current_stow_num > 0: @@ -723,7 +734,14 @@ class MainWindow(MainWindowUI): self.serial_manager.auto_open_configured_ports() self.serial_manager.start_keyboard_listener() - dialog = UnloadingDialog(self, self.user_id) + self.unloading_dialog = UnloadingDialog(self, self.user_id) + dialog = self.unloading_dialog # 使用类属性引用对话框 + + # 获取当前主窗口中选择的托盘号,并设置到下料对话框中 + current_tray_id = self.tray_edit.currentText() + if current_tray_id: + dialog.tray_input.setText(current_tray_id) + logging.info(f"将主窗口当前托盘号 {current_tray_id} 设置到下料对话框") # 如果有之前的下料信息,作为参考显示在对话框中,但允许用户修改 if self._current_unload_info: