From 8e01a40be0a7ba61ece12870332b35a1fa3bfcd5 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 02 一月 2026 10:26:41 +0800
Subject: [PATCH] 1.新增agv状态请求离开 2.修复无法自动生成移库任务
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 92 +++++++++++++++++-----------------------------
1 files changed, 34 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 654042f..cc31d77 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -10,8 +10,10 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.DeviceDataLog;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.DeviceDataLogService;
import com.zy.common.utils.News;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
@@ -25,6 +27,7 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
+import java.util.Base64;
import java.util.Date;
/**
@@ -155,9 +158,6 @@
private void readStatus(){
try {
short len = 56;
- if (slave.getId() == 1) {
- len = 58;
- }
OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", len);
if (result.IsSuccess) {
if (null == crnProtocol) {
@@ -181,13 +181,10 @@
crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
- crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
- crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
- crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
- crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
- if (slave.getId() == 1) {
- crnProtocol.setCrnLane((int) siemensNet.getByteTransform().TransInt16(result.Content, 56));
- }
+ crnProtocol.setxDistance((short) siemensNet.getByteTransform().TransSingle(result.Content, 40));
+ crnProtocol.setyDistance((short) siemensNet.getByteTransform().TransSingle(result.Content, 44));
+ crnProtocol.setxDuration((short) siemensNet.getByteTransform().TransSingle(result.Content, 48));
+ crnProtocol.setyDuration((short) siemensNet.getByteTransform().TransSingle(result.Content, 52));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -203,6 +200,30 @@
resetFlag = false;
}
}
+ }
+
+ if (crnProtocol.getAlarm() > 0) {
+ crnProtocol.setLastCommandTime(-1L);
+ }
+
+ if (crnProtocol.getAlarm() == 0 && crnProtocol.getLastCommandTime() == -1) {
+ crnProtocol.setLastCommandTime(System.currentTimeMillis());
+ }
+
+ if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 1000 * 1) {
+ //閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
+ //淇濆瓨鏁版嵁璁板綍
+ DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
+ DeviceDataLog deviceDataLog = new DeviceDataLog();
+ deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result.Content));
+ deviceDataLog.setWcsData(JSON.toJSONString(crnProtocol));
+ deviceDataLog.setType("crn");
+ deviceDataLog.setDeviceNo(crnProtocol.getCrnNo());
+ deviceDataLog.setCreateTime(new Date());
+ deviceDataLogService.insert(deviceDataLog);
+
+ //鏇存柊閲囬泦鏃堕棿
+ crnProtocol.setDeviceDataLog(System.currentTimeMillis());
}
try {
@@ -246,23 +267,6 @@
News.error("SiemensCrn"+" - 6"+" - 鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
-
- int writeAck = 0;
- do {
- OperateResult resultAck = siemensNet.Write("DB100.0", (short) 0);
- if (resultAck.IsSuccess){
- Thread.sleep(200);
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 2);
- short ack = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
- if (ack != 0) {
- writeAck++;
- }else {
- News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), "ack澶嶄綅瀹屾垚");
- break;
- }
- }
- }while (writeAck <5);
-
// convertRow(command);
command.setCrnNo(slave.getId());
short[] array = new short[10];
@@ -278,39 +282,12 @@
// array[9] = command.getSourceStaNo();
// array[10] = command.getDestinationStaNo();
array[9] = command.getCommand();
-
- OperateResult result = null;
- int idx = 0;
- do {
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 4);
- if (resultRead.IsSuccess) {
- short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
- if(taskNo == 0) {
- result = siemensNet.Write("DB100.0", array);
- }else {
- break;
- }
- }
- idx++;
- Thread.sleep(500L);
- } while (idx < 5);
+ OperateResult result = siemensNet.Write("DB100.0", array);
if (command.getAckFinish() == 0) {
short commandFinish = 1;
- int i = 0;
- do {
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 4);
- OperateResultExOne<byte[]> resultReadConfirm = siemensNet.Read("DB100.18", (short) 2);
- if (resultRead.IsSuccess && resultReadConfirm.IsSuccess) {
- short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
- short confirm = siemensNet.getByteTransform().TransInt16(resultReadConfirm.Content, 0);
- if(taskNo != 0 && confirm == 0) {
- result = siemensNet.Write("DB100.18", commandFinish);
- }
- }
- i++;
- Thread.sleep(500L);
- } while (i < 5);
+ Thread.sleep(100L);
+ result = siemensNet.Write("DB100.18", commandFinish);
}
try {
@@ -348,7 +325,6 @@
return false;
}
}
-
@Override
public void close() {
--
Gitblit v1.9.1