From 759cd0e706e252e907955073eed8e4935b21d9c8 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 31 十二月 2025 08:13:48 +0800
Subject: [PATCH] 1.修复拣料回库时拣料出库转历史档 2.生成移动任务修复 3.完善agv搬运入库出库申请
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 64dd38d..0e9d160 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,13 @@
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));
+// if (slave.getId() == 1) {
+// crnProtocol.setCrnLane((int) siemensNet.getByteTransform().TransInt16(result.Content, 56));
+// }
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -205,6 +205,30 @@
}
}
+ 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 {
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
--
Gitblit v1.9.1