From 94f8ae054cc0413a0712e8d860af7394e37bcff8 Mon Sep 17 00:00:00 2001 From: zhu-mengmeng <15588200382@163.com> Date: Tue, 15 Jul 2025 16:40:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0InspectionDAO?= =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E6=9B=B4=E5=A4=9A=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=9E=84=E4=B8=BB=E7=AA=97=E5=8F=A3UI?= =?UTF-8?q?=E4=BB=A5=E4=BD=BF=E7=94=A8=E7=BB=9F=E4=B8=80=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=A0=E5=B0=84=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/app_config.json | 3 ++- dao/inspection_dao.py | 4 ++-- db/jtDB.db | Bin 155648 -> 159744 bytes ui/main_window_ui.py | 41 +++++++++++++++++---------------- widgets/main_window.py | 50 ++++++++++------------------------------- 5 files changed, 38 insertions(+), 60 deletions(-) diff --git a/config/app_config.json b/config/app_config.json index c03db90..921f301 100644 --- a/config/app_config.json +++ b/config/app_config.json @@ -116,6 +116,7 @@ } }, "electricity": { - "auto_start": true + "auto_start": true, + "interval_minutes": 30 } } \ No newline at end of file diff --git a/dao/inspection_dao.py b/dao/inspection_dao.py index 7498d79..d558423 100644 --- a/dao/inspection_dao.py +++ b/dao/inspection_dao.py @@ -763,8 +763,8 @@ class InspectionDAO: """ try: sql = """ - SELECT distinct data_corp,user_id,user_name,gzl_zl,mzl,ddmo,qd,spack_type,mxzs,jt,ddnote,code, - type,lable,lib,gzl,maxsl,cz,size,cd,luno,qfqd,pono,xj,ysl,dycz,edit_id,remarks,zx_name + SELECT DISTINCT data_corp, user_id, user_name, gzl_zl, mzl, ddmo, xpack, qd, spack_type, mxzs, jt, ddnote, code, type, lable, lib, gzl, maxsl, cz, size, cd, luno, + qfqd, pono, xj, ysl, dycz, zx_code, edit_id, remarks, zx_name, bccd, tccd, zzyq, customer, customerexp, bz_bqd as bqd, bz_tqd as tqd, type_name, remarks_hb FROM wsbz_order_info WHERE ddmo = ? """ params = (order_id,) diff --git a/db/jtDB.db b/db/jtDB.db index dba88cb9fd04206a1d933568eb50584e81a789ea..109d6258be3ff813641462a13c4073da983e1c95 100644 GIT binary patch delta 884 zcmZwFJ5Rz;6bJCzmS;i*K_x~}CJBj{KDdR}M1pU8i!W4SNc;dkzCdwtu6AH^WH1hz zhOn}_@evrD{RSEjw-a)bE~meo({ul~^-i$f3tCg&EFmQIlq_)BkJ`@?SGBJSk3MZu z6ew?7zA@*w;JX!OyrS)YU*x@_GaC8y%wKB}XbX~JqL>H}lIDmaDKsPHGBQod)S&%m zfl@uMEA~rkA~f)#(;DY>!MSfezXrnLCQKr!MySS3^Wi4UH^ai5RcgQ8aFw3p>83f; zDtU++82W^w#;r|6vWAk4TN{X|Ox6)mn5-cp8?*g!s|ZP~X{GT{=3{=H70YgsXGM_} z?P!_*7X2a|Gd2>n{oNEC@=G-1R`vf(&5&V5IMyX1up-C>A~KV6L|{YcsSJyxn~cs7 zg5{y<6ph)_e-{s2cRxCQ_K delta 127 zcmV-_0D%91;0b`h36L8F7ytkOCXpaN0T{7h{XPLflU_fD1~nNC12qDZkOma9{yzqA z104l&lLxRnvk?$51p;F=lMl5XleD!Iv!=CPst67btN;K204A3VU;!Mn5fFzDx36yj hRp0}P0sONE&=mob5fI=57mz`hfl>k!w-QnU?hS|5CsF_a diff --git a/ui/main_window_ui.py b/ui/main_window_ui.py index e0ca3e9..30713ea 100644 --- a/ui/main_window_ui.py +++ b/ui/main_window_ui.py @@ -7,6 +7,27 @@ from PySide6.QtGui import QFont, QAction, QBrush, QColor from PySide6.QtCore import Qt, QDateTime, QTimer class MainWindowUI(QMainWindow): + # 定义字段映射为类属性，方便外部引用 + FIELD_MAPPING = { + "客户": "customerexp", + "规格": "size", + "材质": "cz", + "种类": "type_name", + "钢厂": "cd", + "炉号": "luno", + "轴型": "zx_name", + "标签": "template_name", + "打印材质": "cz", + "底托类型": "spack_type", + "强度范围": "qx", + "强度": "qd", + "延伸要求": "ysl", + "线材类型": "jz", + "轴重要求": "zzyq", + "线径公差": "xj", + "备注": "remarks_hb" + } + def __init__(self,username): super().__init__() self.username = username @@ -282,25 +303,7 @@ class MainWindowUI(QMainWindow): """) # 定义字段和对应的数据键 - field_mapping = { - "客户": "customerexp", - "规格": "size", - "材质": "cz", - "种类": "type_name", - "钢厂": "cd", - "炉号": "luno", - "轴型": "zx_name", - "标签": "lable", - "打印材质": "cz", - "底托类型": "spack_type", - "强度范围": "qx", - "强度": "qd", - "延伸要求": "ysl", - "线材类型": "jz", - "轴重要求": "zq", - "线径公差": "xj", - "备注": "remarks_hb" - } + field_mapping = self.FIELD_MAPPING # 创建标签和值的字典，用于后续更新 self.info_labels = {} diff --git a/widgets/main_window.py b/widgets/main_window.py index 73765b0..1816688 100644 --- a/widgets/main_window.py +++ b/widgets/main_window.py @@ -3317,31 +3317,17 @@ class MainWindow(MainWindowUI): logging.info(f"更新上料区域信息表格: {order_info}") - # 获取表格中的映射关系 - field_mapping = { - "客户": "customerexp", - "规格": "size", - "材质": "cz", - "种类": "type_name", - "钢厂": "cd", - "炉号": "luno", - "轴型": "zx_name", - "标签": "template_name", - "打印材质": "cz", - "底托类型": "spack_type", - "强度范围": "qx", - "强度": "qd", - "延伸要求": "ysl", - "检验员": "jz", - "轴重要求": "zzyq", - "线径公差": "xj", - "备注": "remarks_hb" - } + # 使用UI类中定义的字段映射关系 + field_mapping = self.FIELD_MAPPING + + # 记录 order_info 中的所有键，用于调试 + logging.debug(f"订单信息键: {list(order_info.keys())}") # 更新表格内容 for field_name, field_key in field_mapping.items(): if field_name in self.info_values: value = "" + # 对可能存在的键进行安全检查 if field_key and field_key in order_info: value = str(order_info[field_key]) # 特殊处理线径公差 @@ -3356,25 +3342,13 @@ class MainWindow(MainWindowUI): if bqd is not None and tqd is not None: value = f"{bqd} - {tqd}" self.info_values[field_name].setText(value) + else: + logging.warning(f"字段名 '{field_name}' 在info_values中不存在") logging.info("上料区域信息表格更新完成") - # 为了演示，如果没有真实数据，填充一些mock数据 - if not any(order_info.values()): - mock_data = { - "customerexp": "示例客户", - "size": "1.2mm", - "cz": "不锈钢", - "type_name": "A型", - "cd": "上海钢厂", - "luno": "LN20230501", - "zx_name": "标准轴", - "lable": "标签A", - "spack_type": "标准底托", - "bccd": "0.7", - "tccd": "0.9" - } - self.update_info_table(mock_data) - except Exception as e: - logging.error(f"更新上料区域信息表格失败: {str(e)}") \ No newline at end of file + logging.error(f"更新上料区域信息表格失败: {str(e)}") + # 记录异常堆栈，便于调试 + import traceback + logging.error(traceback.format_exc()) \ No newline at end of file