非自动不发送回退指令

chen.llin

昨天 86ec073ab2ef3e35c2cc8e91ec2747231eae2578

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

@@ -1115,12 +1115,17 @@
//                                ledThread.errorReset();
                            }
                        } else {
                            String errorMsg = jsonObject.getString("msg");
                            // 如果任务回退，并且站点不是自动状态，则不触发回退
                            if (!staProtocol.isAutoing()) {
                                log.error("空板入库回退"+wrkNo+","+errorMsg+"，站点不是自动状态，不触发回退");
                                continue;
                            }
                            staProtocol.setWorkNo(wrkNo);
                            wrkNo++;
                            staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            String errorMsg = jsonObject.getString("msg");
                            log.error("空板入库回退"+wrkNo+","+errorMsg);
                            if (!result) {
                                News.errorNoLog(""+mark+" - 2"+" - 更新plc站点信息失败");