123
TQS
2025-05-19 3627a299de58a080a2bd782b23c50f3f76913b41
123
2个文件已修改
19 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/enums/SteTaskModeType.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -261,7 +261,7 @@
                                String errorMsg = barcode + "托盘识别异常,请先进行组托!";
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                            }
                        } else if (redata.toString().contains("物料类型和实际种类不一致")) {
                        } else if (redata.toString().contains("物料类型和实际种类不一致")||redata.toString().contains("混放物料类型不一致")) {
                            staProtocol.setWorkNo((short) 9995);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -269,7 +269,18 @@
                            // led 异常显示
                            if (ledThread != null) {
                                String errorMsg = barcode + "物料类型和实际种类不一致!";
                                String errorMsg = barcode + redata.toString();
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                            }
                        }else if (redata.toString().startsWith("800")){
                            staProtocol.setWorkNo((short) 9995);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            // led 异常显示
                            if (ledThread != null) {
                                String errorMsg = barcode + "库位不足";
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                            }
                        } else if ((code == 500 || code == 1000)) {
src/main/java/com/zy/core/enums/SteTaskModeType.java
@@ -244,7 +244,7 @@
            case 21:
                return SteTaskModeType.WAITING_LEFT;
            default:
                News.info("穿梭车pai4定位失败, 穿梭车号={}");
                News.error("穿梭车pai4定位失败, 穿梭车号={}");
                throw new CoolException("解析穿梭车原点定位失败");
        }
    }
@@ -275,7 +275,7 @@
            case 21:
                return SteTaskModeType.CHARGE_RIGHT;
            default:
                News.info("穿梭车pai5定位失败, 穿梭车号={}");
                News.error("穿梭车pai5定位失败, 穿梭车号={}");
                throw new CoolException("解析穿梭车原点定位失败");
        }
    }