From 3ad49e3f281d52edd7f121a398b93b408251811d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 02 八月 2023 15:17:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 857b0aa..fc57a64 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -241,6 +241,22 @@
String errorMsg = barcode + "鎵樼洏璇嗗埆寮傚父锛岃鍏堣繘琛岀粍鎵橈紒";
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
}
+ } else if (code == 1000){
+ if (inSta.getStaNo().equals(103)){
+ staProtocol.setWorkNo((short)9999);
+ staProtocol.setStaNo((short)203);
+ }else {
+ staProtocol.setWorkNo((short)9999);
+ staProtocol.setStaNo((short)103);
+ }
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+
+ // led 寮傚父鏄剧ず
+ if (ledThread != null) {
+ String errorMsg = barcode + "闇�瑕佹崲鍏ュ簱绔欍�傜洰鏍囩珯锛�"+staProtocol.getStaNo();
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+ }
}
} catch (Exception e) {
e.printStackTrace();
@@ -958,10 +974,16 @@
continue;
}
- // 鍏ュ簱娣卞簱浣嶆槸鍚︽湁闈濬銆丏銆乆搴撲綅杩涜鏍￠獙
+ // 鍏ュ簱娣卞簱浣嶆槸鍚︽湁闈濬銆丏銆乆搴撲綅杩涜鏍￠獙 锛� Q銆丳銆丷銆丼锛�
if (wrkMastMapper.selectShallowLoc(Integer.parseInt(wrkMast.getLocNo().substring(0, 2)),Integer.parseInt(wrkMast.getLocNo().substring(2, 5)),Integer.parseInt(wrkMast.getLocNo().substring(5, 7)))!=null){
- continue;
+ //妫�鏌ュ叆搴撳簱浣嶆槸鍚︽槸鍦ㄥ爢鍨涙満杈瑰簱浣�
+ ArrayList<Integer> outLoc = new ArrayList<>();
+ outLoc.add(3);outLoc.add(4);outLoc.add(11);outLoc.add(12);outLoc.add(18);outLoc.add(19);
+ if (!outLoc.contains(Integer.parseInt(wrkMast.getLocNo().substring(0, 2)))) {
+ continue;
+ }
}
+
//鍔犲己鍒ゆ柇锛屽彧瑕佸瓨鍦ㄧЩ搴撲换鍔★紝璇存槑鍑哄簱浠诲姟鏈畬鍏ㄧ粨鏉燂紝涓嶆墽琛屽叆搴撲换鍔�
WrkMast one = wrkMastMapper.selectLocMoveData(slave.getId());
@@ -1347,9 +1369,7 @@
}else {
waitWrkMast.setIoPri(9999d);
}
- if(wrkMast.getIoPri()>=9000.0){
- wrkMast.setIoPri(9999d);
- }else if (wrkMast.getIoPri()>20.0){
+ if (wrkMast.getIoPri()>23.0){
wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
}else {
wrkMast.setIoPri(13.0d);
--
Gitblit v1.9.1