From 5aa831dffdfb0ca524362e8d649c28babc681ece Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期一, 30 六月 2025 16:43:18 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 2884f0d..fdcb0d3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1452,8 +1452,8 @@
null, // 缁撴潫鏃堕棿
taskWrk.getWrkSts().longValue(), // 宸ヤ綔鐘舵��
taskWrk.getIoType(), // 鍏ュ嚭搴撶被鍨�
- crn.getId(), // 鍫嗗灈鏈�
- null, // plc
+ taskWrk.getCrnNo(), // 宸烽亾鍙�
+ crn.getId(), // 鍫嗗灈鏈哄彿
taskWrk.getTargetPoint(), // 鐩爣搴撲綅
0, // 鐩爣绔�
0, // 婧愮珯
@@ -2008,6 +2008,11 @@
boolean itSmall = new TrackRangeUtils().IsItSmall(rgvSlave);
if (basDevpPositions.isEmpty()) {
log.error("鑾峰彇鎵�鏈夌珯鐐逛俊鎭紓甯�");
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "鎸囦护鐢熸垚锛氳幏鍙栨墍鏈夌珯鐐逛俊鎭紓甯�");
+ } catch (Exception e2){
+ }
continue;
}
List<TaskWrk> taskWrkList = new ArrayList<>();
@@ -2324,6 +2329,11 @@
}
} catch (Exception e) {
log.error("浠诲姟鐢熸垚澶辫触===銆嬪紓甯镐俊鎭細{}", e.getMessage());
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "鎸囦护鐢熸垚澶辫触");
+ } catch (Exception e2){
+ }
}
}
}
@@ -2423,6 +2433,11 @@
log.error("浠诲姟鐢熸垚澶辫触issued1===銆嬪紓甯镐俊鎭細{}", e.getMessage());
RgvErrCache.updateRgvErr(rgvSlave.getId(),rgvStn.getStaNo()+"绔欑偣浠诲姟鐢熸垚澶辫触issued1");
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "浠诲姟鐢熸垚澶辫触issued1");
+ } catch (Exception e2){
+ }
return false;
}
@@ -2441,6 +2456,12 @@
} catch (Exception e) {
log.error("浠诲姟鐢熸垚澶辫触issued2===銆嬪紓甯镐俊鎭細{}", e.getMessage());
RgvErrCache.updateRgvErr(rgvSlave.getId(),rgvStn.getStaNo()+"绔欑偣浠诲姟鐢熸垚澶辫触issued2");
+
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "绔欑偣浠诲姟鐢熸垚澶辫触issued2");
+ } catch (Exception e2){
+ }
}
return true;
}
--
Gitblit v1.9.1