#

lty

2025-12-29 1bc0ec629b23e000be7817c0b9434aacddb3ed45

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

@@ -661,7 +661,7 @@
                        else if (staProtocol.isBarcodeErr()) { errMsg = "扫码失败"; back = true; }

                        // 尺寸异常回退
                        if (back && staProtocol.getWorkNo() <9999) {
                        if (back && staProtocol.getWorkNo() == 9998) {
//                            log.info("errmsg: " + errMsg);
                            MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));

@@ -1374,7 +1374,7 @@
    public synchronized void crnRebackHp(CrnProtocol crnProtocol, CrnThread crnThread,String staNo) {
        if(staNo == null){
            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
                if (crnProtocol.getBay() == 121 || crnProtocol.getBay() == 1) {
                if (crnProtocol.getBay() == 121 ) {
                    return;
                }
                int x=1;
@@ -1396,9 +1396,9 @@
                }

                //输送线没有入库任务，过滤2
                if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) != null) {
                    return;
                }
//                if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) != null) {
//                    return;
//                }
                News.info("堆垛机召回原点==>>" + crnProtocol.getCrnNo() + "号堆垛机有入库任务,召回原点");
                // 命令下发区 --------------------------------------------------------------------------
                CrnCommand crnCommand = new CrnCommand();