回退修改

pjb

2024-06-30 cd18df2ff664883dc2ded7b14d1d0f78b9c136a6

回退修改

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

@@ -212,8 +212,10 @@
                    if (wrkMast != null) {
                        News.warn(""+mark+" - 4"+" - 满托盘入库工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast.getWrkNo());
                        if (devp.getId() == 2) {
                            staProtocol.setWorkNo((short)9999);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
//                            staProtocol.setWorkNo((short)9999);
//                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                            staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            if (!result) {

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

@@ -189,6 +189,8 @@
            }
            // 复位信号
            if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING) && resetFlag) {
                News.error("-------------------------------------------第一步、[堆垛机号：{}, 工作号：{}, 载货台信号:{}]==>> 状态为10，等待确认！！",
                        slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "有物" : "无物");
                CrnCommand crnCommand = new CrnCommand();
                crnCommand.setAckFinish((short) 1);
                if (write(crnCommand)) {