From 3627a299de58a080a2bd782b23c50f3f76913b41 Mon Sep 17 00:00:00 2001 From: TQS <56479841@qq.com> Date: 星期一, 19 五月 2025 15:29:43 +0800 Subject: [PATCH] 123 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 +++++++++++++-- src/main/java/com/zy/core/enums/SteTaskModeType.java | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index eb9aeec..aa42ba3 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/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)) { diff --git a/src/main/java/com/zy/core/enums/SteTaskModeType.java b/src/main/java/com/zy/core/enums/SteTaskModeType.java index 29c6158..260a683 100644 --- a/src/main/java/com/zy/core/enums/SteTaskModeType.java +++ b/src/main/java/com/zy/core/enums/SteTaskModeType.java @@ -244,7 +244,7 @@ case 21: return SteTaskModeType.WAITING_LEFT; default: - News.info("绌挎杞ai4瀹氫綅澶辫触, 绌挎杞﹀彿={}"); + News.error("绌挎杞ai4瀹氫綅澶辫触, 绌挎杞﹀彿={}"); throw new CoolException("瑙f瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�"); } } @@ -275,7 +275,7 @@ case 21: return SteTaskModeType.CHARGE_RIGHT; default: - News.info("绌挎杞ai5瀹氫綅澶辫触, 绌挎杞﹀彿={}"); + News.error("绌挎杞ai5瀹氫綅澶辫触, 绌挎杞﹀彿={}"); throw new CoolException("瑙f瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�"); } } -- Gitblit v1.9.1