mdc修改

Lius

2023-12-18 44c1da90d18396b4c78c588571e71eaa8e49c8d6

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

@@ -52,6 +52,7 @@
    @Transactional(rollbackFor = {Exception.class})
    public void runningProcessCount() {
        // 获取所有设备
        //List<MdcEquipment> mdcEquipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, "2240074"));
        List<MdcEquipment> mdcEquipmentList = mdcEquipmentService.list();
        List<MdcProcessCount> result = new ArrayList<>();
        for (MdcEquipment mdcEquipment : mdcEquipmentList) {
@@ -138,7 +139,7 @@
        }
        // 获取设备班次信息
        Map<String, List<MdcDeviceCalendarVo>> listMap = this.mdcDeviceCalendarMap(mdcEquipment.getEquipmentId(), stringDates);
        if (listMap.isEmpty()) {
        if (listMap == null || listMap.isEmpty()) {
            listMap = new HashMap<>();
        }
        List<MdcProcessCount> resultList = new ArrayList<>();
@@ -194,6 +195,7 @@
                                    mdcProcessCount.setStartTime(startDate);
                                }
                                if ("FANUC".equals(mdcEquipment.getDriveType())) {
                                    try {
                                    // 法兰克设备根据ProductCount字段判断
                                    String productCount = mdcEquipmentDtoList.get(0).get("ProductCount").toString();
                                    for (int i = 0; i < mdcEquipmentDtoList.size(); i++) {
@@ -216,6 +218,10 @@
                                            }
                                        }
                                    }
                                    } catch (Exception e) {
                                        log.error("计算加工工件算法失败！设备编号：" + mdcEquipment.getEquipmentId(), e);
                                        //System.out.println("计算加工工件算法失败！设备编号：" + mdcEquipment.getEquipmentId());
                                    }
                                }
                            }
                        }