From f61319d07fd7eadf59b4fc2d185ec49c24d40d8e Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期六, 08 十月 2022 11:16:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 8cad990..7672a11 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -103,7 +103,7 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
for (DevpSlave.Sta inSta : devp.getInSta()) {
-// inSta.setStaNo(102);
+ inSta.setStaNo(102);
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
if (barcodeThread == null) {
@@ -167,7 +167,7 @@
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
-// locTypeDto.setLocType1((short)1);
+ locTypeDto.setLocType1((short)1);
SearchLocParam param = new SearchLocParam();
param.setBarcode(barcode);
param.setIoType(1);
@@ -2017,7 +2017,7 @@
case 8://瑙ｉ櫎鏆傚仠
olsStatus = 99;
newStatus = 0;
- newSingle = 0;//娴嬭瘯澶嶆牳锛屽瘎瀛樺櫒鍦板潃锛�6===>>0
+ newSingle = 0;//娴嬭瘯澶嶆牳锛屽瘎瀛樺櫒鍦板潃锛�8===>>0
break;
}
@@ -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