From 4da282d3a87fb648ae6865929f5862b27d05a562 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 03 七月 2025 15:07:25 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 39 +++++++++++++------
src/main/java/com/zy/asrs/controller/OpenController.java | 20 +++++-----
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 1
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 +-
4 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index b669db4..2085ded 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -346,7 +346,7 @@
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wms/taskCreate", 1, "wms浠诲姟涓嬪彂,浠诲姟鏁�:"+params.size());
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟", 1, "wms浠诲姟涓嬪彂,浠诲姟鏁�:"+params.size());
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -356,7 +356,7 @@
if (Cools.isEmpty(param)){
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "鍙傛暟涓虹┖,param:"+JSON.toJSONString(param));
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鍙傛暟涓虹┖,param:"+JSON.toJSONString(param));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -364,7 +364,7 @@
} else if (Cools.isEmpty(param.getTaskNo())){
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "浠诲姟鍙蜂负绌�,taskNo:"+JSON.toJSONString(param));
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "浠诲姟鍙蜂负绌�,taskNo:"+JSON.toJSONString(param));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -372,7 +372,7 @@
} else if (Cools.isEmpty(param.getIoType())){
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "浠诲姟绫诲瀷涓虹┖,ioType:"+JSON.toJSONString(param));
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "浠诲姟绫诲瀷涓虹┖,ioType:"+JSON.toJSONString(param));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -381,7 +381,7 @@
if (Cools.isEmpty(param.getStartPoint()) || Cools.isEmpty(param.getTargetPoint())){
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "鍒濆鐩爣鎴栬�呯洰鏍囦綅涓虹┖,Point:"+JSON.toJSONString(param));
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鍒濆鐩爣鎴栬�呯洰鏍囦綅涓虹┖,Point:"+JSON.toJSONString(param));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -413,7 +413,7 @@
if(Cools.isEmpty(locMast)){
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "鍒濆搴撲綅鏃犳硶鎵惧埌,locNo:"+JSON.toJSONString(locNo));
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鍒濆搴撲綅鏃犳硶鎵惧埌,locNo:"+JSON.toJSONString(locNo));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -431,7 +431,7 @@
if(Cools.isEmpty(staDesc)){
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "鍏ュ簱璺姴涓嶅瓨鍦�,param:"+JSON.toJSONString(param));
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鍏ュ簱璺姴涓嶅瓨鍦�,param:"+JSON.toJSONString(param));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -448,7 +448,7 @@
if(Cools.isEmpty(staDesc)){
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "鍑哄簱璺姴涓嶅瓨鍦�,param:"+JSON.toJSONString(param));
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鍑哄簱璺姴涓嶅瓨鍦�,param:"+JSON.toJSONString(param));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -460,7 +460,7 @@
if(Cools.isEmpty(locMast2)){
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "鐩爣搴撲綅鏃犳硶鎵惧埌,locNo:"+JSON.toJSONString(param.getTargetPoint()));
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鐩爣搴撲綅鏃犳硶鎵惧埌,locNo:"+JSON.toJSONString(param.getTargetPoint()));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -469,7 +469,7 @@
if (!locMast2.getCrnNo().equals(locMast.getCrnNo())){
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "璧峰搴撲綅涓庣洰鏍囧簱浣嶄笉鍐嶅悓涓�宸烽亾,param:"+JSON.toJSONString(param));
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "璧峰搴撲綅涓庣洰鏍囧簱浣嶄笉鍐嶅悓涓�宸烽亾,param:"+JSON.toJSONString(param));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
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 c58511a..7d2b90f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1998,7 +1998,6 @@
}
return null;
}
- return null;
}
return taskWrk;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 382854e..2fca288 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -68,7 +68,7 @@
if (taskWrk != null) {
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦,taskWrk:"+JSON.toJSONString(taskWrk));
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦,taskWrk:"+JSON.toJSONString(taskWrk));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -77,7 +77,7 @@
if (param.getIoType().equals(0)){
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "鐢熸垚浠诲姟澶辫触锛屼换鍔＄被鍨嬩笉瀛樺湪锛�,iotype:"+JSON.toJSONString(param.getIoType()));
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鐢熸垚浠诲姟澶辫触锛屼换鍔＄被鍨嬩笉瀛樺湪锛�,iotype:"+JSON.toJSONString(param.getIoType()));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
@@ -154,7 +154,7 @@
if (!taskWrkService.insert(taskWrk)) {
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("wmsErr", 1, "鍒涘缓浠诲姟澶辫触锛�,param:"+JSON.toJSONString(param));
+ deviceErrorService.addDeviceError("wms涓嬪彂浠诲姟寮傚父", 1, "鍒涘缓浠诲姟澶辫触锛�,param:"+JSON.toJSONString(param));
} catch (Exception e2){
// log.error("e2:"+e2.getMessage());
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 9ba8968..b6671ec 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -288,14 +288,14 @@
deviceErrorService.addDeviceError("crnWrite", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍫嗗灈鏈烘寚浠や笅鍙�:"+JSON.toJSONString(command.getNowTask()));
} catch (Exception e2){
}
- try{
- BasErrLogService basErrLogService = SpringUtils.getBean(BasErrLogService.class);
- BasErrLog basErrLog = new BasErrLog(command,"","浠诲姟涓嬪彂璁板綍");
- if (!basErrLogService.insert(basErrLog)) {
- log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", slave.getId(), "浠诲姟涓嬪彂璁板綍澶辫触");
- }
- } catch (Exception e3){
- }
+// try{
+// BasErrLogService basErrLogService = SpringUtils.getBean(BasErrLogService.class);
+// BasErrLog basErrLog = new BasErrLog(command,"","浠诲姟涓嬪彂璁板綍");
+// if (!basErrLogService.insert(basErrLog)) {
+// log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", slave.getId(), "浠诲姟涓嬪彂璁板綍澶辫触");
+// }
+// } catch (Exception e3){
+// }
// convertRow(command);
command.setCrnNo(slave.getId());
short[] array = new short[10];
@@ -308,7 +308,8 @@
array[6] = command.getDestinationPosX();
array[7] = command.getDestinationPosY();
array[8] = command.getDestinationPosZ();
- array[9] = command.getCommand();
+// array[9] = command.getCommand();
+ array[9] = (short)0;
OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
try{
Thread.sleep(50L);
@@ -322,11 +323,25 @@
try{
Thread.sleep(100L);
} catch (Exception e){}
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB101.0", (short) 4);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
if (resultRead.IsSuccess) {
CrnCommand one = new CrnCommand();
one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+ one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+ one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+ one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+ one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+ one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+ one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+ one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
if (!command.getTaskNo().equals(one.getTaskNo())
+ || !command.getTaskMode().equals(one.getTaskMode())
+ || !command.getSourcePosX().equals(one.getSourcePosX())
+ || !command.getSourcePosY().equals(one.getSourcePosY())
+ || !command.getSourcePosZ().equals(one.getSourcePosZ())
+ || !command.getDestinationPosX().equals(one.getDestinationPosX())
+ || !command.getDestinationPosY().equals(one.getDestinationPosY())
+ || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
){
i++;
CrnErrCache.updateCrnErr(slave.getId(), "鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�");
@@ -335,7 +350,7 @@
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("crnErr", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍐欏叆娆℃暟"+i+";鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�:"+JSON.toJSONString(command.getNowTask()));
+ deviceErrorService.addDeviceError("CrnErr", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍐欏叆娆℃暟"+i+";鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�:"+JSON.toJSONString(command.getNowTask()));
} catch (Exception e2){
}
try{
@@ -369,7 +384,7 @@
CrnErrCache.updateCrnErr(slave.getId(), "涓嬪彂DB100.18 鍥炶澶辫触");
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("crnErr", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍐欏叆娆℃暟"+signFinish+";涓嬪彂DB100.18 鍥炶澶辫触:"+JSON.toJSONString(command.getNowTask()));
+ deviceErrorService.addDeviceError("CrnErr", slave.getId(), "宸烽亾鍙�"+command.getLaneNo()+";鍐欏叆娆℃暟"+signFinish+";涓嬪彂DB100.18 鍥炶澶辫触:"+JSON.toJSONString(command.getNowTask()));
} catch (Exception e2){
}
try{
--
Gitblit v1.9.1