漏信号

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesEquipmentLogDao.java

@@ -79,10 +79,12 @@ public class MesEquipmentLogDao implements IMesEquipmentLogDao {
 
             if (StringUtils.isEmpty(equipmentLogIdList.get(i))) continue;
 
-            if (!StringUtils.isEmpty(builder)) builder.append(MesPcnExtConstWords.SEMICOLON);
+            if (!StringUtils.isEmpty(builder.toString())) builder.append(MesPcnExtConstWords.SEMICOLON);
             builder.append(" update mes_equipment_log_");
             builder.append(equipId);
-            builder.append(" set equip_variable_status = :equipVariableStatus where id = :id_");
+            builder.append(" set equip_variable_status = :equipVariableStatus_");
+            builder.append(i);
+            builder.append(" where id = :id_");
             builder.append(i);
 
         }
@@ -91,7 +93,8 @@ public class MesEquipmentLogDao implements IMesEquipmentLogDao {
 
         for (int i = 0; i < equipmentLogIdList.size(); i ++) {
             if (StringUtils.isEmpty(equipmentLogIdList.get(i))) continue;
-            update.setParameter(String.format("id_%s", i), equipVariableStatus);
+            update.setParameter(String.format("%s_%s", MesPcnExtConstWords.EQUIP_VARIABLE_STATUS, i), equipVariableStatus);
+            update.setParameter(String.format("%s_%s", MesPcnExtConstWords.ID, i), equipmentLogIdList.get(i));
         }
 
         update.executeUpdate();

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesEquipmentLogExtService.java

@@ -127,7 +127,8 @@ public class MesEquipmentLogExtService implements IMesEquipmentLogExtService {
             equipVariableCfgCollectContextList.add(equipVariableCfgCollectContext);
 
             // 标记需要修改的设备数据变量ID 【在主方法体中修改常变值配置对应的设备ID分表的采集数据的状态为1】
-            if (equipVariableCfgCollectContext.getIsCollectValue() && checkEquipQuality(cellEquipContext.getQuality())) equipLogDispatchContext.resetEquipmentLogIdList(equipVariableCfgCollectContext.getEquipmentLogIdList());
+            if (equipVariableCfgCollectContext.getIsCollectValue() && checkEquipQuality(cellEquipContext.getQuality()) && !StringUtils.isEmpty(equipmentVariableCfg.getNeedNewValue()) &&
+                    equipmentVariableCfg.getNeedNewValue().compareTo(MesExtEnumUtil.EQUIP_VARIABLE_NEED_NEW_VALUE.TRUE.getValue()) == 0) equipLogDispatchContext.resetEquipmentLogIdList(equipVariableCfgCollectContext.getEquipmentLogIdList());
         }
 
         return equipVariableCfgCollectContextList;