From cb13be5359f1a275a094053ec80b20649a8a26e8 Mon Sep 17 00:00:00 2001 From: 1 <1@123> Date: 星期四, 15 五月 2025 14:00:58 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/protocol/StaProtocol.java | 4 ++-- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18 ++++++++++++++---- src/main/java/com/zy/core/thread/SiemensDevpThread.java | 27 +++++++++++++++++++++++++-- src/main/resources/application.yml | 4 ++-- 4 files changed, 43 insertions(+), 10 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 90d7515..dbcc00a 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -115,17 +115,24 @@ // 鑾峰彇鍏ュ簱绔欎俊鎭� DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId()); StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo()); - if (staProtocol == null) { + if (staProtocol == null || !staProtocol.isLoading()) { continue; } else { staProtocol = staProtocol.clone(); } Integer workNo = staProtocol.getWorkNo(); + if (workNo!=9998){ + continue; + } Integer stano = staProtocol.getStaNo(); // 灏哄妫�娴嬪紓甯� boolean back = false; String errMsg = ""; + if (staProtocol.getGrossWt()>=600){ + errMsg = "瓒呴噸"; + back = true; + } if (staProtocol.isFrontErr()) { errMsg = "鍓嶈秴闄�"; back = true; @@ -181,7 +188,7 @@ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() - && !staProtocol.isEmptyMk() && (workNo == 0 || (workNo>9000 && workNo<10000)) + && workNo == 9998 && staProtocol.isPakMk() && staProtocol.isPakMkWalk() ) { @@ -306,12 +313,15 @@ // 鑾峰彇鍏ュ簱绔欎俊鎭� DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId()); StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo()); - if (staProtocol == null) { + if (staProtocol == null || !staProtocol.isLoading()) { continue; } else { staProtocol = staProtocol.clone(); } Integer workNo = staProtocol.getWorkNo(); + if (workNo!=9997){ + continue; + } Integer stano = staProtocol.getStaNo(); // 灏哄妫�娴嬪紓甯� @@ -368,7 +378,7 @@ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢 if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() - && staProtocol.isEmptyMk() && (workNo == 0 || (workNo>9000 && workNo<10000)) + && (workNo == 9997) && staProtocol.isPakMk() && staProtocol.isPakMkWalk() ) { 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 1d39655..9dee92a 100644 --- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java @@ -75,7 +75,7 @@ private boolean rightErr; // 瓒呴噸 - private boolean weightErr; + private boolean weightErr = false; // 鎵爜澶辫触 private boolean barcodeErr; @@ -85,7 +85,7 @@ //鎸囦护ID private Integer commandId; - private Double grossWt; + private Double grossWt = 0D; public BasDevp toSqlModel(){ BasDevp basDevp = new BasDevp(); diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index 7a88f83..fdf1b1c 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -213,10 +213,10 @@ //鏉$爜 Thread.sleep(200); - OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840.0",(short) (barcodeSize*8)); + OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB400.100.0",(short) (barcodeSize*8)); if (result2.IsSuccess) { for (int i = 0; i < barcodeSize; i++) { - String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8"); + String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8"); BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1); if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) { barcodeThread.setBarcode(barcode); @@ -224,6 +224,29 @@ } } + //鏉$爜 + Thread.sleep(200); + int[] staW = new int[]{1004,1014,1020}; + + OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB400.148.0",(short) (staW.length*4)); + if (result3.IsSuccess) { + for (int i = 0; i < staW.length; i++) { + Integer siteId = staW[i]; // 绔欑偣缂栧彿 + StaProtocol staProtocol = station.get(siteId); + if (null == staProtocol) { + staProtocol = new StaProtocol(); + station.put(siteId, staProtocol); + } + staProtocol.setSiteId(siteId); + boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4 + 2, 2); + staProtocol.setFrontErr(status[0]); // 鍓嶈秴闄� + staProtocol.setBackErr(status[1]); // 鍚庤秴闄� + staProtocol.setHighErr(status[2]); // 楂樿秴闄� + staProtocol.setLeftErr(status[3]); // 宸﹁秴闄� + staProtocol.setRightErr(status[4]); // 鍙宠秴闄� + } + } + if (result.IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId())); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d75b905..effc2cf 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -67,10 +67,10 @@ #url: 10.32.53.195:8080 # WMS绯荤粺ip # url: 10.210.157.109:8090 - url: 27.172.2.132:9027 + url: 27.172.2.135:9027 # 鍏ュ簱浠诲姟鐢宠鎺ュ彛 #inboundTaskApplyPath: api/InterFace/inboundTaskApply - inboundTaskApplyPath: api/external/wcs/taskCancel + inboundTaskApplyPath: api/external/wcs/inboundTaskApply # inboundTaskApplyPath: open/asrs/inboundTaskApply # 浠诲姟鐘舵�佸弽棣堟帴鍙� taskStatusFeedbackPath: api/external/wcs/taskStatusFeedback -- Gitblit v1.9.1