From fddb83dccee6d3d0766c60a5e49dc3df747a10d3 Mon Sep 17 00:00:00 2001
From: zhu-mengmeng <15588200382@163.com>
Date: Wed, 11 Jun 2025 17:00:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=87=AA=E5=8A=A8=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E8=B4=B4=E6=A0=87=E4=BF=A1=E5=8F=B7=E5=90=8E=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=9B=9E=E5=A1=AB=E5=88=B0=E5=8C=85=E8=A3=85=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/jtDB.db                 | Bin 40960 -> 40960 bytes
 from pymodbus.py           |   7 +-
 utils/register_handlers.py |   4 +-
 widgets/main_window.py     | 252 +++++++++++++++++++++++--------------
 4 files changed, 163 insertions(+), 100 deletions(-)

diff --git a/db/jtDB.db b/db/jtDB.db
index e7baf46c93198cdde0e85ae430b15810cd5ce5f3..12c64cc8bcb42740b7f61e03fc84b2e4d469cead 100644
GIT binary patch
delta 3423
zcmb7{O>7%Q6vub%b-ea^?LyiJ6HpSN9w6AA+1;^sS5d0)Aw_K{sHH$tw@pk#oDaJ}
zfdb;NogR=N6t&DH0#tE;TMLw^C!{Kz5CS0~Zk#xQs<w!a6DQbR&w4**H>M{`e)E6-
zH@}&AGkb13b#6O#ahRXI^uXi%?6o;-KYx4cm;Ga-7RPZ4*WpSZm!^xiitiPH{G&|d
zqlJG89~CC0f2D2dnfzb*>-n?!dhVNCD>p9Q7O#ra*_+ub*><)%@a@3zKqd2g=JU(}
z;g;~3a7F;>@6xO3eW^cE*HSb59sUdcW!|y)iQ}4hrO55&`H?-cT2{;A@YB}eCn^e1
zPz69ml74-A^S2K-VMSe=UtjP3U8_Ji3Tvijn6S3~#`-G@Z6=`By8$Y1;8oXUu;&sm
zDHI^A`{}L!lV34H`6uwQn_rggS#X>^i$MN#nkmn#o0d0$mwY*j>QkwHdK0(EpUd}I
zQ0X_affo}&KnH~GgXnS4O;wBKtecu1;9zaSCVt7y?=Pnh0{W||+>ML9%rM}x2`BJ^
zk1IfH$=NfI!R?pd!+knd@5&k4jNHU8c4@;1ZDwQxHxp?Chqe*Jp>AqPv;hsc^Kfa;
zC(;H!ZFrY1C_;NKmX=E!Ftq*hd$do*>K)pEq0PumeA1yk4nc%AGqQnCbZL|M#lacF
z=Bt31nJcEI#O`LrM6{jI%A2^+#p@)rjGcidrd3TCTsCL>9!~-S42Gwd_uxXi2Xr=B
z&j9uGJ-LaG*+9#W7!jV#zy^LHz*Dz*s&PDl2|+ARU`D!R6F(o|sqf5lhqNfVL7z+H
zp))+ayg{Bvll2TwPaoj<tjkl6@MH!y@R1(R-5KZj12WTk@ZqpdHNs8R>8Xc%*mg?+
zYL0repPH;Kf0b+CL)7}~Mb{bta$zNGjZCDQPz{~^Hh#+0A!6%>Bx&X`#}3pWgf*aO
zS_OcblV~tp1+e#$Mm|~DNSpY81BV=18Y641k(8>EORe!?4fd`Sx~bcEnmXBMZ3u;|
zkOmR7t;ogJqZwO@Ao+A@gZ$7sN%pOt7&wL}i`+wmU))2gZHo+bCds?2r^ubo9C^QU
zoE$uJom_3teYqy=8ZC-9xYGHOP<*Q>${Vs=cvHG5HS<5`kL143Jt^MUx@Xr1qJ@Q`
zyqDvKN2d6x@>E$2Ugor1`cqNE6StovYQ2gS6+!fBQb?t@SyJ3m=^|i3PO1Y&>WI1c
zVO2p;uh-8qKF|#rfF7f0+_LXmM{5Au4zW;3sslvoV6Q}gssJcz9lRFt(M=lC>08Z<
zTl9Iy48VevPzNyj)ZsMYDzw){L9cs0)TS4z(dk-=1L$K1XY#a;RAheuy-yv$M5t<m
zH5AC5kN9{o#ZahG!T`hTt60c&3n7=^x!<DJmB<>n4W+7TN=?%{;f#K$7VF5yaY=L?
z5py&Exw0WzaSbBu>Gp;yvQJ1IolXkru{Vk@_2Rgc4V7d0M-?E-BT$mpNKnuhnQlv|
dY5=KPeJm*yM<^(*IbQ^6`&(p7zVP?G{{gSep`-u+

delta 967
zcmaKp-Aj{E9LLYbv+a4=d8TcSEwg+{32W;-=Xvqj5S{2n6ct$)362yJY;!NL)Qp8b
zT?Azd#}7g%Ea=9Y2;E&bNq5~uQTNr2fnq5A13mNE($ICz)%ktC=fjtC=GN?UYxadk
zTYK?XzpZ^`WVYA#rS!eGrMaIwgMzLNgkO7>Jr~3Uam)Q!^y3Wny3ev7xgBnm%dlCF
z3fsbpkQPq!zxX$NmJPW!9G%r&s;^sTpmQ?LIG0cywr2wHYI2D|h<mqth)?w~uIm-@
zcB)L+Wf-0wW^kLMZa4CE+J7QuToqBf&4wGW95f@1mj?$zlu$K9NSE6U+3}{1^@oc;
zpDju;W3YBq5Xw>5OmsLUH9MNi!M9`(NK$kVJxT~j6G@II$ca$YI1ei~1Mn%)+7>g;
z)l{m2Q1P_F`(&PRZ=zVyki;Qlpn9j<xB@$4LHIEKf{z)ODr4wNc<pBON4J_FlW>{j
z;(lT_wFn21L>`_`#Nl)51|wp0s%V^a4jDZnYJ;701Nc(2@G>*PiPsQ^$_pUXW4<Hm
zE*d&KNymYtM_?;mTFo+bN1YfW&wURgJ`h<vk1_wWy3Mb;!`t%$cnSfyH_xh?^}t$)
zM4BZfD$}T}hb3L>qN=kNlHo_e>)#)imE273_E;*<|4%H3BQn*9c8J(QI<#cG0ZVL6
zBE%AV82c2|7mjQCzoiI`Dted_T~lPP7E&pUPWpU%SyisoWzD+Hhd5;^Od|@_rGrij
t$y6#k{id@zpw*_fyN5O<Q6&<VWU9~uP5&a5l&xN}H;^jU5-$8c@&~T(`Aq--

diff --git a/from pymodbus.py b/from pymodbus.py
index 2d0fcb0..318d62c 100644
--- a/from pymodbus.py	
+++ b/from pymodbus.py	
@@ -2,8 +2,11 @@ from pymodbus.client import ModbusTcpClient
 
 client = ModbusTcpClient('localhost', port=5020)
 client.connect()
-client.write_registers(address=11, values=[15])
+# client.write_registers(address=11, values=[117])
+client.write_registers(address=13, values=[1])
+# client.write_registers(address=13, values=[1])
 
-result = client.read_holding_registers(address=11, count=1)
+
+result = client.read_holding_registers(address=13, count=1)
 print(result,"123===")
 client.close()
\ No newline at end of file
diff --git a/utils/register_handlers.py b/utils/register_handlers.py
index aa7dc99..efb93b7 100644
--- a/utils/register_handlers.py
+++ b/utils/register_handlers.py
@@ -26,9 +26,7 @@ class LabelSignalHandler(RegisterHandler):
         self.callback = callback
         self.status_map = {
             0: "无贴标",
-            1: "贴标中",
-            2: "贴标完成",
-            3: "贴标错误"
+            1: "贴标完成"
         }
     
     def handle_change(self, value):
diff --git a/widgets/main_window.py b/widgets/main_window.py
index 9173cf3..83df61f 100644
--- a/widgets/main_window.py
+++ b/widgets/main_window.py
@@ -46,7 +46,7 @@ class MainWindow(MainWindowUI):
         self.corp_name = corp_name
         self.corp_id = corp_id
         self.position_id = position_id
-        
+        self.init_seq = {} # 初始化轴包装的序号
         # 设置窗口标题
         if user_name and corp_name:
             self.setWindowTitle(f"腾智微丝产线包装系统 - {user_name} ({corp_name})")
@@ -117,7 +117,24 @@ class MainWindow(MainWindowUI):
         
         # 加载已完成检验数据
         self.show_pack_item()
+        # 创建状态处理器实例
+        self.machine_handlers = MachineStatusHandlers()
         
+        # 添加状态显示到状态栏
+        self.modbus_status_label = QLabel("Modbus: 未连接")
+        self.weight_label = QLabel("重量: --")
+        self.label_status_label = QLabel("贴标: 无贴标")
+        self.error_status_label = QLabel("故障: 无")
+        
+        # 设置样式
+        self.error_status_label.setStyleSheet("color: green; font-weight: bold;")
+        
+        # 添加到状态栏
+        self.statusBar().addPermanentWidget(self.modbus_status_label)
+        self.statusBar().addPermanentWidget(self.weight_label)
+        self.statusBar().addPermanentWidget(self.label_status_label)
+        self.statusBar().addPermanentWidget(self.error_status_label)
+        self.statusBar().addPermanentWidget(QLabel("    "))
         logging.info(f"主窗口已创建，用户: {user_name}")
     
     def add_pallet_type_selectors(self):
@@ -203,8 +220,7 @@ class MainWindow(MainWindowUI):
         if self.camera_enabled and hasattr(self, 'camera_display'):
             self.camera_display.signal_camera_status.connect(self.handle_camera_status)
         
-        # 初始化后检查是否有已完成的记录
-        QTimer.singleShot(1000, self.check_and_process_finished_records)
+
     
     def update_inspection_columns(self):
         """更新检验列配置 - 使用检验配置管理器获取启用的列数和标题"""
@@ -445,6 +461,10 @@ class MainWindow(MainWindowUI):
             # 获取托盘号对应的托盘类型
             tray_id = self.tray_edit.currentText()
             pallet_type = self.pallet_type_manager.get_pallet_type_by_pallet_id(tray_id)
+            # 初始化托盘号对应的序号
+            if tray_id not in self.init_seq:
+                self.init_seq[tray_id] = 1
+
             if not pallet_type:
                 QMessageBox.warning(self, "错误", "未查到对应下料托盘类型")
                 return
@@ -884,23 +904,7 @@ class MainWindow(MainWindowUI):
             
             # 保存到数据库
             inspection_dao.save_inspection_data(order_id, data)
-            # if result:
-            #     logging.info(f"已成功保存工程号 {order_id} 的检验数据，位置: {position}, 值: {value}")
-            #     # 显示临时状态消息
-            #     self.statusBar().showMessage(f"已保存检验数据：{value}", 3000)
-                
-            #     #TODO: 如果是称重字段，生成贴标号，然后给打印机信号，进行贴标
-            #     if position == 12 and value:
-            #         # 直接调用加载到包装记录的方法
-            #         self.load_finished_record_to_package_record(order_id, tray_id)
-            #         logging.info(f"检测到称重字段有值，已自动写入包装记录")
-            #     else:
-            #         # 使用延迟调用，避免频繁刷新UI
-            #         QTimer.singleShot(500, self.check_and_process_finished_records)
-            # else:
-            #     logging.warning(f"保存工程号 {order_id} 的检验数据失败")
-            #     # 显示错误消息
-            #     self.statusBar().showMessage(f"保存检验数据失败", 3000)
+      
                 
         except Exception as e:
             logging.error(f"保存检验数据失败: {str(e)}")
@@ -1173,53 +1177,7 @@ class MainWindow(MainWindowUI):
             
         except Exception as e:
             logging.error(f"更新包装记录统计数据失败: {str(e)}")
-            
-    def check_and_process_finished_records(self):
-        """检查并处理所有已完成的检验记录"""
-        try:
-            # 获取当前托盘号
-            tray_id = self.tray_edit.currentText()
-            
-            # 使用InspectionDAO获取未完成的检验数据
-            from dao.inspection_dao import InspectionDAO
-            inspection_dao = InspectionDAO()
-            
-            # 获取所有检验数据
-            all_data = inspection_dao.get_inspection_data_unfinished(tray_id)
-            
-            # 按工程号分组
-            orders_data = {}
-            for data in all_data:
-                order_id = data['order_id']
-                if order_id not in orders_data:
-                    orders_data[order_id] = []
-                orders_data[order_id].append(data)
-            
-            # 检查每个工程号是否有贴标数据
-            for order_id, items in orders_data.items():
-                # 查找贴标数据
-                has_label = False
-                label_value = ""
-                
-                for item in items:
-                    if item['position'] == 11:  # 贴标
-                        label_value = item['value']
-                        if label_value:
-                            has_label = True
-                            break
-                
-                if has_label:
-                    # 将已有贴标的记录添加到包装记录
-                    self.load_finished_record_to_package_record(order_id, tray_id)
-                    logging.info(f"已将工程号 {order_id} 的贴标记录添加到包装记录")
-            
-            # 重新加载检验数据
-            self.load_finished_inspection_data()
-            
-        except Exception as e:
-            logging.error(f"检查并处理已完成的检验记录失败: {str(e)}")
-            QMessageBox.warning(self, "处理失败", f"检查并处理已完成的检验记录失败: {str(e)}")
-    
+ 
     def show_table_context_menu(self, pos):
         """显示表格上下文菜单
         
@@ -1383,24 +1341,6 @@ class MainWindow(MainWindowUI):
         # 获取Modbus监控器实例
         self.modbus_monitor = get_modbus_monitor()
         
-        # 创建机器状态处理器实例
-        self.machine_handlers = MachineStatusHandlers()
-        
-        # 添加状态显示到状态栏
-        self.modbus_status_label = QLabel("Modbus: 未连接")
-        self.weight_label = QLabel("重量: --")
-        self.label_status_label = QLabel("贴标: 无贴标")
-        self.error_status_label = QLabel("故障: 无")
-        
-        # 设置样式
-        self.error_status_label.setStyleSheet("color: green; font-weight: bold;")
-        
-        # 添加到状态栏
-        self.statusBar().addPermanentWidget(self.modbus_status_label)
-        self.statusBar().addPermanentWidget(self.weight_label)
-        self.statusBar().addPermanentWidget(self.label_status_label)
-        self.statusBar().addPermanentWidget(self.error_status_label)
-        
         # 注册寄存器处理器
         self._register_modbus_handlers()
         
@@ -1482,6 +1422,9 @@ class MainWindow(MainWindowUI):
                 logging.warning("工程号为空")
                 return
             
+            # 获取托盘号
+            tray_id = self.tray_edit.currentText()
+            
             # 断开单元格变更信号，避免程序自动写入时触发
             try:
                 self.process_table.cellChanged.disconnect(self.handle_inspection_cell_changed)
@@ -1496,12 +1439,27 @@ class MainWindow(MainWindowUI):
             self.process_table.setItem(data_row, weight_col, weight_item)
             logging.info(f"已将称重数据 {weight}g 写入表格单元格 [{data_row}, {weight_col}]")
             
+            # 保存称重数据到数据库
+            from dao.inspection_dao import InspectionDAO
+            inspection_dao = InspectionDAO()
+            
+            # 构建数据
+            data = [{
+                'position': 12,  # 称重位置是12
+                'config_id': 12,
+                'value': str(weight),
+                'status': 'pass',
+                'remark': '',
+                'tray_id': tray_id
+            }]
+            
+            # 保存到数据库
+            inspection_dao.save_inspection_data(order_id, data)
+            logging.info(f"称重数据 {weight}g 已保存到数据库")
+            
             # 重新连接单元格变更信号
             self.process_table.cellChanged.connect(self.handle_inspection_cell_changed)
             
-            # 主动触发单元格变更事件
-            self.handle_inspection_cell_changed(data_row, weight_col)
-            
         except Exception as e:
             logging.error(f"写入称重数据到表格失败: {str(e)}")
             # 确保信号重新连接
@@ -1509,15 +1467,105 @@ class MainWindow(MainWindowUI):
                 self.process_table.cellChanged.connect(self.handle_inspection_cell_changed)
             except:
                 pass
-        
+    
     @Slot(int, str)
     def handle_label_signal(self, signal, status):
         """处理贴标信号变化"""
         logging.info(f"[处理] 贴标状态: {status}")
         # 更新UI显示
         self.label_status_label.setText(f"贴标: {status}")
-        # 在这里可以添加更多业务逻辑
-        pass
+        
+        # 只有当信号为贴标完成(2)时才进行处理
+        if signal == 1:
+            try:
+                # 获取数据行数
+                if self.process_table.rowCount() <= 2:  # 没有数据行
+                    logging.warning("没有可用的数据行来处理贴标完成信号")
+                    return
+                    
+                # 获取当前选中的行或第一个数据行
+                current_row = self.process_table.currentRow()
+                data_row = current_row if current_row >= 2 else 2  # 使用第一个数据行（索引为2）
+                
+                # 确保行存在
+                if data_row >= self.process_table.rowCount():
+                    logging.warning(f"选中的行 {data_row} 超出了表格范围")
+                    return
+                    
+                # 获取工程号
+                order_id_item = self.process_table.item(data_row, 1)
+                if not order_id_item:
+                    logging.warning("无法获取工程号")
+                    return
+                    
+                order_id = order_id_item.text().strip()
+                if not order_id:
+                    logging.warning("工程号为空")
+                    return
+                
+                # 获取托盘号
+                tray_id = self.tray_edit.currentText()
+                
+                # 获取启用的检验配置
+                enabled_configs = self.inspection_manager.get_enabled_configs()
+                
+                # 计算贴标列索引 - 贴标位置在检验列之后的第一列
+                label_col = 2 + len(enabled_configs)
+
+                # 生成贴标号（托盘号+序号）
+                label_value = f"{tray_id}-{self.init_seq[tray_id]}"
+                
+                # 断开单元格变更信号，避免程序自动写入时触发
+                try:
+                    self.process_table.cellChanged.disconnect(self.handle_inspection_cell_changed)
+                except:
+                    logging.warning("断开单元格变更信号失败，可能信号未连接")
+                    
+                # 创建并设置贴标单元格
+                label_item = QTableWidgetItem(label_value)
+                label_item.setTextAlignment(Qt.AlignCenter)
+                
+                # 写入单元格
+                self.process_table.setItem(data_row, label_col, label_item)
+                logging.info(f"已将贴标数据 {label_value} 写入表格单元格 [{data_row}, {label_col}]")
+                
+                # 保存贴标数据到数据库
+                from dao.inspection_dao import InspectionDAO
+                inspection_dao = InspectionDAO()
+                
+                # 构建数据
+                data = [{
+                    'position': 11,  # 贴标位置是11
+                    'config_id': 11,
+                    'value': label_value,
+                    'status': 'pass',
+                    'remark': '',
+                    'tray_id': tray_id
+                }]
+                
+                # 保存到数据库
+                inspection_dao.save_inspection_data(order_id, data)
+                
+                # 调用加载到包装记录的方法
+                self.load_finished_record_to_package_record(order_id, tray_id)
+                logging.info(f"贴标完成，已将工程号 {order_id} 的记录加载到包装记录")
+                
+                # 删除当前处理的行
+                self.process_table.removeRow(data_row)
+                logging.info(f"已删除处理完成的行 {data_row}")
+                
+                # 重新连接单元格变更信号
+                self.process_table.cellChanged.connect(self.handle_inspection_cell_changed)
+                
+                # 更新托盘号对应的序号
+                self.init_seq[tray_id] += 1
+            except Exception as e:
+                logging.error(f"处理贴标完成信号失败: {str(e)}")
+                # 确保信号重新连接
+                try:
+                    self.process_table.cellChanged.connect(self.handle_inspection_cell_changed)
+                except:
+                    pass
         
     @Slot(bool, str)
     def handle_modbus_status(self, is_connected, message):
@@ -1550,15 +1598,29 @@ class MainWindow(MainWindowUI):
     def handle_loading_feedback(self, status, desc):
         """处理上料信息反馈"""
         logging.info(f"[处理] 上料信息: {desc}")
-        # 在这里添加业务逻辑
-        pass
+        
+        # 如果上料完成(status=2)，显示状态信息
+        if status == 2:
+            self.show_operation_status("上料完成", "input", desc)
+            QMessageBox.information(self, "上料操作", f"上料操作已完成: {desc}")
+        # 如果上料错误(status=3)，显示错误信息
+        elif status == 3:
+            self.show_operation_status("上料错误", "input", desc)
+            QMessageBox.warning(self, "上料操作", f"上料操作出错: {desc}")
     
     @Slot(int, str)
     def handle_unloading_feedback(self, status, desc):
         """处理下料信息反馈"""
         logging.info(f"[处理] 下料信息: {desc}")
-        # 在这里添加业务逻辑
-        pass
+        
+        # 如果下料完成(status=2)，显示状态信息
+        if status == 2:
+            self.show_operation_status("下料完成", "output", desc)
+            QMessageBox.information(self, "下料操作", f"下料操作已完成: {desc}")
+        # 如果下料错误(status=3)，显示错误信息
+        elif status == 3:
+            self.show_operation_status("下料错误", "output", desc)
+            QMessageBox.warning(self, "下料操作", f"下料操作出错: {desc}")
     
     def _update_error_status(self):
         """更新故障状态显示"""