From 901f9ca15fb0ce3bcf2ebf956c569c260050c561 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 07 四月 2025 13:10:54 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java | 51 ++++++++++++---------------------------------------
1 files changed, 12 insertions(+), 39 deletions(-)
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 615f3a8..63e1026 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
@@ -12,6 +12,7 @@
import com.zy.asrs.wcs.core.model.enums.MotionStsType;
import com.zy.asrs.wcs.core.service.MotionService;
import com.zy.asrs.wcs.core.service.TaskService;
+import com.zy.asrs.wcs.core.utils.LiftDispatcher;
import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
@@ -42,6 +43,8 @@
private TaskService taskService;
@Autowired
private LiftAction liftAction;
+ @Autowired
+ private LiftDispatcher liftDispatcher;
public Boolean accept(Motion motion) {
Integer deviceNo = Integer.parseInt(motion.getDevice());
@@ -242,21 +245,22 @@
return false;
}
- if (!liftProtocol.getLev().equals(Integer.valueOf(motion.getTarget()))) {
+ Integer target = liftDispatcher.getLiftLevLogic(liftThread.getDevice().getId().intValue(), Integer.valueOf(motion.getTarget()));
+ if (!liftProtocol.getLev().equals(target)) {
return false;
}
//鍒ゆ柇鎻愬崌鏈烘墭鐩樻槸鍚﹀瓨鍦�
- if (liftProtocol.getHasTray()) {
+ if (!liftProtocol.getHasTray()) {
return false;
}
- //鍒ゆ柇鐩爣绔欐槸鍚︽湁鎵樼洏
- Integer conveyorDeviceId = Integer.parseInt(motion.getDockNo());
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, conveyorDeviceId);
- if (devpThread == null) {
- return false;
- }
+// //鍒ゆ柇鐩爣绔欐槸鍚︽湁鎵樼洏
+// Integer conveyorDeviceId = Integer.parseInt(motion.getDockNo());
+// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, conveyorDeviceId);
+// if (devpThread == null) {
+// return false;
+// }
// //*************姝や唬鐮佷负鏍囧噯鐗堟湰浠ｇ爜********************
// StaProtocol staProtocol = devpThread.getStation().get(motion.getTarDrt());
@@ -279,37 +283,6 @@
// }
// }
// //*************************************************
-
- //*************姝や唬鐮佷负鍏夋嘲瀹氬埗浠ｇ爜********************
- ArrayList<Integer> staList = new ArrayList<>();
- staList.add(motion.getTarDrt());
- staList.add(31003);
- staList.add(31002);
- staList.add(31001);
-
- boolean check = false;
- for (Integer sta : staList) {
- StaProtocol staProtocol = devpThread.getStation().get(sta);
- if (staProtocol == null) {
- continue;
- }
- if (!staProtocol.isAutoing()) {
- continue;
- }
- if (!staProtocol.isLoading()) {
- continue;
- }
- if (Integer.parseInt(motion.getTemp()) == staProtocol.getWorkNo().intValue()) {
- check = true;
- break;
- }
- }
-
- if (!check) {
- return false;
- }
- //*************************************************
-
if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
task.setLiftNo(0);
--
Gitblit v1.9.1