From b54415eece727c45a9755a4355df90c69aa17434 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 07 十月 2022 16:02:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 d6642a7..8848ddb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2042,7 +2042,7 @@
} else {
devpThread.startSignal[i] = newSingle;
}
- }else if (testMast == null && devpThread.startSignal[i] == 5){
+ }else if (devpThread.startSignal[i] == 5){
SearchLocParam param = new SearchLocParam();
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
@@ -2058,7 +2058,7 @@
staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,5==>6
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
if(!result){
- log.error("鏇存柊娴嬭瘯淇″彿澶辫触===>>[channel:{},locNo:{},barcode:{}]", i+1, testMast.getLocNo(), testMast.getBarcode());
+ log.error("鏆傚仠娴嬭瘯澶辫触===>>["+i+1+"]鍙烽�氶亾");
// throw new CoolException("鏇存柊娴嬭瘯淇″彿澶辫触===>>" + i);
} else {
devpThread.startSignal[i] = newSingle;
@@ -2066,7 +2066,7 @@
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/mobile/test/suspend/auth", JSON.toJSONString(param), response);
}
- }else if (testMast == null && devpThread.startSignal[i] == 7){
+ }else if (devpThread.startSignal[i] == 7){
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("channel",(i+1)));
if (locMast.getLocSts().equals("F")){
@@ -2085,7 +2085,7 @@
} else {
devpThread.startSignal[i] = newSingle;
}
- }else if (testMast == null && devpThread.startSignal[i] == 8){
+ }else if (devpThread.startSignal[i] == 8){
}
--
Gitblit v1.9.1