From e826b2ba77a95a0412ae6bb5c8a9c1e37afca291 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 31 三月 2025 15:25:12 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java | 67 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java
index 7e5b117..c03eb2c 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyLiftThread.java
@@ -16,6 +16,7 @@
import com.zy.asrs.wcs.core.model.enums.LiftCommandModeType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.core.service.BasLiftService;
+import com.zy.asrs.wcs.core.utils.LiftDispatcher;
import com.zy.asrs.wcs.core.utils.RedisUtil;
import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.rcs.News;
@@ -47,22 +48,6 @@
public NyLiftThread(Device device, RedisUtil redisUtil) {
this.device = device;
this.redisUtil = redisUtil;
-
- //鍒濆鍖栫珯鐐�
- BasLiftService basLiftService = SpringUtils.getBean(BasLiftService.class);
- BasLift basLift = basLiftService.getOne(new LambdaQueryWrapper<BasLift>()
- .eq(BasLift::getDeviceId, device.getId()));
- List<BasLiftStaDto> staList = JSON.parseArray(basLift.getSta(), BasLiftStaDto.class);
- this.staList = staList;
- for (BasLiftStaDto sta : staList) {
- LiftStaProtocol liftStaProtocol = new LiftStaProtocol();
- liftStaProtocol.setStaNo(sta.getStaNo());//绔欑偣鍙�
- liftStaProtocol.setLev(sta.getLev());//绔欑偣妤煎眰
- String locNo = Utils.getLocNo(sta.getRow(), sta.getBay(), sta.getLev());
- liftStaProtocol.setLocNo(locNo);//绔欑偣搴撲綅鍙�
- liftStaProtocol.setLiftNo(basLift.getLiftNo());//鎻愬崌鏈哄彿
- liftStaProtocols.add(liftStaProtocol);
- }
}
@Override
@@ -94,6 +79,24 @@
private void readStatus() {
try {
+ if (liftStaProtocols.isEmpty()) {
+ //鍒濆鍖栫珯鐐�
+ BasLiftService basLiftService = SpringUtils.getBean(BasLiftService.class);
+ BasLift basLift = basLiftService.getOne(new LambdaQueryWrapper<BasLift>()
+ .eq(BasLift::getDeviceId, device.getId()));
+ List<BasLiftStaDto> staList = JSON.parseArray(basLift.getSta(), BasLiftStaDto.class);
+ this.staList = staList;
+ for (BasLiftStaDto sta : staList) {
+ LiftStaProtocol liftStaProtocol = new LiftStaProtocol();
+ liftStaProtocol.setStaNo(sta.getStaNo());//绔欑偣鍙�
+ liftStaProtocol.setLev(sta.getLev());//绔欑偣妤煎眰
+ String locNo = Utils.getLocNo(sta.getRow(), sta.getBay(), sta.getLev());
+ liftStaProtocol.setLocNo(locNo);//绔欑偣搴撲綅鍙�
+ liftStaProtocol.setLiftNo(basLift.getLiftNo());//鎻愬崌鏈哄彿
+ liftStaProtocols.add(liftStaProtocol);
+ }
+ }
+
//鑾峰彇鎻愬崌鏈烘暟鎹�
OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB82.4.0", (short) 10);
if (result1.IsSuccess) {
@@ -133,7 +136,7 @@
//鏈夊皬杞�
liftProtocol.setHasCar(status2[6]);
//璁惧鏁呴殰
- liftProtocol.setErrorCode(String.valueOf(status2[7]));
+ liftProtocol.setErrorCode(status2[7]?"1":"0");
//鐩殑鍦板潃
liftProtocol.setDistAddress(siemensS7Net.getByteTransform().TransInt16(result1.Content, 4));
//宸插畬鎴愪换鍔″彿
@@ -147,6 +150,12 @@
//浠诲姟鍙�
liftExtend.setLiftTaskNo(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result1.Content, 2)));
liftProtocol.setExtend(liftExtend);
+
+ boolean ready = true;
+ if (!liftProtocol.getModel() || liftProtocol.getRun()) {
+ ready = false;
+ }
+ liftProtocol.setReady(ready);//灏辩华鐘舵��
}else {
@@ -276,6 +285,22 @@
array[i] = shorts.get(i);
}
+ LiftDispatcher liftDispatcher = SpringUtils.getBean(LiftDispatcher.class);
+ Integer lev = liftDispatcher.getLiftLevOffset(this.device.getId().intValue(), liftProtocol.getLev());
+ if (null == lev){
+ News.error("鎻愬崌鏈鸿幏鍙栧綋鍓嶅眰涓虹┖");
+ response.setMessage("鎻愬崌鏈鸿幏鍙栧綋鍓嶅眰涓虹┖");
+ return response;
+ }
+ array[1] = lev.shortValue();
+ Integer targetLev = liftDispatcher.getLiftLevOffset(this.device.getId().intValue(), command.getTargetLev());
+ if (null == targetLev){
+ News.error("鎻愬崌鏈鸿幏鍙栫洰鏍囧眰涓虹┖");
+ response.setMessage("鎻愬崌鏈鸿幏鍙栫洰鏍囧眰涓虹┖");
+ return response;
+ }
+ array[2] = targetLev.shortValue();
+
OperateResult result = siemensS7Net.Write("DB83.0", array);
if (result != null && result.IsSuccess) {
liftProtocol.setSendTime(System.currentTimeMillis());//鎸囦护涓嬪彂鏃堕棿
@@ -375,7 +400,13 @@
@Override
public int generateDeviceTaskNo(int taskNo, MotionCtgType motionCtgType) {
- return taskNo;
+ int deviceTaskNo = taskNo;
+ try {
+ deviceTaskNo = Utils.getTaskNo("LIFT_TASK_NO");
+ } catch (Exception e) {
+ return taskNo;
+ }
+ return deviceTaskNo;
}
@Override
--
Gitblit v1.9.1