pang.jiabao
2025-01-18 b81e1e540200a1495507cb7e4fe0d020fee75e59
src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -689,6 +689,7 @@
                        if (wrkMast.getSourceStaNo() == 106 && wrkMast.getWrkSts() == 12L) {
                            wrkMast.setWrkSts(16L);
                            wrkMast.setCrnNo(1);
                            wrkMast.setIoPri(14D); // 优先级提升
                            if (wrkMast.getStaNo() == 107) {
                                wrkMast.setSourceStaNo(107);
                            } else if(wrkMast.getStaNo()==104) {
@@ -697,11 +698,7 @@
                            staProtocol.setStaNo((short) 106);
                            log.info("----------106移库标识---------");
                        }else if(wrkMast.getSourceStaNo() == 105 && wrkMast.getWrkSts() == 16L) {
                            staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                            log.info("106移库完成,输送线发送105到104,源站为:" + staProtocol.getSiteId());
                            wrkMast.setWrkSts(14L);
                        }else {
                        } else {
                            staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                            wrkMast.setWrkSts(14L);
                        }
@@ -3095,11 +3092,11 @@
        crnCommand.setTraySize(true);     //库位类型
        if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(2, crnCommand))) {
            News.error("106移库1号堆垛机命令下发失败,堆垛机号={},任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
        } else {
            wrkMast.setWrkSts(12L);
            wrkMastMapper.updateById(wrkMast);
            log.info("1号堆垛机转运106推送到命令队列成功");
        }
//        else {
//            wrkMast.setCrnNo(2);
//            wrkMastMapper.updateById(wrkMast);
//        }
        News.infoNoLog("106移库给1号堆垛机下发完成");
    }