From f24682c98c90aa275890e1f90623e42f314d0a6b Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 06 十月 2022 19:51:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 37d31cf..65f809c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2013,7 +2013,8 @@
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("channel",(i+1)).eq("status",olsStatus));//鏌ユ壘鍘熸潵鐨勭姸鎬�
- if(null != testMast && devpThread.startSignal[i] == 1){
+ if(null != testMast &&
+ (devpThread.startSignal[i] == 1 || devpThread.startSignal[i] == 3 || devpThread.startSignal[i] == 5)){
testMast.setStatus(newStatus);
testMast.setModiTime(new Date());
if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
@@ -2023,10 +2024,11 @@
//澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
StaProtocol staProtocol = new StaProtocol();
staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧�
- staProtocol.setStaNo((short)newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,浠�1鏀逛负2
+ staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,1==>2鎴�3==>0,5==>6
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
if(!result){
- throw new CoolException("鏇存柊娴嬭瘯淇″彿澶辫触===>>" + i);
+ log.error("鏇存柊娴嬭瘯淇″彿澶辫触===>>[channel:{},locNo:{},barcode:{}]", i, testMast.getLocNo(), testMast.getBarcode());
+// throw new CoolException("鏇存柊娴嬭瘯淇″彿澶辫触===>>" + i);
} else {
devpThread.startSignal[i] = newSingle;
}
--
Gitblit v1.9.1