From 3ea5f0d2b62aa677f74a8d9eaf404bf3e2ce7605 Mon Sep 17 00:00:00 2001 From: "ZHANGXUXU\\95193" <951937200@qq.com> Date: Sun, 24 Aug 2025 18:02:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=95=B0=E9=87=8F=E8=B6=85?= =?UTF-8?q?=E8=BF=87=E9=80=9A=E9=81=93=E6=95=B0=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=90=8E=E9=BB=98=E8=AE=A4=E5=8F=98=E9=87=8F=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=BA=E6=A8=A1=E6=8B=9F=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/ProjectModel/VarManage.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/model/ProjectModel/VarManage.py b/model/ProjectModel/VarManage.py index ebb1a25..e1f108b 100644 --- a/model/ProjectModel/VarManage.py +++ b/model/ProjectModel/VarManage.py @@ -463,9 +463,9 @@ class TcRtdManage(object): if varModel not in ['本地值', '远程值', '模拟值']: errorInfo = '表TCRTD第{}行导入失败,{}'.format(str(index + 1), str(index + 1), '变量模型有误') return errorInfo - if not varNumberManage.validateChannelNumber(varType, channelNumber): - errorInfo = '表TCRTD第{}行导入失败,{}'.format(str(index + 1), '通道号超出范围') - return errorInfo + # if not varNumberManage.validateChannelNumber(varType, channelNumber): + # errorInfo = '表TCRTD第{}行导入失败,{}'.format(str(index + 1), '通道号超出范围') + # return errorInfo # if TcRtdVar.getByChannelNumber(channelNumber): # # 如果通道号已存在,更新其信息 @@ -481,7 +481,10 @@ class TcRtdManage(object): # initialValue=initialValue).where((TcRtdVar.channelNumber == channelNumber) & (TcRtdVar.varType == 'PT100')).execute() # else: tcRtdVarType = TcRtdVar() - tcRtdVarType.createVar(varName = varName, channelNumber=channelNumber, des = des, varType = varType, min = min, max = max, compensationVar = compensationVar, varModel = varModel, unit = unit, initialValue=initialValue) + if int(channelNumber) > 8: + tcRtdVarType.createVar(varName = varName, channelNumber=channelNumber, des = des, varType = varType, min = min, max = max, compensationVar = compensationVar, varModel = '模拟值', unit = unit, initialValue=initialValue) + else: + tcRtdVarType.createVar(varName = varName, channelNumber=channelNumber, des = des, varType = varType, min = min, max = max, compensationVar = compensationVar, varModel = varModel, unit = unit, initialValue=initialValue) # 操作后刷新缓存 refreshCache() @@ -758,7 +761,8 @@ class GlobalVarManager(object): """导入变量""" # 在处理数据前,将所有NaN值替换为空字符串 data = data.fillna('') - + + tcrtdChannelList = [] errorConList = [] match sheetName: @@ -789,6 +793,7 @@ class GlobalVarManager(object): varModel=row.get('值类型', ''), index=index ) + if errInfo: errorConList.append(errInfo) except Exception as e: @@ -834,6 +839,13 @@ class GlobalVarManager(object): if errInfo: errorConList.append(errInfo) else: # TCRTD + # if row['变量类型'] in ['R', 'S', 'B', 'J', 'T', 'E', 'K', 'N', 'C', 'A']: + # # 热电偶类型 + # if row['通道序号'] in tcrtdChannelList: + # errorConList.append(f'第{index+1}行导入失败: 通道号 {row["通道序号"]} 已被占用') + # continue + # else: + # tcrtdChannelList.append(row['通道序号']) errInfo = importFunc( varName=row['变量名'], channelNumber=row['通道序号'],