From 703f03f0bbe48bf3d787d83cf346b950affcd30e Mon Sep 17 00:00:00 2001
From: zhu-mengmeng <15588200382@163.com>
Date: Mon, 9 Jun 2025 01:16:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0InspectionDAO=E4=BB=A5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=89=98=E7=9B=98=E5=8F=B7=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BB=E7=AA=97=E5=8F=A3=E4=BB=A5=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=89=98=E7=9B=98=E5=8F=B7=E8=BE=93=E5=85=A5=E5=B9=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=A3=80=E9=AA=8C=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9F=A5=E8=AF=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BB=A5=E6=A0=B9=E6=8D=AE=E6=89=98=E7=9B=98=E5=8F=B7?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9C=AA=E5=AE=8C=E6=88=90=E7=9A=84=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E8=AE=B0=E5=BD=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/inspection_dao.py  |  25 ++++++++++++-----------
 db/jtDB.db             | Bin 28672 -> 36864 bytes
 widgets/main_window.py |  44 ++++++++++++++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/dao/inspection_dao.py b/dao/inspection_dao.py
index 11dba35..2112ce9 100644
--- a/dao/inspection_dao.py
+++ b/dao/inspection_dao.py
@@ -237,7 +237,7 @@ class InspectionDAO:
                 value = item.get('value')
                 status = item.get('status', 'pass')
                 remark = item.get('remark', '')
-                
+                tray_id = item.get('tray_id', '')
                 # 检查是否已存在该工程号和位置的记录
                 check_sql = """
                 SELECT id FROM inspection_data
@@ -253,7 +253,7 @@ class InspectionDAO:
                     update_sql = """
                     UPDATE inspection_data
                     SET config_id = ?, value = ?, status = ?, remark = ?,
-                        update_time = ?, update_by = ?
+                        update_time = ?, update_by = ?, tray_id = ?
                     WHERE id = ?
                     """
                     update_params = (
@@ -266,12 +266,12 @@ class InspectionDAO:
                     insert_sql = """
                     INSERT INTO inspection_data (
                         order_id, position, config_id, value, status, remark,
-                        create_time, create_by, is_deleted
-                    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, FALSE)
+                        create_time, create_by, is_deleted, tray_id
+                    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, FALSE, ?)
                     """
                     insert_params = (
                         order_id, position, config_id, value, status, remark,
-                        current_time, username
+                        current_time, username, tray_id
                     )
                     self.db.cursor.execute(insert_sql, insert_params)
             
@@ -281,7 +281,7 @@ class InspectionDAO:
             self.db.rollback_transaction()
             logging.error(f"保存检验数据失败: {str(e)}")
             return False
-    def get_inspection_data_unfinished(self):
+    def get_inspection_data_unfinished(self, tray_id):
         """获取未完成的检验数据
         
         Returns:
@@ -293,11 +293,12 @@ class InspectionDAO:
                    c.name, c.display_name, c.data_type, c.unit
             FROM inspection_data d
             JOIN inspection_config c ON d.config_id = c.id
-            WHERE d.is_deleted = FALSE 
+            WHERE d.is_deleted = FALSE AND d.tray_id = ?
             AND order_id IN (SELECT distinct order_id FROM inspection_data WHERE status != 'pass')
             ORDER BY d.order_id, d.position
             """
-            self.db.cursor.execute(sql)
+            params = (tray_id,)
+            self.db.cursor.execute(sql, params)
             results = self.db.cursor.fetchall()
             
             data_list = []
@@ -321,12 +322,12 @@ class InspectionDAO:
         except Exception as e:
             logging.error(f"获取未完成的检验数据失败: {str(e)}")
             return []
-    def get_inspection_data_by_order(self, order_id):
+    def get_inspection_data_by_order(self, order_id, tray_id):
         """根据工程号获取检验数据
         
         Args:
             order_id: 工程号
-            
+            tray_id: 托盘号
         Returns:
             list: 检验数据列表
         """
@@ -336,10 +337,10 @@ class InspectionDAO:
                    c.name, c.display_name, c.data_type, c.unit
             FROM inspection_data d
             JOIN inspection_config c ON d.config_id = c.id
-            WHERE d.order_id = ? AND d.is_deleted = FALSE
+            WHERE d.order_id = ? AND d.is_deleted = FALSE AND d.tray_id = ?
             ORDER BY d.position
             """
-            params = (order_id,)
+            params = (order_id, tray_id)
             
             self.db.cursor.execute(sql, params)
             results = self.db.cursor.fetchall()
diff --git a/db/jtDB.db b/db/jtDB.db
index bce2c99346ee473a27f19e5ee6ee50b9bc95420d..0810f0b9159240453fb6b483a7401c8ecffd0468 100644
GIT binary patch
delta 2666
zcma);Z)g)|9LMi2cb8n!yEE2WyHj_w)=vA!yQKL$*EY6^AcD4bsFy-%ZJXBqQ!8$=
z7uU*UOy5|J*|>t}#_(N1BEH#+GK3-w<~!dhMR9_z2qGdB#3z^g`{WK1$eVome)9bO
zJ-=se4V}A<UFU)_f*=(5>K}ZeIb0_rtrxG+>_>zoA0f<X_AwKr{-FOQAKjZjM*6Ru
zB)zpwP3YBJVU4_k(foz;gO>)zhxxwr$-crc^<xx`7uGs>o*@7gWjBg!irpv#`Iqd%
zvB0RWl?K1GB9{?%nU$DN%<oKwenJ0C@2&c$YO0D2+z*`aZ(z^-1AY&6mpbfQ_g(je
zy-z$z?+;!Mn<wYUdSaCrBLes`-s5@iStOtO|H4ujivErMgr-p(d5BzINbQt6S{Z~x
zQJSN}bqM0y(U(5nCkP=N|9<fN^!RixB!nU@LbOFl@Pd#Oqsee|_R{Qyk*WWF$-i34
z^P!FwM}Wsu5kM{ynjHxkRuKUJzHI^kih^UP#4Z;@_-0?}05zo?aHSlGBzbmlcD5`5
zp_nxRV*6g(>2)(fxc$A&FXzSfuN?vI6|ez-ztPd}UI44VdMPhvIR<G!(O@zBaGj4+
z4(2korSggrt7@#Fy_-nuT6P=c`#+ay)O^|9cI{|ycZ-_IL?T9#f}r$_)hKhrKIQBP
z6^ZkqP*N0=ZMN1Dv-R!_f>3%!Yjr}*AVh4n$?kF|;CMW4Jw>CzXtOiEvNM#f5hFWU
z9@6rr*8e5YC@NSSEH$g^BZrL4?Sy<?qb73)q~$Hzc1T+v&3vb2{6GU}19J%UKCGw<
zK@WTZkr&M#=&u8sHIn>kGm=`!ml`u8*$QblELshuy|HLpAgy!UWL5)>qF5uVcg`4^
zv|06;z53yd(W_Dr(hi$_ENz0cTNCLMT2|ZlI1ZQl-DDjuFk2D>u``p#nX)v{tg-xR
z#(Anr_0h)M{WjUHcTazyq!~F_pET;x?}xOmDN~~$?WRTZLE2kWle|FFI!o>3*W*SE
zgQV(fsEMiTgHzJeNAz<_gsPeKSeZ6_5)NtAGp6Q&wA@UZ((2KRDGL+Zl+~G}@_e{=
zdvQzp=^=z&VdvR)W`lXaoMW2lSM;CsP$9S}L(8c+fLX@ExQGNH>O32Xq-eiII%Dd2
z)LMWQ$ypE)#~qPK3i^(a)h!wBik1-CmbD?=Hid<vK_c!Dw{0PpQ`+1qZabqK5_X5!
zW<$2T9m*)F5TH2MCgN5bBeSKPq(oOlTM;3bKViTz1ltXNKq$?)w*K`ekYi~b-aq?o
OH-zris#;&c3+gj>1IWw(

delta 928
zcmZ|N&1=(O90%~HP4eWWO`b*Vwybuot`niowM|{g1YdBrFa=$jgANgNxZ!1Bx2{`j
zZ9Poed2sbPcpZ2ZQF`A&JWue@%d{2+{R6z{LGVes$R5E!;LC^a6Mj#gr?%y-bv>Iw
zbshk~lh=Ki<_TS!2Pan=GWrQ1Yy)Kuy;oH6g}ejXEw%3^l-8#qKM;#~HZHY3z;$oy
zj#!%TL|fgnk;qk<?SLrL0PGj^5?w>A@>-b?cjd0UA*cKu{}b_%KkfVKd+IwaeV3kz
z3E`vgSV;1pm<C_xb=ZLonBqEIgG;e>HpzT`^Uz?BrO9Aa6xE=tYq}=jdNCWCi4ya8
z<Ur4^m{ViPc=FVkVWc6%_m+?0+LD0J6@;iY(rfOm-rwZ7;;sDR-NgkwUO0}=6r`wi
z^uJ}6{in=I<ABAlswT=EaaO5&!{F`Z49Z1l3l=iS3KQG6k<~&L<%a2AoAh!a+VmA-
zhiTiiEl684Pi%;`SdrKuZPQD{259?c_xfqOuu3dI+m>yIX!~uOOiUD!dq@lA3^IAg
zWY?ZoE{-ToFt@Mw_c-G5M8f^SJJn=}^c4420+2gMe|>f><24W98`VMlc5TvYs!kj(
zk=W<Nk{yu~f8|M3oY-HUL^FP8c=zVucjYN$`FiFK8or-JmPA{{Hj%bn+XUK-N)}y*
tj*SM=x(0xNe^f5BWHaIB`JmV2$S4}V{lM^=tP{8G$T)GRYT((b^#}N3#4-Q?

diff --git a/widgets/main_window.py b/widgets/main_window.py
index 301573b..74e053b 100644
--- a/widgets/main_window.py
+++ b/widgets/main_window.py
@@ -115,6 +115,11 @@ class MainWindow(MainWindowUI):
         # 工程号输入框回车事件
         self.order_edit.returnPressed.connect(self.handle_order_enter)
         
+        # 托盘号输入框回车和切换事件，触发未加载数据查询
+        # QComboBox没有returnPressed信号，只有currentTextChanged和activated信号
+        self.tray_edit.currentTextChanged.connect(self.load_unfinished_inspection_data)
+        self.tray_edit.activated.connect(self.load_unfinished_inspection_data)  # 当用户选择一项时触发
+        
         # 连接按钮事件
         self.input_button.clicked.connect(self.handle_input)
         self.output_button.clicked.connect(self.handle_output)
@@ -434,6 +439,9 @@ class MainWindow(MainWindowUI):
             order_id = order_id_item.text().strip()
             if not order_id:
                 return
+        
+            # 获取托盘号
+            tray_id = self.tray_edit.currentText()
             
             # 获取启用的检验配置
             enabled_configs = self.inspection_manager.get_enabled_configs()
@@ -467,8 +475,10 @@ class MainWindow(MainWindowUI):
                         status = 'warning'
                     
                     # 保存到数据库
-                    self.save_inspection_data(order_id, config['position'], config['id'], value, status)
-            
+                    self.save_inspection_data(order_id, tray_id, config['position'], config['id'], value, status)
+
+                    # 触发查询， 更新页面记录回显
+                    self.load_unfinished_inspection_data()
         except Exception as e:
             logging.error(f"处理检验单元格变更失败: {str(e)}")
             self.statusBar().showMessage(f"处理检验数据失败: {str(e)[:50]}...", 3000)
@@ -522,7 +532,7 @@ class MainWindow(MainWindowUI):
             logging.error(f"验证检验值失败: {str(e)}")
             return False
     
-    def save_inspection_data(self, order_id, position, config_id, value, status):
+    def save_inspection_data(self, order_id, tray_id, position, config_id, value, status):
         """保存检验数据到数据库
         
         Args:
@@ -537,7 +547,7 @@ class MainWindow(MainWindowUI):
             inspection_dao = InspectionDAO()
             
             # 记录保存前的详细日志
-            logging.info(f"正在保存检验数据: 工程号={order_id}, 位置={position}, 配置ID={config_id}, 值={value}, 状态={status}")
+            logging.info(f"正在保存检验数据: 工程号={order_id}, 托盘号={tray_id}, 位置={position}, 配置ID={config_id}, 值={value}, 状态={status}")
             
             # 构建数据
             data = [{
@@ -545,12 +555,13 @@ class MainWindow(MainWindowUI):
                 'config_id': config_id,
                 'value': value,
                 'status': status,
-                'remark': ''
+                'remark': '',
+                'tray_id': tray_id
             }]
             
             # 保存到数据库
             result = inspection_dao.save_inspection_data(order_id, data)
-            
+            # 判断，如果保存成功后，且当前工程号中，全部为 pass 说明该工序已经完成，需要流转到下一步，回显到包装记录中
             if result:
                 logging.info(f"已成功保存工程号 {order_id} 的检验数据，位置: {position}, 值: {value}")
                 # 显示临时状态消息
@@ -593,6 +604,9 @@ class MainWindow(MainWindowUI):
             if not order_id:
                 return
             
+            # 获取托盘号
+            tray_id = self.tray_edit.currentText()
+
             # 创建上下文菜单
             menu = QMenu(self)
             
@@ -610,7 +624,7 @@ class MainWindow(MainWindowUI):
                     
                     # 添加查询数据库菜单项
                     check_action = menu.addAction("检查数据库记录")
-                    check_action.triggered.connect(lambda: self.check_database_record(order_id, position))
+                    check_action.triggered.connect(lambda: self.check_database_record(order_id, position, tray_id))
                     
                     # 显示菜单
                     menu.exec_(self.process_table.viewport().mapToGlobal(pos))
@@ -618,7 +632,7 @@ class MainWindow(MainWindowUI):
         except Exception as e:
             logging.error(f"显示表格上下文菜单失败: {str(e)}")
     
-    def check_database_record(self, order_id, position):
+    def check_database_record(self, order_id, position, tray_id):
         """检查数据库记录
         
         Args:
@@ -630,7 +644,7 @@ class MainWindow(MainWindowUI):
             inspection_dao = InspectionDAO()
             
             # 获取检验数据
-            inspection_data = inspection_dao.get_inspection_data_by_order(order_id)
+            inspection_data = inspection_dao.get_inspection_data_by_order(order_id, tray_id)
             
             # 查找对应位置的数据
             matching_data = None
@@ -664,16 +678,22 @@ class MainWindow(MainWindowUI):
             # 使用InspectionDAO获取未完成的检验数据
             from dao.inspection_dao import InspectionDAO
             inspection_dao = InspectionDAO()
-            
+                        
+            # 获取托盘号
+            tray_id = self.tray_edit.currentText()
+
             # 使用get_inspection_data_unfinished获取未完成的数据
-            unfinished_data = inspection_dao.get_inspection_data_unfinished()
+            unfinished_data = inspection_dao.get_inspection_data_unfinished(tray_id)
             
             if not unfinished_data:
                 logging.info("没有未完成的检验数据")
+                            # 清空表格现有数据行
+                while self.process_table.rowCount() > 2:
+                    self.process_table.removeRow(2)
                 return
             
             logging.info(f"已加载未完成的检验数据，共 {len(unfinished_data)} 条记录")
-            
+
             # 获取启用的检验配置
             enabled_configs = self.inspection_manager.get_enabled_configs()