变量数量超过通道数,添加后默认变量模式为模拟值

main
ZHANGXUXU\95193 2 months ago
parent dd658ba58f
commit 3ea5f0d2b6

@ -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['通道序号'],

Loading…
Cancel
Save