From 132db34b1ae71bf985d306ab38b8db37fac2e1eb Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期六, 25 二月 2023 10:44:41 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/protocol/StaProtocol.java | 3 +++ src/main/java/com/zy/core/thread/BarcodeThread.java | 2 +- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18 ++++++++++++------ src/main/java/com/zy/core/thread/SiemensDevpThread.java | 3 ++- 4 files changed, 18 insertions(+), 8 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 f4a3778..6777879 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -111,25 +111,30 @@ //101绔欐湁3涓壂鐮佸櫒锛屽綋0鎵爜鍣ㄦ病鏈夋暟鎹椂锛岃幏鍙�9銆�10涓や釜鎵爜鍣ㄦ暟鎹� - if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) && Cools.isEmpty(barcode)){ + if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) && ( "NoRead".equals(barcode) || Cools.isEmpty(barcode) )){ BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode1()); if (barcodeThread1 != null) { barcode = barcodeThread1.getBarcode(); } - if(Cools.isEmpty(barcode)) { + if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) { BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2()); if (barcodeThread2 != null) { barcode = barcodeThread2.getBarcode(); + } } +// if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) { +// barcode = ""; +// continue; +// } } - if (!Cools.isEmpty(barcode)) { + if (!Cools.isEmpty(barcode) && !"NoRead".equals(barcode)) { log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode); - if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) { - continue; - } +// if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) { +// continue; +// } } else { continue; } @@ -210,6 +215,7 @@ param.setIoType(1); param.setSourceStaNo(inSta.getStaNo()); param.setLocType1(locTypeDto.getLocType1()); +// param.setFull(staProtocol.isFull()); String response = new HttpHandler.Builder() .setUri(wmsUrl) .setPath("/rpc/pakin/loc/v1") diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java index ca3c6db..d2c4888 100644 --- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java @@ -55,6 +55,9 @@ // 闅斿绔欑偣锛堝彴杞︿綅缃級 private String nearbySta; + // 鎵樼洏鏄彲鍚︽暣鍨� + private boolean full; + public BasDevp toSqlModel(){ BasDevp basDevp = new BasDevp(); basDevp.setDevNo(siteId); diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java index 45bb3cf..d0b775e 100644 --- a/src/main/java/com/zy/core/thread/BarcodeThread.java +++ b/src/main/java/com/zy/core/thread/BarcodeThread.java @@ -65,7 +65,7 @@ connect(); while (true) { try { - byte[] read = read(8, 200); + byte[] read = read(16, 200); if (null != read) { String s = new String(read); if (!Cools.isEmpty(s)) { diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index 3f903d7..1757937 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -185,7 +185,7 @@ if (result1.IsSuccess) { for (int i = 0; i < staNoSize; i++) { Integer siteId = staNos.get(i); // 绔欑偣缂栧彿 - boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1); + boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 2); StaProtocol staProtocol = station.get(siteId); staProtocol.setAutoing(status[0]); // 鑷姩 staProtocol.setLoading(status[1]); // 鏈夌墿 @@ -195,6 +195,7 @@ staProtocol.setFullPlt(status[5]); // 婊℃墭鐩� staProtocol.setHigh(status[6]); // 楂樺簱浣� 鎹蜂赴澶ф墭鐩� staProtocol.setLow(status[7]); // 浣庡簱浣� 鎹蜂赴灏忔墭鐩� + staProtocol.setFull(status[8]); // 鎵樼洏鏄彲鍚︽暣鍨� if (!staProtocol.isPakMk() && !staProtocol.isLoading()) { staProtocol.setPakMk(true); -- Gitblit v1.9.1