From 60d1b51e5fe64959726d9c4b795b63e273f57b66 Mon Sep 17 00:00:00 2001
From: zhu-mengmeng <15588200382@163.com>
Date: Mon, 16 Jun 2025 09:50:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=84=E7=90=86NG=20=E4=BF=A1?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8CNG=20=E4=B8=BA=E6=9C=80=E6=96=B0=E4=B8=80?=
 =?UTF-8?q?=E6=9D=A1=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=B9=B6=E4=B8=94=E8=BD=B4?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7=E6=B7=BB=E5=8A=A0=20NG=20=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/jtDB.db             | Bin 49152 -> 49152 bytes
 from pymodbus.py       |   6 +--
 widgets/main_window.py |  91 +++++++++++++++++++++++++++++++++++++----
 3 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/db/jtDB.db b/db/jtDB.db
index 8b0a9fbd793b158fd127fdf187cde47179098f13..247974b4998dd48f7d44e3b1585cdce73a10fabe 100644
GIT binary patch
delta 1578
zcma)+PiWIn9LHb&v`L!%Y23Os>lB5x3}?6ec};C7%(8(XLq!=#Wv~gu9X9+^QAX8t
z4~DoMbUcKKUIf|6gQHUI9D*0`p7pSkf}qTc2k~H&yy~_lthprQ_s#cxe&6?dDV3N~
ziFp{KwpMyasIB!$YnY0aw}$&pFj1z6xza$8y~F%rie)K0!dO<cEe=2|lH+r7PUiVD
z=SGv7qNS3GqJO!+`t`}GswGdKbYB@s)i|tVOqemX^dQt>N=f@wbiFWNxG_EFTZeYt
znx3<|eF-2TP`wD0^q`i~4dr;l3Z#;8R`4LG*NwuwWg{+dT@FIrBLtNokXy15MNgY4
zV-P~9W-_}`{#CS;>J>(<-tK;?r8HMi<`#b+<)~9&2rSW<f7x%aDdCzR2N(HGeu&%V
z*10kEWAJ<MNZ?c85xdM=p<~Q1utZ&C9@E?OI(;2{qa)Otm4!ZG0(G>3I7LP9`(o#q
zDBAmYb*fO<4GGhxp7x@1HrXwZ<|mL$45w~&T!5lzhvDf66(2{1EJYldB#^+)D~~$y
zvzzj$-qNCYIycLjM={3;wzhg3HH(->J+6@-QL{!_6va|iPC$lf*nzqSi6x7=T`5iP
zCpA$QKD!o8C~!Yz@G_XiQh0{RqllZaUo_2ToJ9w0%mLk_qq+y_=scooqaz6T=UOK&
zz71ic8pbawLbvlj(G^oA2Y~3y%db9DEI$hlt>k)yX~a5%7ss{1Yga{)sGQS?A5;=O
zu8n;XcTH>_iFT{3T5A>ms3dxQbO2mJ0?xgY%QLT8sw>nFI(ANF?b$?OJLkBfH{`sh
z)jSH=YvK<Z5`J2d{m{k{gD0Oy@$JpldKg675XLy79qCN<pq*Lhe`a{IdWB`PNOHzS
V_ZXKwaM^{sSXz_I_crDOe*r*A&j$bi

delta 331
zcmZo@U~Xt&o*>P*Z=#Gd<Gzgv_4bVXn;+P#I53N{vQK7j(B3R4aFt~<d+RSPc6MzB
zWtMJ+$s8Lr<T!gceL4Bq(m8TC^w~eKZ)EpjxyW{gO_B9B>r|F*pe9?E&D~q>Ffu1K
zu}ltJAvt-^V#&#Sw@FHwC>R)68Jbxc8WdL+m!#%C>zwg?_6)<AChp0KdnMQn40(AC
z4GbsqZda4Wp_Jn^gW^O-S)j?BlO6X-ZqC@w!pI!c#0u5V!((V@IC;Z1ocg&m7@Q|I
z+B4fUF;5m;CNa5Y5AWocI|R6(F0pB10t@%-l!XadH8D;O0IICo%{@7Ki@@YVJ2M#}
QMl{v|)k<z|-&M&90QJ3dk^lez

diff --git a/from pymodbus.py b/from pymodbus.py
index a13ebc9..e434a61 100644
--- a/from pymodbus.py	
+++ b/from pymodbus.py	
@@ -3,11 +3,11 @@ from pymodbus.client import ModbusTcpClient
 client = ModbusTcpClient('localhost', port=5020)
 client.connect()
 # client.write_registers(address=11, values=[110])
-# client.write_registers(address=6, values=[1])
+client.write_registers(address=6, values=[1])
 # client.write_registers(address=5, values=[16])
-client.write_registers(address=13, values=[1])
+# client.write_registers(address=13, values=[1])
 
 
-result = client.read_holding_registers(address=13, count=1)
+result = client.read_holding_registers(address=6, count=1)
 print(result.registers[0],"123===")
 client.close()
\ No newline at end of file
diff --git a/widgets/main_window.py b/widgets/main_window.py
index d2c6919..d618001 100644
--- a/widgets/main_window.py
+++ b/widgets/main_window.py
@@ -1621,7 +1621,7 @@ class MainWindow(MainWindowUI):
                 label_col = 2 + len(enabled_configs)
 
                 # 生成贴标号（托盘号+序号）
-                label_value = f"{tray_id}-{self.init_seq[tray_id]}"
+                label_value = f"{self.init_seq[tray_id]}"
                 
                 # 断开单元格变更信号，避免程序自动写入时触发
                 try:
@@ -1816,8 +1816,9 @@ class MainWindow(MainWindowUI):
 
     @Slot(int)
     def handle_ng(self, ng):
-        """处理NG信号, 删除当前在处理的数据（也就是第一条数据）"""
+        """处理NG信号, 将当前处理的数据添加到包装记录中，毛重和净重设为0"""
         if ng == 1:
+            """
             # 获取当前选中的行或第一个数据行，并删除
             try:
                 order_id = self.process_table.item(2, 1).text().strip()
@@ -1831,11 +1832,87 @@ class MainWindow(MainWindowUI):
             # 触发重新查询，更新数据
             self.load_finished_inspection_data()
             logging.info(f"已删除当前在处理的数据: order_id: {order_id}, tray_id: {tray_id}")
-            # 复原NG信号
-            modbus = ModbusUtils()
-            client = modbus.get_client()
-            modbus.write_register_until_success(client, 6, 0)
-            modbus.close_client(client)
+            """
+            try:
+                # 获取最后一条数据行
+                total_rows = self.process_table.rowCount()
+                if total_rows <= 2:  # 只有表头行，没有数据行
+                    logging.warning("没有可用的数据行来处理NG信号")
+                    return
+                
+                # 使用最后一条数据行
+                data_row = total_rows - 1
+                
+                # 获取工程号
+                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_item = self.process_table.item(data_row, label_col)
+                label_value = label_item.text() if label_item else ""
+                
+                # 如果贴标值为空，生成一个新的贴标值
+                if not label_value:
+                    # 初始化托盘号对应的序号
+                    if tray_id not in self.init_seq:
+                        self.init_seq[tray_id] = 1
+                    
+                    # 生成贴标号（仅使用序号）
+                    label_value = f"{self.init_seq[tray_id]}-NG"
+                    self.init_seq[tray_id] += 1
+                    
+                    # 保存贴标数据到数据库
+                    self.save_inspection_data(order_id, tray_id, 11, 11, label_value, "pass")
+                else:
+                    # 如果贴标值已存在但不包含NG标记，添加NG标记
+                    if "NG" not in label_value:
+                        label_value = f"{label_value}-NG"
+                        # 更新贴标数据
+                        self.save_inspection_data(order_id, tray_id, 11, 11, label_value, "pass")
+                
+                # 设置毛重和净重为0
+                self.save_inspection_data(order_id, tray_id, 12, 12, "0", "pass")
+                self.save_inspection_data(order_id, tray_id, 13, 13, "0", "pass")
+                
+                # 获取当前时间作为完成时间
+                finish_time = datetime.now()
+                
+                # 将数据写入到数据库表 inspection_pack_data
+                from dao.inspection_dao import InspectionDAO
+                inspection_dao = InspectionDAO()
+                inspection_dao.save_package_record(order_id, tray_id, label_value, "0", "0", finish_time)
+                
+                # 删除当前处理的行
+                self.process_table.removeRow(data_row)
+                
+                # 回显数据
+                self.show_pack_item()
+                
+                logging.info(f"NG信号处理完成: 工程号={order_id}, 托盘号={tray_id}, 贴标值={label_value}")
+            except Exception as e:
+                logging.error(f"处理NG信号时发生错误: {str(e)}")
+            finally:
+                # 复原NG信号
+                modbus = ModbusUtils()
+                client = modbus.get_client()
+                modbus.write_register_until_success(client, 6, 0)
+                modbus.close_client(client)
 
     def register_serial_callbacks(self):
         """注册串口数据回调函数"""