diff --git a/db/jtDB.db b/db/jtDB.db index 1083177..78223e3 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 942005d..48fe46e 100644 --- a/widgets/main_window.py +++ b/widgets/main_window.py @@ -322,34 +322,28 @@ class MainWindow(MainWindowUI): if pallet_codes and len(pallet_codes) > 0: # 添加托盘号到下拉框 - for code in pallet_codes: - self.tray_edit.addItem(code) + self.tray_edit.addItems(pallet_codes) # 如果有之前的选择,尝试恢复它 - if current_text: - index = self.tray_edit.findText(current_text) - if index >= 0: - self.tray_edit.setCurrentIndex(index) + index = self.tray_edit.findText(current_text) + if index != -1: + self.tray_edit.setCurrentIndex(index) + else: + self.tray_edit.setCurrentIndex(-1) + self.tray_edit.setCurrentText("") + logging.info(f"已加载托盘号,共 {len(pallet_codes)} 个") else: - # 如果没有托盘号,添加默认项 - default_codes = ["托盘1", "托盘2", "托盘3", "托盘4", "托盘5", "托盘6"] - for code in default_codes: - self.tray_edit.addItem(code) - logging.warning("未找到托盘号,使用默认值") - - # 尝试恢复之前的选择 - if current_text: - index = self.tray_edit.findText(current_text) - if index >= 0: - self.tray_edit.setCurrentIndex(index) + # 如果没有托盘号,则不添加任何项目,保持为空 + logging.warning("未找到托盘号,托盘号列表将为空") + self.tray_edit.setCurrentText("") + + except Exception as e: logging.error(f"加载托盘号失败: {str(e)}") - # 如果加载失败,添加默认项 + # 如果加载失败,确保下拉框为空 self.tray_edit.clear() - default_codes = ["托盘1", "托盘2", "托盘3", "托盘4", "托盘5", "托盘6"] - for code in default_codes: - self.tray_edit.addItem(code) + self.tray_edit.setCurrentText("") def show_settings_page(self): """显示设置页面"""