From 9c44fa81926e729de0d5d5a54cf63ec4dc4df7c4 Mon Sep 17 00:00:00 2001
From: "ZHANGXUXU\\95193" <951937200@qq.com>
Date: Mon, 21 Jul 2025 18:57:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9DO=E5=80=BC=E8=BF=9B=E8=A1=8C=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UI/VarManages/AnalogModel.py    | 8 ++++++++
 UI/VarManages/ModbusModel.py    | 2 +-
 model/ProjectModel/VarManage.py | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/UI/VarManages/AnalogModel.py b/UI/VarManages/AnalogModel.py
index 5a60b87..2a3d83e 100644
--- a/UI/VarManages/AnalogModel.py
+++ b/UI/VarManages/AnalogModel.py
@@ -182,6 +182,14 @@ class AnalogButtonDelegate(TcRtdButtonDelegate):
                                          "AI,DI类型变量不允许强制值",
                                          QMessageBox.Yes)
             return
+        
+        if varType in ['DO'] and int(value) not in [0, 1]:
+            reply = QMessageBox.question(self.parent(),
+                                         '警告',
+                                         "DO类型变量强制值只能为0或1",
+                                         QMessageBox.Yes)
+            return
+        
         if not value or re.findall(pattern, str(value)):
             reply = QMessageBox.question(self.parent(),
                                          '警告',
diff --git a/UI/VarManages/ModbusModel.py b/UI/VarManages/ModbusModel.py
index 86db4a1..a1415db 100644
--- a/UI/VarManages/ModbusModel.py
+++ b/UI/VarManages/ModbusModel.py
@@ -383,7 +383,7 @@ class VarButtonDelegate(QItemDelegate):
             if varType == '':
                 varType = 0
 
-            if not name:
+            if not name or not slaveID or not address:
                 reply = QMessageBox.question(self.parent(),
                                      '警告',
                                      "有字段为空或输入错误",
diff --git a/model/ProjectModel/VarManage.py b/model/ProjectModel/VarManage.py
index bb96090..7565660 100644
--- a/model/ProjectModel/VarManage.py
+++ b/model/ProjectModel/VarManage.py
@@ -538,17 +538,17 @@ class AnalogManage(object):
         for i in range(1, 17):
             name = '有源24V数字输出通道' + str(i)
             des = '有源24V数字输出' + str(i)
-            self.createVar(varName=name,  channelNumber=str(i), varType='DO', des=des, min='100', max='200', varModel = '本地值')
+            self.createVar(varName=name,  channelNumber=str(i), varType='DO', des=des, min='0', max='1', varModel = '本地值')
 
         for i in range(1, 9):
             name = '无源24V数字输入通道' + str(i)
             des = '无源24V数字输入' + str(i)
-            self.createVar(varName=name,  channelNumber=str(i), varType='DI', des=des, min='100', max='200', varModel = '本地值')
+            self.createVar(varName=name,  channelNumber=str(i), varType='DI', des=des, min='0', max='1', varModel = '本地值')
 
         for i in range(9, 17):
             name = '有源48V数字输入通道' + str(i)
             des = '有源48V数字输入' + str(i)
-            self.createVar(varName=name,  channelNumber=str(i), varType='DI', des=des, min='100', max='200', varModel = '本地值')
+            self.createVar(varName=name,  channelNumber=str(i), varType='DI', des=des, min='0', max='1', varModel = '本地值')
        
         for i in range(1, 9):
             name = '有源/无源4-20mA输入通道' + str(i)