chen.llin
2026-01-01 03a70a1bf1f830b30c71b882d3806b4c21838719
src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -159,7 +159,7 @@
                    back = true;
                }
                // 退回
                if (back && (staProtocol.getWorkNo() == 9999 || staProtocol.getWorkNo() == 9998)  && staProtocol.isInEnable() && staProtocol.isLoading() && staProtocol.isPakMk()) {
                if (back   && staProtocol.isInEnable() && staProtocol.isLoading() && staProtocol.isPakMk()) {
                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
                    staProtocol.setWorkNo(wrkNo);
                    wrkNo++;
@@ -172,11 +172,12 @@
                }
                // 判断是否满足入库条件
                if (staProtocol.isAutoing()
                        && staProtocol.isLoading()
                        && staProtocol.isInEnable()
                        && !staProtocol.isEmptyMk()
                        && staProtocol.isPakMk() && staProtocol.getWorkNo() == 9999) {
                if (staProtocol.isAutoing() //自动
                        && staProtocol.isLoading() //有物
                        && staProtocol.isInEnable() //可入
                        && !staProtocol.isEmptyMk() // 非空板
                        && staProtocol.isPakMk() //防止重复下发信号 站点无物 无任务号会自动变成true
                ) {
                    if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
                        News.info("{}条码扫描错误:{}",barcodeThread.getSlave().getId(),barcode);
                        continue;
@@ -1047,12 +1048,12 @@
                }
                // 站点条件判断
                if (staProtocol.isAutoing()
                        && staProtocol.isLoading()
                        && staProtocol.isInEnable()
                        && staProtocol.isEmptyMk()
                        && staProtocol.isPakMk()
                        && staProtocol.getWorkNo() == 9998 // 9997 回退 9998 空 9999 满
                if (staProtocol.isAutoing()  //自动
                        && staProtocol.isLoading() //有物
                        && staProtocol.isInEnable() //可入
                        && staProtocol.isEmptyMk()// 空板
                        && staProtocol.isPakMk() //防止重复下发信号 站点无物 无任务号会自动变成true
                        ) {
                    News.warnNoLog(""+mark+" - 0"+" - 开始执行:空栈板初始化入库,叉车入库站放货");