#

LSH

2023-01-30 d1ed2c378ba6c0bc90371b888bd9bcbb6d136761

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -266,7 +266,7 @@

            }
        }
        News.infoNoLog(""+mark+" - 0"+" - 执行完成");
        News.infoNoLog(""+mark+" - 0"+" - 组托  ===》执行完成");

    }

@@ -332,7 +332,7 @@
                }
            }
        }
        News.infoNoLog(""+mark+" - 0"+" - 执行完成");
        News.infoNoLog(""+mark+" - 0"+" - wms入库  ===》执行完成");

    }

@@ -460,7 +460,7 @@
            }

        }
        News.infoNoLog(""+mark+" - 0"+" - 执行完成");
        News.infoNoLog(""+mark+" - 0"+" - 拣料、并板、盘点再入库  ===》执行完成");
    }

    /**
@@ -532,7 +532,7 @@
                }
            }
        }
        News.infoNoLog(""+mark+" - 0"+" - 执行完成");
        News.infoNoLog(""+mark+" - 0"+" - 堆垛机站出库到出库站  ===》执行完成");
    }

    /**
@@ -1071,12 +1071,12 @@
     * 库位移转
     */
    public synchronized void locToLoc(CrnSlave slave, CrnProtocol crnProtocol,Integer mark) {
        News.warnNoLog(""+mark+" - 3"+" - 0"+" - 堆垛机入出库作业下发：执行库位移转");
        // 获取工作档信息
        WrkMast wrkMast = wrkMastMapper.selectLocMove(slave.getId());
        if (null == wrkMast) {
            return;
        }
        News.warnNoLog(""+mark+" - 3"+" - 0"+" - 堆垛机入出库作业下发：执行库位移转");
        // 获取源库位信息
        LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
        if (null == sourceSta) {
@@ -1204,10 +1204,11 @@
//            if (crnProtocol.getModeType() != CrnModeType.STOP) {
                // 有任务
                if (crnProtocol.getTaskNo() != 0) {
                    News.warnNoLog(""+mark+" - 1"+" - 开始执行：堆垛机异常信息记录 ： 有任务");

                    BasErrLog latest = basErrLogService.findLatestByTaskNo(crn.getId(), crnProtocol.getTaskNo().intValue());
                    // 有异常
                    if (latest == null) {
                        News.warnNoLog(""+mark+" - 1"+" - 开始执行：堆垛机异常信息记录 ： 有任务，有异常");
                        if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
                            WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
                            if (wrkMast == null) {
@@ -1239,7 +1240,7 @@
                                    "任务中异常"    // 备注
                            );
                            if (!basErrLogService.insert(basErrLog)) {
                                News.error(""+mark+" - 1"+" - 堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
                                News.error(""+mark+" - 2"+" - 堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
                            }
                        }
                    } else {
@@ -1249,16 +1250,16 @@
                            latest.setUpdateTime(now);
                            latest.setStatus(2);
                            if (!basErrLogService.updateById(latest)) {
                                News.error(""+mark+" - 2"+" - 堆垛机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
                                News.error(""+mark+" - 3"+" - 堆垛机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
                            }
                        }
                    }
                    // 无任务
                } else {
                    News.warnNoLog(""+mark+" - 1"+" - 开始执行：堆垛机异常信息记录 ： 无任务");
                    BasErrLog latest = basErrLogService.findLatest(crn.getId());
                    // 有异常
                    if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
                        News.warnNoLog(""+mark+" - 4"+" - 开始执行：堆垛机异常信息记录 ： 无任务，有异常");
                        // 记录新异常
                        if (latest == null || (latest.getErrCode() != crnProtocol.getAlarm().intValue())) {
                            BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
@@ -1287,7 +1288,7 @@
                                    "无任务异常"    // 备注
                            );
                            if (!basErrLogService.insert(basErrLog)) {
                                News.error(""+mark+" - 3"+" - 堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
                                News.error(""+mark+" - 5"+" - 堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
                            }
                        }
                        // 无异常
@@ -1298,7 +1299,7 @@
                            latest.setUpdateTime(now);
                            latest.setStatus(2);
                            if (!basErrLogService.updateById(latest)) {
                                News.error(""+mark+" - 4"+" - 堆垛机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
                                News.error(""+mark+" - 6"+" - 堆垛机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
                            }
                        }
                    }
@@ -1417,7 +1418,7 @@
                }
            }
        }
        News.infoNoLog(""+mark+" - 0"+" - 开始执行");
        News.infoNoLog(""+mark+" - 0"+" - 空栈板初始化入库,叉车入库站放货执行完成");
    }

    /**
@@ -1426,7 +1427,6 @@
    public synchronized void ledExecute(Integer mark) {

        for (LedSlave led : slaveProperties.getLed()) {
            News.warnNoLog(""+mark+" - 0"+" - 开始执行:出库  ===>> 工作档信息写入led显示器");
            // 获取输送线plc线程
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
            // 命令集合
@@ -1447,6 +1447,7 @@
                if (null == wrkMast) {
                    continue;
                }
                News.warnNoLog(""+mark+" - 0"+" - 开始执行:出库  ===>> 工作档信息写入led显示器");
                wrkMasts.add(wrkMast);
                // 组装命令
                LedCommand ledCommand = new LedCommand();
@@ -1537,7 +1538,7 @@
            }

        }
        News.infoNoLog(""+mark+" - 0"+" - 开始执行");
        News.infoNoLog(""+mark+" - 0"+" - 出库  ===>> 工作档信息写入led显示器执行完成");
    }

    /**
@@ -1545,8 +1546,9 @@
     */
    public synchronized void ledReset(Integer mark) {

        for (LedSlave led : slaveProperties.getLed()) {
            News.warnNoLog(""+mark+" - 0"+" - 开始执行:其他  ===>> LED显示器复位，显示默认信息");
        for (LedSlave led : slaveProperties.getLed()) {

            // 获取输送线plc线程
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
            // 命令集合
@@ -1996,7 +1998,7 @@
    public synchronized void outOfDevp(Integer mark) {

        List<WrkMast> wrkMasts = wrkMastMapper.selectPick();
        if (wrkMasts!=null){
        if (wrkMasts.size()!=0){
            News.warn(""+mark+" - 0"+" - 开始执行outOfDevp");
        }
        for (WrkMast wrkMast : wrkMasts) {