From f43b508dda7334487a1640b0bbd908d7b3aa3cb6 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 15 十月 2024 13:14:28 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java
index c5b257e..9a77458 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/JxgtLiftThread.java
@@ -17,6 +17,7 @@
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.core.service.BasLiftService;
import com.zy.asrs.wcs.core.utils.RedisUtil;
+import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.OutputQueue;
import com.zy.asrs.wcs.rcs.entity.Device;
@@ -29,10 +30,7 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@Slf4j
@SuppressWarnings("all")
@@ -114,8 +112,8 @@
liftProtocol.setHasCar(siemensS7Net.getByteTransform().TransInt16(result1.Content, 6) == 1);
//褰撳墠妤煎眰
liftProtocol.setLev((int) siemensS7Net.getByteTransform().TransInt16(result1.Content, 8));
- //宸ヤ綔鍙�
- liftProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt32(result1.Content, 12));
+// //宸ヤ綔鍙�
+// liftProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt32(result1.Content, 12));
//璁惧鏁呴殰
liftProtocol.setError(siemensS7Net.getByteTransform().TransInt16(result1.Content, 16) == 1);
//鏁呴殰鐮�
@@ -212,22 +210,23 @@
return false;
}
- List<Short> shorts = JSON.parseArray(command.getBody(), Short.class);
- short[] array = new short[shorts.size()];//鑾峰彇鍛戒护鎶ユ枃
- for (int i = 0; i < shorts.size(); i++) {
- array[i] = shorts.get(i);
+ List<Integer> list = JSON.parseArray(command.getBody(), Integer.class);
+ int[] array = new int[list.size()];//鑾峰彇鍛戒护鎶ユ枃
+ for (int i = 0; i < list.size(); i++) {
+ array[i] = list.get(i);
}
OperateResult result = null;
if (command.getMode() == LiftCommandModeType.MOVE.id) {
//绉诲姩
- result = siemensS7Net.Write("DB101.2", array);
+ result = siemensS7Net.Write("DB101.2", (short) array[0]);
+ result = siemensS7Net.Write("DB101.4", (int) array[1]);
} else if (command.getMode() == LiftCommandModeType.PALLET_INOUT.id) {
//鎵樼洏鍑哄叆
result = siemensS7Net.Write("DB101.8", array);
} else if (command.getMode() == LiftCommandModeType.LOCK.id || command.getMode() == LiftCommandModeType.UNLOCK.id) {
//鎻愬崌鏈洪攣瀹�/瑙ｉ攣
- result = siemensS7Net.Write("DB101.0", array);
+ result = siemensS7Net.Write("DB101.0", (short) array[0]);
}
if (result != null && result.IsSuccess) {
@@ -244,12 +243,12 @@
@Override
public boolean lock(LiftCommand command) {
- return true;
+ return write(command);
}
@Override
public boolean unlock(LiftCommand command) {
- return true;
+ return write(command);
}
@Override
@@ -319,10 +318,19 @@
@Override
public boolean isLock(ExecuteSupport support) {
- if (support != null) {
- return support.judgement();
+ InnerLiftExtend extend = (InnerLiftExtend) this.liftProtocol.getExtend();
+ return extend.getLock();
+ }
+
+ @Override
+ public int generateDeviceTaskNo(int taskNo, MotionCtgType motionCtgType) {
+ int deviceTaskNo = taskNo;
+ try {
+ deviceTaskNo = Utils.getTaskNo("LIFT_TASK_NO");
+ } catch (Exception e) {
+ return taskNo;
}
- return true;
+ return deviceTaskNo;
}
@Override
@@ -353,7 +361,7 @@
@Override
public List<LiftCommand> getPalletInOutCommand(Integer taskNo, Integer sourceLev, Integer targetLev, Integer originSta, Integer targetSta, LiftCommandModeType mode) {
// 寮�濮嬩换鍔�
- short[] array = new short[2];
+ short[] array = new short[3];
array[0] = originSta.shortValue();//璧峰绔�
array[1] = targetSta.shortValue();//鐩爣绔�
array[2] = taskNo.shortValue();//宸ヤ綔鍙�
@@ -381,7 +389,7 @@
command.setLiftNo(Integer.valueOf(this.device.getDeviceNo()));
command.setTaskNo(taskNo);
command.setBody(JSON.toJSONString(array));
- command.setMode(LiftCommandModeType.PALLET_INOUT.id);
+ command.setMode(lock ? LiftCommandModeType.LOCK.id : LiftCommandModeType.UNLOCK.id);
ArrayList<LiftCommand> list = new ArrayList<>();
list.add(command);
--
Gitblit v1.9.1