From 3951add7a40f76bb403ead8c0acffb970d1bfa5c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 17:24:53 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index be09198..34ae595 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -111,7 +111,9 @@
break;
//宸ヤ綅1鍐欏叆鏁版嵁
case 2:
- write((RgvCommand) task.getData());
+ RgvCommand command2 = (RgvCommand) task.getData();
+ rgvOpt(command2);
+ write(command2);
break;
// 澶嶄綅
case 3:
@@ -125,25 +127,14 @@
command.setTaskMode1(RgvTaskModeType.NONE); // 浠诲姟妯″紡
command.setSourceStaNo1((short)0); // 婧愮珯
command.setDestinationStaNo1((short)0); // 鐩爣绔�
+ rgvOpt(command);
write3(command);
- break;
- // 澶嶄綅
- case 4:
- RgvCommand command4 = (RgvCommand) task.getData();
- if (null == command4) {
- command4 = new RgvCommand();
- }
- command4.setRgvNo(slave.getId()); // RGV缂栧彿
- command4.setTaskNo1((short) 0); // 宸ヤ綔鍙�
- command4.setAckFinish1((short) 1); // 浠诲姟瀹屾垚纭浣�
- command4.setTaskMode1(RgvTaskModeType.X_MOVE); // 浠诲姟妯″紡
- command4.setSourceStaNo1((short)0); // 婧愮珯
- command4.setDestinationStaNo1((short)0); // 鐩爣绔�
- write3(command4);
break;
// 婕父
case 5:
- write5((Long) task.getData());
+ Long aLong = (Long) task.getData();
+ rgvOpt(aLong);
+ write5(aLong);
break;
default:
break;
@@ -307,8 +298,7 @@
basRgvErrLogService.insert(basRgvErrLog);
}
} catch (Exception e){
- BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
-
+ log.error("RGV寮傚父淇℃伅淇濆瓨澶辫触锛侊紒");
}
} catch (Exception ignore) {
@@ -331,6 +321,24 @@
/**
* 宸ヤ綅1鍐欏叆鏁版嵁
*/
+ private void rgvOpt(RgvCommand command) {
+ try{
+ BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
+ BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol, command);
+ basRgvOptService.insert(basRgvOpt);
+ }catch (Exception e){
+ log.error("RGV鍐欏叆鍛戒护淇濆瓨澶辫触锛侊紒");
+ }
+ }
+ private void rgvOpt(Long command) {
+ try{
+ BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
+ BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol, command);
+ basRgvOptService.insert(basRgvOpt);
+ }catch (Exception e){
+ log.error("RGV鍐欏叆鍛戒护淇濆瓨澶辫触锛侊紒");
+ }
+ }
private boolean write(RgvCommand command) throws InterruptedException {
if (null == command) {
log.error("RGV鍐欏叆鍛戒护涓虹┖");
--
Gitblit v1.9.1