pjb
5 天以前 bffc2c91fa1469e26acc206a5e43850ceece1f00
堆垛机输送线掉线重置设备表
3个文件已修改
40 ■■■■■ 已修改文件
src/main/java/com/zy/core/thread/MelsecCrnThread.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/service/impl/MainServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -132,6 +132,19 @@
        crnProtocol.setyDistance((short)0);
        crnProtocol.setxDuration((short)0);
        crnProtocol.setyDuration((short)0);
        try{
            // 根据实时信息更新数据库
            BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
            BasCrnp basCrnp = new BasCrnp();
            basCrnp.setCrnErr(crnProtocol.getAlarm()==null?0:crnProtocol.getAlarm().longValue());
            basCrnp.setCrnNo(slave.getId());
            basCrnp.setCrnSts((int)crnProtocol.getMode());
            if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
                News.error("MelsecCrn"+" - 4"+" - 堆垛机plc数据库更新失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            }
        } catch (Exception e){
        }
    }
    @Override
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -198,6 +198,25 @@
                    staProtocol.setPakMk(true);
                }
            }
        // 根据实时信息更新数据库
        try {
            List<BasDevp> basDevps = new ArrayList<>();
            for (Integer siteId2 : staNos) {
                StaProtocol staProtocol2 = station.get(siteId2);
                basDevps.add(staProtocol2.toSqlModel());
            }
            BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
            if(basDevps.size() > 0) {
                if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
                    throw new Exception("更新数据库数据失败");
                }
            }
        } catch (Exception e){
        }
    }
    @Override
src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -843,7 +843,7 @@
                    if (staProtocol.isLoading() && staProtocol.getWorkNo() == 0) {
                        kbWrks ++;
                    }
                    if (kbWrks > 1) {
                    if (kbWrks > 2) {
                        continue;
                    }
                }
@@ -1276,15 +1276,15 @@
            if (crnProtocol == null) {
                continue;
            }
            if (true) {
//            if (crnProtocol.getModeType() != CrnModeType.STOP) {
//            if (true) {
            if (crnProtocol.getModeType() != CrnModeType.STOP) {
                // 有任务
                if (crnProtocol.getTaskNo() != 0) {
                    BasErrLog latest = basErrLogService.findLatestByTaskNo(crn.getId(), crnProtocol.getTaskNo().intValue());
                    // 有异常
                    if (latest == null) {
                        News.warnNoLog(""+mark+" - 1"+" - 开始执行:堆垛机异常信息记录 : 有任务,有异常");
//                        News.warnNoLog(""+mark+" - 1"+" - 开始执行:堆垛机异常信息记录 : 有任务,有异常");
                        if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
                            WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
                            if (wrkMast == null) {