From e27ae18d6b85f11acc78744d9a6cbc4ce0e9c10d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 13 七月 2024 16:17:10 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyShuttleThread.java | 2 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java | 14 +++++++++-----
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java | 11 +++--------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java | 12 ++++--------
4 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
index bd6b714..a84e807 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
@@ -109,15 +109,11 @@
command.setComplete(true);
}
- if (task.getTaskSts() < 100) {//鍏ュ簱鍒ゆ柇鎵樼洏鏄惁杩涘叆鎻愬崌鏈�
- if (!liftProtocol.getHasTray()) {
- return false;
- }
- } else if (task.getTaskSts() >= 100 && task.getTaskSts() < 200) {//鍑哄簱鍒ゆ柇鎵樼洏鏄惁绂诲紑鎻愬崌鏈�
- if (liftProtocol.getHasTray()) {
- return false;
- }
+ //鍒ゆ柇鎻愬崌鏈烘墭鐩樻槸鍚﹀瓨鍦�
+ if (liftProtocol.getHasTray()) {
+ return false;
}
+
} else if (command.getMode() == LiftCommandModeType.RESET.id) {
//澶嶄綅
command.setComplete(true);
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
index b433be8..9a2e59d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
@@ -1,8 +1,6 @@
package com.zy.asrs.wcs.core.kernel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.core.domain.dto.MotionDto;
import com.zy.asrs.wcs.core.entity.*;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
@@ -53,6 +51,8 @@
private ShuttleStandbyService shuttleStandbyService;
@Autowired
private BasConveyorPathService basConveyorPathService;
+ @Autowired
+ private BasConveyorStaService basConveyorStaService;
@Autowired
private TaskCtgService taskCtgService;
@@ -1404,17 +1404,21 @@
} else if (destSite.equals("movePallet")) {
//绉诲姩鎵樼洏
-
+ BasConveyorSta basConveyorStaOrigin = basConveyorStaService.selectBySiteNo(task.getOriginSite());
+ BasConveyorSta basConveyorStaDest = basConveyorStaService.selectBySiteNo(task.getDestSite());
+ if(basConveyorStaOrigin == null || basConveyorStaDest == null) {
+ return motionList;
+ }
// 鎻愬崌鏈虹Щ鍔ㄦ墭鐩�
motionList.addAll(kernelService.liftMoveGoods(
MotionDto.build((dto -> {
dto.setLiftNo(device.getId().intValue());
- dto.setLev(0);
+ dto.setLev(Utils.getLev(basConveyorStaOrigin.getLocNo()));
dto.setStaNo(Integer.parseInt(task.getOriginSite()));
}))
, MotionDto.build((dto -> {
dto.setLiftNo(device.getId().intValue());
- dto.setLev(0);
+ dto.setLev(Utils.getLev(basConveyorStaDest.getLocNo()));
dto.setStaNo(Integer.parseInt(task.getDestSite()));
}))
));
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
index 496ca62..5b05c7e 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
@@ -222,14 +222,9 @@
return false;
}
- if (task.getTaskSts() < 100) {//鍏ュ簱鍒ゆ柇鎵樼洏鏄惁杩涘叆鎻愬崌鏈�
- if (!liftProtocol.getHasTray()) {
- return false;
- }
- } else if (task.getTaskSts() >= 100 && task.getTaskSts() < 200) {//鍑哄簱鍒ゆ柇鎵樼洏鏄惁绂诲紑鎻愬崌鏈�
- if (liftProtocol.getHasTray()) {
- return false;
- }
+ //鍒ゆ柇鎻愬崌鏈烘墭鐩樻槸鍚﹀瓨鍦�
+ if (liftProtocol.getHasTray()) {
+ return false;
}
if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyShuttleThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyShuttleThread.java
index 891794a..76c9550 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyShuttleThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyShuttleThread.java
@@ -212,7 +212,7 @@
shuttleProtocol.setErrorCode(data.getJSONArray("errCode").getString(0));
//鏄惁椤跺崌
- shuttleProtocol.setHasLift(data.getInteger("liftPosition") == 1 ? true : false);
+ shuttleProtocol.setHasLift(data.getInteger("liftPosition") == 2 ? true : false);
//鏄惁鏈夋墭鐩�
shuttleProtocol.setHasPallet(data.getInteger("loadState") == 1 ? true : false);
//琛岄┒鏂瑰悜
--
Gitblit v1.9.1