From 470c58ace0c8094ad28a555cb36c72479f117875 Mon Sep 17 00:00:00 2001
From: zhu-mengmeng <15588200382@163.com>
Date: Fri, 18 Jul 2025 15:17:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9C=A8=E4=B8=BB=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E4=B8=AD=E6=96=B0=E5=A2=9E=E6=89=93=E5=8D=B0=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E5=8F=B7=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=89=98=E7=9B=98=E5=AE=8C=E6=88=90=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/jtDB.db             | Bin 172032 -> 172032 bytes
 from pymodbus.py       |  10 +++---
 widgets/main_window.py |  69 +++++++++++++++++++++++++++--------------
 3 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/db/jtDB.db b/db/jtDB.db
index 3afa97855011c5269a75ffa41649b2732044d2b9..1f036626c0cf9f2fc6d3fd0a5e7613d60230b031 100644
GIT binary patch
delta 777
zcmZoTz}0YoYl1Z6hlw)Ij2|{8+_GcjoosEd#JFy9oP8UcwInaIDbwT$Y$BWg*|Ryw
z@pAlT;7{Q@!578*hPRGafM*d8FLx2wbuKH;xg5VY3kuxikZF|X<zrCRROe@BcXX6=
zl;rRVF)}qUH!w2LHJYsdNZQrVf#K(Er3+6J?Egf`tl=<JH!?6X)ip5JHMCGLG_f+Z
zure{#Gcz=_G&jK|V_`X2;E|{xT&0C&ab<ByYVPK_o#|@K%FK$B**7?|Ft;)*0^M|(
zi7Cl?vi}wt15+zQGb>{gJtIp469Wscka$NIUr#?|OHfrzKCo4U#lkGf3Z@(AIs-i;
zQzHWla~!&nR6ul_CRqY?%T3naBC=U_%M)!j##;<Z3|}U*Kd@(G_`;aV<T_bUV1+_n
zYZyO+G9x3uD6g@ku_TA4I#RH4a~n?n`A~-i<lo8nA1kU9wT6RLi(^yG!(*gpXk-M|
zVQyt&2GYU8w2L7dXi+*)YXoksyu5~b=H_TxIVLd_0JY{cYdzks^_cNi4Rb2%zRBzt
zP6NaC4NJZFL_HP;V-B=XG`BJ`5ud1wMaIm^&|G|?4t5!1@rl}4WK6(%w6Mq+TLBY{
h_(V-CQbtyWK;ty9$`}A;)Td8OV-nrolg3nH2>^Ln#J2zd

delta 271
zcmZoTz}0YoYl1Z6qlq%kjE^=Z+_GcjnQU#Z#JGHNoP8Ucr6e!2DbwT$Y$BWg*|Ryw
z@Nmv$;7{Q@!578*hPRGafM*d8FLx2wbuKH;xtj$AYB@L0?Mzo=R%CuTnSFyZP-H$c
zQ<CLm|1ENpwYP|DmfiA1n~h@<gA(Jd$?Om8*_d`Qc`@DsD(hq9%x#U}XHaHj<elvI
zNNjTFL!HTU9&$~tek=`?35Uw$Jw%a_&utBZ$cXY9OBzdZXsUaK7?~QF8yFer8gX+Y
ro6@ZHc)QkP##=Saacm`%*)Qw`+PZ<2S$v}U^oeOqqT74Ym`W@GSv*+q

diff --git a/from pymodbus.py b/from pymodbus.py
index c5b7631..2376fcb 100644
--- a/from pymodbus.py	
+++ b/from pymodbus.py	
@@ -2,11 +2,11 @@ from pymodbus.client import ModbusTcpClient
 import time
 client = ModbusTcpClient('localhost', port=5020)
 client.connect()
-client.write_registers(address=11, values=[212])
+client.write_registers(address=11, values=[2122])
 # client.write_registers(address=3, values=[0])
-time.sleep(2)
-client.write_registers(address=0, values=[0])
-client.write_registers(address=4, values=[0])
+# time.sleep(2)
+# client.write_registers(address=0, values=[0])
+# client.write_registers(address=4, values=[0])
 
 # client.write_registers(address=30, values=[25])
 # client.write_registers(address=5, values=[16])
@@ -15,6 +15,6 @@ client.write_registers(address=4, values=[0])
 client.write_registers(address=13, values=[1])
 
 
-result = client.read_holding_registers(address=0, count=1)
+result = client.read_holding_registers(address=11, 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 76c58bd..582f181 100644
--- a/widgets/main_window.py
+++ b/widgets/main_window.py
@@ -3354,19 +3354,32 @@ class MainWindow(MainWindowUI):
         """)
         self.delete_row_button.clicked.connect(self.handle_delete_row)
         
-        # 创建打印按钮
+        # 打印托盘号按钮
+        self.print_tray_button = QPushButton("打印托盘号")
+        self.print_tray_button.setFont(self.normal_font)
+        self.print_tray_button.setStyleSheet("""
+            QPushButton {
+                padding: 5px 8px;
+                background-color: #e3f2fd;
+                border: 1px solid #2196f3;
+            }
+            QPushButton:hover {
+                background-color: #c8e6c9;
+            }
+        """)
+        self.print_tray_button.clicked.connect(lambda: self.handle_tray_complete(ismt=False))
+        
+        # 打印选中行按钮
         self.print_row_button = QPushButton("打印选中行")
         self.print_row_button.setFont(self.normal_font)
         self.print_row_button.setStyleSheet("""
             QPushButton {
-                padding: 5px 10px;
-                background-color: #e3f2fd;
-                border: 1px solid #2196f3;
-                border-radius: 4px;
-                font-weight: bold;
+                padding: 5px 8px;
+                background-color: #e0e0e0;
+                border: 1px solid #cccccc;
             }
             QPushButton:hover {
-                background-color: #bbdefb;
+                background-color: #f5f5f5;
             }
         """)
         self.print_row_button.clicked.connect(self.handle_print_row)
@@ -3376,6 +3389,7 @@ class MainWindow(MainWindowUI):
         title_layout.addStretch()
         title_layout.addWidget(self.print_row_button)
         title_layout.addWidget(self.delete_row_button)
+        title_layout.addWidget(self.print_tray_button)
         
         # 设置容器样式
         title_container.setFixedHeight(40)
@@ -3453,26 +3467,29 @@ class MainWindow(MainWindowUI):
 
 
 
-    def handle_tray_complete(self):
-        """处理托盘完成按钮点击事件"""
+    def handle_tray_complete(self, ismt=True):
+        """托盘完成或打印托盘号事件
+        Args:
+            ismt: 是否满托，True为满托，False为未满托
+        """
         try:
             # 获取托盘号
             tray_id = self.tray_edit.currentText()
             if not tray_id:
                 QMessageBox.warning(self, "提示", "请先选择托盘号")
                 return
-            
-            # 确认对话框
-            reply = QMessageBox.question(
-                self,
-                "确认完成",
-                f"确认将托盘 {tray_id} 标记为已满托？",
-                QMessageBox.Yes | QMessageBox.No,
-                QMessageBox.No
-            )
-            
-            if reply != QMessageBox.Yes:
-                return
+            if ismt:
+                    # 确认对话框
+                reply = QMessageBox.question(
+                    self,
+                    "确认完成",
+                    f"确认将托盘 {tray_id} 标记为已满托？",
+                    QMessageBox.Yes | QMessageBox.No,
+                    QMessageBox.No
+                )
+         
+                if reply != QMessageBox.Yes:
+                    return
             
             # 调用接口
             from apis.gc_api import GcApi
@@ -3480,7 +3497,7 @@ class MainWindow(MainWindowUI):
             
             # 准备参数
             params = {
-                'ismt': True,
+                'ismt': ismt,
                 'corp_id': self.corp_id,
                 'tray_id': tray_id,
                 'ip': '192.168.1.246'
@@ -3491,8 +3508,12 @@ class MainWindow(MainWindowUI):
             
             # 处理响应
             if response.get('status', False):
-                QMessageBox.information(self, "成功", "托盘已标记为完成")
-                logging.info(f"托盘 {tray_id} 已标记为完成")
+                if ismt:
+                    QMessageBox.information(self, "成功", "托盘已标记为完成")
+                    logging.info(f"托盘 {tray_id} 已标记为完成")
+                else:
+                    QMessageBox.information(self, "成功", "托盘号已打印")
+                    logging.info(f"托盘号 {tray_id} 已打印")
             else:
                 error_msg = response.get('message', '未知错误')
                 QMessageBox.warning(self, "失败", f"标记托盘完成失败: {error_msg}")