From 7b0d0a28f24ab97fe2608d813419489c5dd79637 Mon Sep 17 00:00:00 2001 From: zhu-mengmeng <15588200382@163.com> Date: Sat, 14 Jun 2025 00:34:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=87=80=E9=87=8D=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/inspection_dao.py | 9 ++-- db/jtDB.db | Bin 49152 -> 49152 bytes from pymodbus.py | 6 +-- ui/main_window_ui.py | 17 ++++--- .../__pycache__/config_loader.cpython-310.pyc | Bin 4192 -> 4192 bytes utils/__pycache__/sql_utils.cpython-310.pyc | Bin 2678 -> 2678 bytes .../__pycache__/login_widget.cpython-310.pyc | Bin 3474 -> 3474 bytes widgets/main_window.py | 48 ++++++++++++++---- 8 files changed, 56 insertions(+), 24 deletions(-) diff --git a/dao/inspection_dao.py b/dao/inspection_dao.py index 274531f..cf01c0c 100644 --- a/dao/inspection_dao.py +++ b/dao/inspection_dao.py @@ -403,6 +403,7 @@ class InspectionDAO: tray_id, COALESCE(axis_package_id, '') as axis_package_id, COALESCE(weight, 0) as weight, + COALESCE(net_weight, 0) as net_weight, STRFTIME('%Y-%m-%d %H:%M:%S', pack_time) as pack_time FROM inspection_pack_data WHERE tray_id = ? @@ -416,7 +417,7 @@ class InspectionDAO: except Exception as e: logging.error(f"获取包装记录失败: {str(e)}") return [] - def save_package_record(self, order_id, tray_id, label_value, weight_value, finish_time): + def save_package_record(self, order_id, tray_id, label_value, weight_value,net_weight_value, finish_time): """保存包装记录 Args: @@ -429,10 +430,10 @@ class InspectionDAO: # TODO：调用接口，获取到工程号对应的其他信息，比如材质，规格，后续完成 try: sql = """ - INSERT INTO inspection_pack_data (order_id, tray_id, axis_package_id, weight, pack_time, create_time, create_by, update_time, update_by, is_deleted) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + INSERT INTO inspection_pack_data (order_id, tray_id, axis_package_id, weight, net_weight, pack_time, create_time, create_by, update_time, update_by, is_deleted) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) """ - params = (order_id, tray_id, label_value, weight_value, finish_time, datetime.now(), 'system', datetime.now(), 'system', False) + params = (order_id, tray_id, label_value, weight_value, net_weight_value, finish_time, datetime.now(), 'system', datetime.now(), 'system', False) self.db.cursor.execute(sql, params) self.db.conn.commit() except Exception as e: diff --git a/db/jtDB.db b/db/jtDB.db index a85b1d6972e44eaf98e754d9e5c193eff95d0d62..8b0a9fbd793b158fd127fdf187cde47179098f13 100644 GIT binary patch delta 1655 zcmah}U2Icj7(Qp`ujjX|W!gg}Y>W|!Yx%y@ztgIj%@n-=mLQ-PtGGdfKXXjCXf%=b zG>WcMv*ryE!%a7wBpMiaLSV?2NYqG_pcl%8CVHirH*k*^o^#r6J%B_e?jdpMd<2Bq3+Si{qGykIaPmj(jFvl`@Wwz4<~}#q+Kf@tXwxr-Vuj!97{;kAMln6D>lv@%RVafRhTIzO#0@$K-+T~; z7p4Mmq#~Hlzkf13Z0%W;%oF}u{{erma#a~s6#2S5BX>zxr1zxl5+{Bl>cVZ|vha=& z<`?+`yy!E1ySSU&r(BL*A@gj7-N`D?M8q|eiNnxSe`j-orh>p0rcOM6!xIy5YkpH}k8kIf;O3cq*3sweqa4zmqfq;N%lhUlwMH6^Nsk!M z+Nxxvi(+&5nq5%u>!b*MrXcBj(Dfr&vzr9wvI|Y2eQGZekFBmH&|6 z$t&z3->7dJcZ)m6?Vx{Qe`33t-QOd z!ikIO>Iz^t-%we!x8-Ss?_$(?`Px5f&i!&}_x(t8S92Svkuq;jU&^daAKS5oJm&2O z6+XMLLSp#%;+9BrNj(aMhlqiy(GSYvAB+L=6J)gmcxVnB~u#vM0QKIyKIeo z@7Xk2FS3@hO0ukD$!9TOKFyrNzlvFeX%D|E6C>jW#zICTpuv}sAj4$EMX8eyEsUSs zwrIBqQv!nsEEHh$WXHwvd@QdS*ccds8${(e_SRqxqhY9WY#4cHghknXJp|s zV9=Y`sKp%F7&|$kT9Vn4hi9_j3gOB5%Ryo>5HW6UnAqf(%QgVTBf#PoV6|$KeO8JC z#lj(CV6|Ye$(vVf*t~P4I~zC9Mf*Xnifl9mDUvee;VDQgE;ceSGSxLO(>1VEFf_F? zG_o?Xm@L>KB5G)9Wn@%bSzMBu`>b=u^Vu^DBO6U18o9agXcWZIICU5IN9fdK?^!sH9v6@cnEajSzk6{t>W^5*Tg7>y?PZ&NcfRsed_ z#Kg+P6vclIO)R(!GB5;&X#X}@c4$yc=G%FP)d=i_1$!l(VPR-!tYBbiWol$)V1jCL bV?8dD4b7lVT(DP(v2L>9GRe*DyDC`$CeZrI diff --git a/from pymodbus.py b/from pymodbus.py index 35d88c5..a13ebc9 100644 --- a/from pymodbus.py +++ b/from pymodbus.py @@ -2,12 +2,12 @@ from pymodbus.client import ModbusTcpClient client = ModbusTcpClient('localhost', port=5020) client.connect() -client.write_registers(address=11, values=[112]) +# client.write_registers(address=11, values=[110]) # 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=4, count=1) +result = client.read_holding_registers(address=13, count=1) print(result.registers[0],"123===") client.close() \ No newline at end of file diff --git a/ui/main_window_ui.py b/ui/main_window_ui.py index c6151f3..db87a8e 100644 --- a/ui/main_window_ui.py +++ b/ui/main_window_ui.py @@ -501,13 +501,13 @@ class MainWindowUI(QMainWindow): self.record_layout.addWidget(self.record_title) # 创建表格 - self.record_table = QTableWidget(14, 8) # 14行7列：序号、订单、品名、规格、托号、轴包装号、重量 + self.record_table = QTableWidget(14, 9) # 14行9列：序号、订单、品名、规格、托号、轴包装号、重量、净重、完成时间 # 应用通用表格设置 self.setup_table_common(self.record_table) # 设置列标题 - record_headers = ["序号", "订单", "品名", "规格", "托号", "轴包装号", "重量", "完成时间"] + record_headers = ["序号", "订单", "品名", "规格", "托号", "轴包装号", "毛重", "净重", "完成时间"] for col, header in enumerate(record_headers): self.record_table.setItem(0, col, self.create_header_item(header)) @@ -520,7 +520,7 @@ class MainWindowUI(QMainWindow): self.record_table.setRowHeight(row, 35) # 设置列宽 - column_widths = [70, 220, 160, 160, 160, 160, 160, 190] # 各列的默认宽度 + column_widths = [70, 200, 130, 130, 160, 120, 120, 120, 160] # 各列的默认宽度 for col, width in enumerate(column_widths): self.record_table.setColumnWidth(col, width) @@ -593,7 +593,7 @@ class MainWindowUI(QMainWindow): self.inspection_headers = self.inspection_headers[:columns] # 计算总列数 - total_columns = 2 + self.inspection_columns + 2 # 上料2列 + 检验N列 + 包装2列 + total_columns = 2 + self.inspection_columns + 3 # 上料2列 + 检验N列 + 包装3列 self.process_table.setColumnCount(total_columns) # 重新设置列宽 @@ -614,9 +614,9 @@ class MainWindowUI(QMainWindow): self.process_table.setSpan(0, 2, 1, self.inspection_columns) self.process_table.setItem(0, 2, self.create_header_item("检验")) - # 包装区域（2列） + # 包装区域（3列） packaging_start_col = 2 + self.inspection_columns - self.process_table.setSpan(0, packaging_start_col, 1, 2) + self.process_table.setSpan(0, packaging_start_col, 1, 3) self.process_table.setItem(0, packaging_start_col, self.create_header_item("包装")) # 第二行：列标题 @@ -636,7 +636,7 @@ class MainWindowUI(QMainWindow): self.process_table.setItem(1, 2 + i, self.create_header_item(header_text)) # 包装区域列标题 - packaging_headers = ["贴标", "称重"] + packaging_headers = ["贴标", "毛重", "净重"] for i, header in enumerate(packaging_headers): self.process_table.setItem(1, packaging_start_col + i, self.create_header_item(header)) @@ -653,4 +653,5 @@ class MainWindowUI(QMainWindow): # 包装区域列宽 packaging_start_col = 2 + self.inspection_columns self.process_table.setColumnWidth(packaging_start_col, 140) # 贴标 - self.process_table.setColumnWidth(packaging_start_col + 1, 140) # 称重 \ No newline at end of file + self.process_table.setColumnWidth(packaging_start_col + 1, 140) # 毛重 + self.process_table.setColumnWidth(packaging_start_col + 2, 140) # 净重 \ No newline at end of file diff --git a/utils/__pycache__/config_loader.cpython-310.pyc b/utils/__pycache__/config_loader.cpython-310.pyc index b0dd2df2521dd8fb951de060fbab575e7cdaee4d..fce5f6b31674701fa7ad8720f8bde0abd391b254 100644 GIT binary patch delta 19 ZcmaE$@IZkppO=@50SG?4-pCau0024z1)2Z= delta 19 ZcmaE$@IZkppO=@50SFe>ZR83Q001@!1l|Au diff --git a/utils/__pycache__/sql_utils.cpython-310.pyc b/utils/__pycache__/sql_utils.cpython-310.pyc index a1332ee6721597b8551b654da373c3299670a65b..f1020e0deaf6920ded66acb6a8fa82e69f4ff0b6 100644 GIT binary patch delta 20 acmew+@=b(0pO=@50SG?4_TI>y%>@8Kz6J^a delta 20 acmew+@=b(0pO=@50SFGTJ8tC8<^ljZ