From 6cdbb7c1b75a897d5917d36fcde5de8fd94863e3 Mon Sep 17 00:00:00 2001 From: lsh <lsh123456> Date: 星期日, 08 一月 2023 21:12:50 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/model/MatDto.java | 23 ++++++++++- src/main/java/com/zy/core/thread/LedThread.java | 2 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 65 ++++++++++++++++++-------------- 3 files changed, 59 insertions(+), 31 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 d280b4d..1abe6ed 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -119,7 +119,7 @@ log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode); if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) { if (inSta.getStaNo()==101 || inSta.getStaNo()==109 || inSta.getStaNo()==117){ - staProtocol.setWorkNo((short)9999); + staProtocol.setWorkNo((short)9998); staProtocol.setStaNo((short)100); devpThread.setPakMk(staProtocol.getSiteId(), false); boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); @@ -127,7 +127,7 @@ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触"); } }else if (inSta.getStaNo()==201 || inSta.getStaNo()==207 || inSta.getStaNo()==213){ - staProtocol.setWorkNo((short)9999); + staProtocol.setWorkNo((short)9998); if (inSta.getStaNo()==201){ staProtocol.setStaNo((short)200); }else if (inSta.getStaNo()==207){ @@ -143,7 +143,32 @@ } continue; } - } else { + } else if (staProtocol.getWorkNo()==9999 && staProtocol.isLoading() && !staProtocol.isEmptyMk()){ + if (inSta.getStaNo()==101 || inSta.getStaNo()==109 || inSta.getStaNo()==117){ + staProtocol.setWorkNo((short)9998); + staProtocol.setStaNo((short)100); + devpThread.setPakMk(staProtocol.getSiteId(), false); + boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); + if (!result) { + throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触"); + } + }else if (inSta.getStaNo()==201 || inSta.getStaNo()==207 || inSta.getStaNo()==213){ + staProtocol.setWorkNo((short)9998); + if (inSta.getStaNo()==201){ + staProtocol.setStaNo((short)200); + }else if (inSta.getStaNo()==207){ + staProtocol.setStaNo((short)206); + }else if (inSta.getStaNo()==213){ + staProtocol.setStaNo((short)212); + } + devpThread.setPakMk(staProtocol.getSiteId(), false); + boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); + if (!result) { + throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触"); + } + } + continue; + }else { continue; } @@ -265,6 +290,8 @@ if (!result) { throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触"); } + + } } @@ -1502,20 +1529,11 @@ } // 鍛戒护涓嬪彂 ------------------------------------------------------------------------------- if (!commands.isEmpty()) { - if (led.getId() == 7) { - if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) { - log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort()); - continue; - } else { - ledThread.setLedMk(false); - } + if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) { + log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort()); + continue; } else { - if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) { - log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort()); - continue; - } else { - ledThread.setLedMk(false); - } + ledThread.setLedMk(false); } } @@ -1592,20 +1610,11 @@ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId()); // led鏄剧ず榛樿鍐呭 if (reset && !ledThread.isLedMk()) { - if (led.getId() == 7) { - ledThread.setLedMk(true); - if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()))) { - log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort()); - } else { - - } + ledThread.setLedMk(true); + if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()))) { + log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort()); } else { - ledThread.setLedMk(true); - if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) { - log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort()); - } else { - } } } } diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java index e5b625b..14a2afd 100644 --- a/src/main/java/com/zy/common/model/MatDto.java +++ b/src/main/java/com/zy/common/model/MatDto.java @@ -9,20 +9,39 @@ public class MatDto { // 鐗╂枡缂栧彿 - private String matNo; + private String matnr; // 鐗╂枡鍚嶇О private String maknx; + // 搴撲綅瑙勬牸 + private String specs; + // 鐗╂枡鏁伴噺 private Double count; + + // 搴撲綅鏁伴噺 + private Double total; public MatDto() { } public MatDto(String matNo, String maknx, Double count) { - this.matNo = matNo; + this.matnr = matNo; this.maknx = maknx; this.count = count; } + public MatDto(String matNo, String maknx, Double count,String specs) { + this.specs = specs; + this.matnr = matNo; + this.maknx = maknx; + this.count = count; + } + public MatDto(String matNo, String maknx, Double count,Double total,String specs) { + this.specs = specs; + this.matnr = matNo; + this.maknx = maknx; + this.count = count; + this.total = total; + } } diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java index e5bd239..4500737 100644 --- a/src/main/java/com/zy/core/thread/LedThread.java +++ b/src/main/java/com/zy/core/thread/LedThread.java @@ -212,7 +212,7 @@ sb.append("鐩爣绔欙細").append(command.getStaNo()).append("\n"); if (!command.isEmptyMk()) { for (MatDto matDto : command.getMatDtos()) { - sb.append("鐗╂枡缂栫爜锛�").append(matDto.getMatNo()).append("\n"); + sb.append("鐗╂枡缂栫爜锛�").append(matDto.getMatnr()).append("\n"); sb.append("鏁伴噺锛�").append(matDto.getCount()).append("\n"); } } -- Gitblit v1.9.1