From f6decf71aa936d019a7732970744c6c33f5e6175 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 12 十月 2022 16:07:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 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 fbbc607..ac67afc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2022,7 +2022,7 @@
case 11://鍏ュ簱鍓嶅垽鏂厖鐢电嚎鏄惁鏀惧ソ
olsStatus = 99;
newStatus = 0;
- newSingle = 11;//涓嶅彉
+ newSingle = 11;//
break;
case 12://鍏呯數绾挎斁濂�
olsStatus = 99;
@@ -2123,27 +2123,19 @@
locMast.setLocSts("O");
locMastService.update(locMast,new EntityWrapper<LocMast>()
.eq("channel",(i+1)));
- //澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
- StaProtocol staProtocol = new StaProtocol();
- staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧�
- staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,12==>0
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
- if(!result){
+ }
+ //澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
+ StaProtocol staProtocol = new StaProtocol();
+ staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧�
+ staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,12==>0
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
+ if(!result){
// log.error("鏇存柊搴撲綅绱ф�ュ嚭搴撲俊鍙峰け璐�===>>[channel:{},locNo:{},barcode:{}]", i+1, locMast.getLocNo(), locMast.getBarcode());
// throw new CoolException("鏇存柊娴嬭瘯淇″彿澶辫触===>>" + i);
- } else {
- devpThread.startSignal[i] = newSingle;
- }
+ } else {
+ devpThread.startSignal[i] = newSingle;
}
}else { }
- TestMast testMast0101804 = testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("loc_no","0101804"));//鏌ユ壘鍘熸潵鐨勭姸鎬�
- if (!Cools.isEmpty(testMast0101804)){
- if (testMast0101804.getChannel()>10240){
-
- }
- }
-
}
}
--
Gitblit v1.9.1