#

1

4 天以前 4c167750ac805b35d0c025961b060b23f0268969

#

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

@@ -339,9 +339,9 @@
                            staProtocol.setStaNo(RouteUtils.SouStaEnd(dto.getStaNo(),dto.getSourceStaNo()));
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.error("输送线下发2："+dto.getWorkNo()+","+dto.getStaNo());
                            log.info("输送线下发2："+dto.getWorkNo()+","+dto.getStaNo());
                            ledThread.errorReset();
                            log.error("组托请求后LED错误清除");
                            log.info("组托请求后LED错误清除");

                            if (!result) {
                                News.error(methodName + ":更新plc站点信息失败");
@@ -903,7 +903,7 @@
                            wrkMast9997.setCrnEndTime(new Date());
                            if (wrkMastMapper.updateById(wrkMast9997) != 0) {
                                // 复位堆垛机
                                log.error("出库任务完成下发堆垛机复位,{}", wrkMast9997.getWrkNo());
                                log.info("出库任务完成下发堆垛机复位,{}", wrkMast9997.getWrkNo());
                                crnThread.setResetFlag(true);
                            } else {
                                News.error(""+mark+" - 1"+" - 更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast9997.getWrkNo());
@@ -949,7 +949,7 @@
                            wrkMast9996.setCrnEndTime(new Date());
                            if (wrkMastMapper.updateById(wrkMast9996) != 0) {
                                // 复位堆垛机
                                log.error("出库任务完成下发堆垛机复位,{}", wrkMast9996.getWrkNo());
                                log.info("出库任务完成下发堆垛机复位,{}", wrkMast9996.getWrkNo());
                                crnThread.setResetFlag(true);
                            } else {
                                News.error(""+mark+" - 1"+" - 更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast9996.getWrkNo());
@@ -1003,7 +1003,7 @@
                        wrkMast.setCrnEndTime(new Date());
                        if (wrkMastMapper.updateById(wrkMast) != 0) {
                            // 复位堆垛机
                            log.error("出库任务完成下发堆垛机复位,{}", wrkMast.getWrkNo());
                            log.info("出库任务完成下发堆垛机复位,{}", wrkMast.getWrkNo());
                            crnThread.setResetFlag(true);
                        } else {
                            News.error(""+mark+" - 1"+" - 更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast.getWrkNo());
@@ -3583,7 +3583,7 @@
                            }
                            wrkMastSta.setWrkSts(2);
                            wrkMastStaMapper.updateById(wrkMastSta);
                            log.error("更新小车任务成功");
                            log.info("更新小车任务成功");
                        }catch (Exception e){
                            log.error("更新小车任务失败"+ e);
                        }
@@ -3652,7 +3652,7 @@
                            }
                            wrkMastSta.setWrkSts(2);
                            wrkMastStaMapper.updateById(wrkMastSta);
                            log.error("更新小车任务成功");
                            log.info("更新小车任务成功");
                        }catch (Exception e){
                            log.error("更新小车任务失败");
                        }
@@ -3982,10 +3982,11 @@
                try{
                    wrkMastSta.setWrkSts(1);
                    wrkMastStaMapper.updateById(wrkMastSta);
                    log.error("更新小车任务成功{}",wrkMastSta);
                    log.info("更新小车任务成功{}",wrkMastSta);
                }catch (Exception e){
                    log.error("更新小车任务失败");
                }
                break;  // 新增：下发成功后退出循环，防止连续下发多个
            } else {
                log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo());
            }
@@ -4131,10 +4132,11 @@
                try{
                    wrkMastSta.setWrkSts(1);
                    wrkMastStaMapper.updateById(wrkMastSta);
                    log.error("更新小车任务成功{}",wrkMastSta);
                    log.info("更新小车任务成功{}",wrkMastSta);
                }catch (Exception e){
                    log.error("更新小车任务失败");
                }
                break;  // 新增：下发成功后退出循环，防止连续下发多个
            } else {
                log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo());
            }
@@ -4280,10 +4282,11 @@
                try{
                    wrkMastSta.setWrkSts(1);
                    wrkMastStaMapper.updateById(wrkMastSta);
                    log.error("更新小车任务成功{}",wrkMastSta);
                    log.info("更新小车任务成功{}",wrkMastSta);
                }catch (Exception e){
                    log.error("更新小车任务失败");
                }
                break;  // 新增：下发成功后退出循环，防止连续下发多个
            } else {
                log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo());
            }
@@ -4415,7 +4418,7 @@
                try{
                    wrkMastSta.setWrkSts(1);
                    wrkMastStaMapper.updateById(wrkMastSta);
                    log.error("更新小车任务成功");
                    log.info("更新小车任务成功");
                }catch (Exception e){
                    log.error("更新小车任务失败");
                }
@@ -4680,10 +4683,11 @@
                try{
                    wrkMastSta.setWrkSts(1);
                    wrkMastStaMapper.updateById(wrkMastSta);
                    log.error("更新小车任务成功{}",wrkMastSta);
                    log.info("更新小车任务成功{}",wrkMastSta);
                }catch (Exception e){
                    log.error("更新小车任务失败");
                }
                break;  // 新增：下发成功后退出循环，防止连续下发多个
            } else {
                log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo());
            }

 src/main/java/com/zy/core/thread/MelsecCrnThread.java

@@ -194,7 +194,7 @@

                // 复位信号
                if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
                    News.error("MelsecCrn"+" - 3"+" ---------第一步、[堆垛机号：{}][工作号：{}]==>> 状态为90，等待确认！！",slave.getId(),crnProtocol.getTaskNo());
                    News.info("MelsecCrn"+" - 3"+" ---------第一步、[堆垛机号：{}][工作号：{}]==>> 状态为90，等待确认！！",slave.getId(),crnProtocol.getTaskNo());
                    if (resetFlag) {
                        if(crnProtocol.getTaskNo()==9999){
                            backHpFlag = false;

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -262,7 +262,7 @@

                // 复位信号
                if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
                    News.error("---第一步、[堆垛机号：{}, 工作号：{}, 载货台信号:{}]==>> 状态为10，等待确认！！",
                    News.info("---第一步、[堆垛机号：{}, 工作号：{}, 载货台信号:{}]==>> 状态为10，等待确认！！",
                            slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "有物" : "无物");
                    if (resetFlag) {
                        if(crnProtocol.getTaskNo()==9999){

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -966,7 +966,7 @@
                }
            }
            if(write.IsSuccess && write1.IsSuccess){
                log.error("写入输送线命令成功。输送线plc编号={}，站点数据={},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                log.info("写入输送线命令成功。输送线plc编号={}，站点数据={},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                break;
            }
            else {