OEE功能及设备管理调整

Lius

2024-12-17 2d727903343feb01fedc988370091395c368faf2

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java

@@ -67,17 +67,17 @@
        if (!running.isEmpty()) {
            MdcEquipmentRunningSectionDto dto;
            String tableName = "";
            Boolean isTableExist = false;
            String backupTableName = "";
            if (equip != null) {
                if (StringUtils.isNotBlank(equip.getDrivetype())) {
                    tableName = equip.getDrivetype() + "_" + equip.getEquipmentid();
                    isTableExist = equipmentWorkLineService.isTableExist(tableName);
                    backupTableName = equipmentService.checkTableExists(tableName);
                }
            }
            for (MdcEquipmentRunningSection entity : running) {
                dto = new MdcEquipmentRunningSectionDto();
                BeanUtils.copyProperties(entity, dto);
                if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber()) && isTableExist && !"ZUOLAN".equals(equip.getDrivetype())) {
                if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber()) && StringUtils.isNotBlank(backupTableName) && !"ZUOLAN".equals(equip.getDrivetype())) {
                    List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(tableName, entity.getStartTime(), entity.getEndTime());
                    if (esList != null && esList.size() > 1) {
                        dto.setSequenceNumber(esList.get(0).getSequencenumber());