From 443dc2d416586065ed22f0ac6041e96f39ab0b12 Mon Sep 17 00:00:00 2001
From: zhu-mengmeng <15588200382@163.com>
Date: Tue, 24 Jun 2025 17:30:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E5=8F=B7=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91=EF=BC=8C=E7=AE=80?=
 =?UTF-8?q?=E5=8C=96=E4=B8=8B=E6=8B=89=E6=A1=86=E9=A1=B9=E7=9B=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B9=E5=BC=8F=EF=BC=8C=E7=A1=AE=E4=BF=9D=E6=9C=AA?=
 =?UTF-8?q?=E6=89=BE=E5=88=B0=E6=89=98=E7=9B=98=E5=8F=B7=E6=97=B6=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E4=BF=9D=E6=8C=81=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/jtDB.db             | Bin 77824 -> 77824 bytes
 widgets/main_window.py |  36 +++++++++++++++---------------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/db/jtDB.db b/db/jtDB.db
index 1083177bf6366a5769f78d7b15b07ae0cefe8890..78223e30470275b82e4b32a212dd2477f85584a1 100644
GIT binary patch
delta 100
zcmZp8z|!!5Wr8%L{zMsPR(%G&vd)bu3)ahUa(!dq@8pf<H|BZ4)6JvHeSkZf>l*}a
zR@jit!^FFBa_b%s7Gq;8)5#b2JYZp9U~HPqyH9fRxxJHt9EMAi_wJM2T(_^O5CG9T
BB<cVF

delta 83
zcmV-Z0IdIj-~@o+1dtm6ERh^T1uOtAc8jrOpsySa3ibdGi4M6AVGaomu?<@fGYseq
piwrFbzzbWmAh2T$0uK?Bg}g`vGBi3elhM53v!AVC0kaXm?{Hw|9S8sb

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):
         """显示设置页面"""