From 7d25794f31a059ea2bdbf0548c294ea2d671d1f4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 三月 2024 14:36:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 6 +++---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 ++++-
2 files changed, 7 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 6b12b1a..f3fc389 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -270,6 +270,7 @@
if (staNoCrnNo==0){
basDevp.setStaErr(1);
basDevpService.updateById(basDevp);
+ log.error("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
throw new CoolException("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
}else {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
@@ -278,6 +279,7 @@
if (Cools.isEmpty(locMast)){
basDevp.setStaErr(1);
basDevpService.updateById(basDevp);
+ log.error("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
throw new CoolException("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
}
}
@@ -285,6 +287,7 @@
// log.error("鎵爜妫�娴嬬▼搴忓紓甯�"+inSta.getStaNo()+"寮傚父淇℃伅"+e);
// 閫�鍥�
log.error("鎵爜妫�娴嬬▼搴忓紓甯�"+inSta.getStaNo()+errMsg);
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�,寮傚父淇℃伅"+e);
staProtocol.setWorkNo((short)9999);
staProtocol.setStaNo(inSta.getStaNo().shortValue());
@@ -327,7 +330,7 @@
);
}catch (Exception e){
log.error("wcs娲惧彂搴撲綅涓嶄负绌轰笂鎶ms", getWmsDto.getWrkNo());
- throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+ throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触锛屽紓甯镐俊鎭細"+e);
}
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index ec9687f..441ebcc 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -409,9 +409,9 @@
one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
// one.setSourceStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
// one.setDestinationStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
- if (!crnCommand.getTaskNo().equals(one.getTaskNo()) && !crnCommand.getAckFinish().equals(one.getAckFinish())
- && !crnCommand.getSourcePosZ().equals(one.getSourcePosZ()) && !crnCommand.getSourcePosX().equals(one.getSourcePosX()) && !crnCommand.getSourcePosY().equals(one.getSourcePosY())
- && !crnCommand.getDestinationPosZ().equals(one.getDestinationPosZ()) && !crnCommand.getDestinationPosX().equals(one.getDestinationPosX()) && !crnCommand.getDestinationPosY().equals(one.getDestinationPosY())
+ if (!crnCommand.getTaskNo().equals(one.getTaskNo()) || !crnCommand.getAckFinish().equals(one.getAckFinish())
+ || !crnCommand.getSourcePosZ().equals(one.getSourcePosZ()) || !crnCommand.getSourcePosX().equals(one.getSourcePosX()) || !crnCommand.getSourcePosY().equals(one.getSourcePosY())
+ || !crnCommand.getDestinationPosZ().equals(one.getDestinationPosZ()) || !crnCommand.getDestinationPosX().equals(one.getDestinationPosX()) || !crnCommand.getDestinationPosY().equals(one.getDestinationPosY())
){
log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
log.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(crnCommand));
--
Gitblit v1.9.1