#

lty

2025-12-29 1bc0ec629b23e000be7817c0b9434aacddb3ed45

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

@@ -561,8 +561,6 @@

    public synchronized void generateStoreWrkFile(Integer mark) {
        String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
        final Set<String> INVALID_BARCODES = new HashSet<>(Arrays.asList("NG", "NoRead", "00000000"));

        for (DevpSlave devp : slaveProperties.getDevp()) {
            for (DevpSlave.Sta inSta : devp.getInSta()) {

@@ -647,7 +645,6 @@
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        }

                        continue;
                    } else {
                        // 尺寸/重量/扫码异常检测
                        if (staProtocol == null) continue;
@@ -664,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));

@@ -674,7 +671,6 @@
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.error("输送线下发1：" + wrkNo + "," + inSta.getBackSta());
                            continue;
                        }

//                        // 入库条件满足，开始请求入库地址
@@ -1378,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;
@@ -1400,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();