diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java index 06a5039..63e0386 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java @@ -10,8 +10,10 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentChannel; import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariable; import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel; +import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentChannelRepository; import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentRepository; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -42,6 +44,9 @@ public class MesEquipmentVariableService extends BaseMesService> mapList,String equipmentCode, String userName, String organizeCode) { MesEquipment mesEquipment = getMesEquipment(organizeCode,equipmentCode); + MesEquipmentChannel mesEquipmentChannel = getMesEquipmentChannel(organizeCode,equipmentCode); + List mesEquipmentVariables = new ArrayList<>(); for (Map objectMap : mapList) { List objects = Arrays.asList(objectMap.values().toArray()); try { MesEquipmentVariable mesEquipmentVariable = new MesEquipmentVariable(); mesEquipmentVariable.setEquipId(mesEquipment.getEquipId()); + mesEquipmentVariable.setChannel(mesEquipmentChannel.getChannel()); mesEquipmentVariable.setEquipmentCode(mesEquipment.getEquipmentCode()); mesEquipmentVariable.setTagName(String.valueOf(objects.get(0))); mesEquipmentVariable.setTagAddress(String.valueOf(objects.get(1))); mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.descriptionOfValue(String.valueOf(objects.get(2)))); mesEquipmentVariable.setVariableType(Integer.parseInt(objects.get(3) + "")); mesEquipmentVariable.setReadWriteFlag(MesExtEnumUtil.READ_WRITE_FLAG.descriptionOfValue(String.valueOf(objects.get(4)))); + mesEquipmentVariable.setScanInterval(Integer.valueOf(String.valueOf(objects.get(5)))); + mesEquipmentVariable.setScanInterval(Integer.valueOf(String.valueOf(objects.get(5)))); + mesEquipmentVariable.setDescription(String.valueOf(objects.get(15))); mesEquipmentVariable.setOrganizeCode(organizeCode); ConvertBean.serviceModelInitialize(mesEquipmentVariable, userName); mesEquipmentVariables.add(mesEquipmentVariable); @@ -139,5 +150,13 @@ public class MesEquipmentVariableService extends BaseMesService