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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 1db045e..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, // 婧愮珯
@@ -2331,7 +2331,7 @@
log.error("浠诲姟鐢熸垚澶辫触===銆嬪紓甯镐俊鎭細{}", e.getMessage());
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "鎸囦护鐢熸垚澶辫触锛氬紓甯镐俊鎭�"+e.getMessage());
+ deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "鎸囦护鐢熸垚澶辫触");
} catch (Exception e2){
}
}
@@ -2435,7 +2435,7 @@
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "浠诲姟鐢熸垚澶辫触issued1锛氬紓甯镐俊鎭�"+e.getMessage());
+ deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "浠诲姟鐢熸垚澶辫触issued1");
} catch (Exception e2){
}
return false;
@@ -2459,7 +2459,7 @@
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "绔欑偣浠诲姟鐢熸垚澶辫触issued2锛氬紓甯镐俊鎭�"+e.getMessage());
+ deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "绔欑偣浠诲姟鐢熸垚澶辫触issued2");
} catch (Exception e2){
}
}
--
Gitblit v1.9.1