This commit is contained in:
2025-12-29 00:36:40 +08:00
parent d33216f9b9
commit 26397a83dd

View File

@@ -470,16 +470,16 @@ class RawMaterialLibraryDialog(QDialog):
self.load_table() self.load_table()
def load_major_categories(self): def load_major_categories(self):
"""加载主类目""" """加载主类目 - 只显示数据库中实际存在的类目"""
try: try:
with self.get_conn() as conn: with self.get_conn() as conn:
cursor = conn.execute("SELECT DISTINCT category FROM fabrics WHERE category IS NOT NULL AND category != '' AND (is_deleted IS NULL OR is_deleted = 0)") cursor = conn.execute("SELECT DISTINCT category FROM fabrics WHERE category IS NOT NULL AND category != '' AND (is_deleted IS NULL OR is_deleted = 0)")
majors = set(row[0] for row in cursor.fetchall() if row[0]) majors = set(row[0] for row in cursor.fetchall() if row[0])
majors.update({"布料", "辅料", "其他"})
self.major_combo.blockSignals(True) self.major_combo.blockSignals(True)
self.major_combo.clear() self.major_combo.clear()
self.major_combo.addItem("全部类目") self.major_combo.addItem("全部类目")
if majors:
self.major_combo.addItems(sorted(majors)) self.major_combo.addItems(sorted(majors))
self.major_combo.blockSignals(False) self.major_combo.blockSignals(False)
except: except: