From c3a45951d49c7a2c6e19efaa91556c9032719c79 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期四, 21 三月 2024 11:55:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 2 ++
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 2 +-
src/main/java/com/zy/core/enums/RgvModeType.java | 1 +
3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 6b87cb7..afb6bc3 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -22,6 +22,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
/**
* 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -105,6 +106,7 @@
.setUri(wmsUrl)
.setPath("wcsManager/wcsInterface/taskStatusFeedback")
.setJson(JSON.toJSONString(taskOverToWms))
+ .setTimeout(60, TimeUnit.SECONDS)
.build()
.doPost();
}catch (Exception e){
diff --git a/src/main/java/com/zy/core/enums/RgvModeType.java b/src/main/java/com/zy/core/enums/RgvModeType.java
index 3a344bb..d02ec3a 100644
--- a/src/main/java/com/zy/core/enums/RgvModeType.java
+++ b/src/main/java/com/zy/core/enums/RgvModeType.java
@@ -7,6 +7,7 @@
HAND(1, "鎵嬪姩"),
HALF_AUTO(2, "鍗婅嚜鍔�"),
AUTO(3, "鑷姩"),
+ AUTO3(4, "鍏跺畠4"),
AUTO2(100, "鍏跺畠"),
;
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 9243250..705722b 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -313,7 +313,7 @@
try{
//鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
Thread.sleep(500);
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
if (resultRead.IsSuccess) {
CrnCommand one = new CrnCommand();
one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
--
Gitblit v1.9.1