diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java
index 04eb3264a..a59668039 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java
@@ -88,4 +88,8 @@ public class HighFormworkMeasureCurrentData implements Serializable {
 	@TableField(exist = false)
 	@ApiModelProperty(value = "测量点名称")
 	private java.lang.String measurePointName;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "采集仪编号")
+	private java.lang.String acquisitionInstrumentNumber;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java
index 8c99ed8ea..98ce9e97c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java
@@ -55,7 +55,9 @@ public class HighFormworkMeasureCurrentDataServiceImpl extends ServiceImpl<HighF
     @Override
     public void saveHighFormworkMeasureCurrentData(HighFormworkMeasureCurrentData highFormworkMeasureCurrentData) {
         QueryWrapper<HighFormworkMeasurePoint> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasureCurrentData.getMeasurePointNumber());
+        queryWrapper.lambda()
+                .eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasureCurrentData.getMeasurePointNumber())
+                .eq(HighFormworkMeasurePoint::getAcquisitionInstrumentNumber, highFormworkMeasureCurrentData.getAcquisitionInstrumentNumber());
         HighFormworkMeasurePoint point = highFormworkMeasurePointMapper.selectOne(queryWrapper);
         if (point == null) {
             throw new OpenAlertException(MessageUtil.get("pointNoErr"));
diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java
index 6c4b27371..fe17a9d25 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java
@@ -50,16 +50,18 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl<HighFormwor
 
     @Override
     public void saveHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint) {
-        QueryWrapper<HighFormworkMeasurePoint> queryWrapper=new QueryWrapper<>();
-        queryWrapper.lambda().eq(HighFormworkMeasurePoint::getMeasurePointNumber,highFormworkMeasurePoint.getMeasurePointNumber());
-        int count=highFormworkMeasurePointMapper.selectCount(queryWrapper);
-        if(count>0){
+        QueryWrapper<HighFormworkMeasurePoint> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda()
+                .eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasurePoint.getMeasurePointNumber())
+                .eq(HighFormworkMeasurePoint::getAcquisitionInstrumentNumber, highFormworkMeasurePoint.getAcquisitionInstrumentNumber());
+        int count = highFormworkMeasurePointMapper.selectCount(queryWrapper);
+        if (count > 0) {
             throw new OpenAlertException(MessageUtil.get("pointNoExistErr"));
         }
         highFormworkMeasurePoint.setRealTime(new Date());
         highFormworkMeasurePointMapper.insert(highFormworkMeasurePoint);
-        if(highFormworkMeasurePoint.getThresholdList()!=null&&highFormworkMeasurePoint.getThresholdList().size()>0){
-            for (HighFormworkMeasurePointThreshold threshold:highFormworkMeasurePoint.getThresholdList()){
+        if (highFormworkMeasurePoint.getThresholdList() != null && highFormworkMeasurePoint.getThresholdList().size() > 0) {
+            for (HighFormworkMeasurePointThreshold threshold : highFormworkMeasurePoint.getThresholdList()) {
                 threshold.setMeasurePointId(highFormworkMeasurePoint.getId());
                 highFormworkMeasurePointThresholdMapper.insert(threshold);
             }
@@ -68,18 +70,20 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl<HighFormwor
 
     @Override
     public void editHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint) {
-        QueryWrapper<HighFormworkMeasurePoint> queryWrapper=new QueryWrapper<>();
-        queryWrapper.lambda().eq(HighFormworkMeasurePoint::getMeasurePointNumber,highFormworkMeasurePoint.getMeasurePointNumber())
-                .ne(HighFormworkMeasurePoint::getId,highFormworkMeasurePoint.getId());
-        int count=highFormworkMeasurePointMapper.selectCount(queryWrapper);
-        if(count>0){
+        QueryWrapper<HighFormworkMeasurePoint> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda()
+                .eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasurePoint.getMeasurePointNumber())
+                .eq(HighFormworkMeasurePoint::getAcquisitionInstrumentNumber, highFormworkMeasurePoint.getAcquisitionInstrumentNumber())
+                .ne(HighFormworkMeasurePoint::getId, highFormworkMeasurePoint.getId());
+        int count = highFormworkMeasurePointMapper.selectCount(queryWrapper);
+        if (count > 0) {
             throw new OpenAlertException(MessageUtil.get("pointNoExistErr"));
         }
         highFormworkMeasurePoint.setRealTime(null);
         highFormworkMeasurePointMapper.updateById(highFormworkMeasurePoint);
-        if(highFormworkMeasurePoint.getThresholdList()!=null&&highFormworkMeasurePoint.getThresholdList().size()>0){
-            for (HighFormworkMeasurePointThreshold threshold:highFormworkMeasurePoint.getThresholdList()){
-                if(threshold.getId()!=null){
+        if (highFormworkMeasurePoint.getThresholdList() != null && highFormworkMeasurePoint.getThresholdList().size() > 0) {
+            for (HighFormworkMeasurePointThreshold threshold : highFormworkMeasurePoint.getThresholdList()) {
+                if (threshold.getId() != null) {
                     threshold.setMeasurePointId(highFormworkMeasurePoint.getId());
                     highFormworkMeasurePointThresholdMapper.updateById(threshold);
                 }else {