From 50435a81915932eda06b7f1afd48f9ff1ae84f19 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 10 四月 2025 17:50:28 +0800
Subject: [PATCH] 1
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java | 149 +++++++++++++++++++++++++++++--------------------
1 files changed, 88 insertions(+), 61 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 c8680e1..6eb80b9 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());
@@ -113,12 +116,6 @@
// 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());
// if (staProtocol == null) {
@@ -135,29 +132,41 @@
// }
// //*************************************************
+ command = liftThread.getPalletInOutCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), task.getTaskSts() < 100 ? LiftCommandModeType.PALLET_IN : LiftCommandModeType.PALLET_OUT);
+ list.addAll(command);
- //*************姝や唬鐮佷负鍏夋嘲瀹氬埗浠ｇ爜********************
- Integer tarDrt = motion.getTarDrt();
- if (tarDrt == 31001) {
- tarDrt = 31004;
+ motion.setTemp(String.valueOf(assignCommand.getDeviceTaskNo()));
+ motion.setUpdateTime(new Date());
+ motionService.updateById(motion);
+
+ return liftAction.assignWork(liftThread.getDevice(), assignCommand);
+ case LIFT_WITH_GOODS_IN:
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚﹁嚜鍔�
+ if (!liftThread.isIdle()) {
+ return false;
+ }
+ if (liftProtocol.getHasTray()) {
+ return false;
}
- StaProtocol staProtocol = devpThread.getStation().get(tarDrt);
- if (staProtocol == null) {
- return false;
- }
- if (!staProtocol.isAutoing()) {
- return false;
- }
- if (staProtocol.isLoading()) {
- return false;
- }
- if (staProtocol.getWorkNo().intValue() != 0) {
- return false;
- }
- //*************************************************
+ command = liftThread.getPalletInOutCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), task.getTaskSts() < 100 ? LiftCommandModeType.PALLET_IN : LiftCommandModeType.PALLET_OUT);
+ list.addAll(command);
- command = liftThread.getPalletInOutCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), LiftCommandModeType.PALLET_INOUT);
+ motion.setTemp(String.valueOf(assignCommand.getDeviceTaskNo()));
+ motion.setUpdateTime(new Date());
+ motionService.updateById(motion);
+
+ return liftAction.assignWork(liftThread.getDevice(), assignCommand);
+ case LIFT_WITH_GOODS_OUT:
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚﹁嚜鍔�
+ if (!liftThread.isIdle()) {
+ return false;
+ }
+ if (!liftProtocol.getHasTray()) {
+ return false;
+ }
+
+ command = liftThread.getPalletInOutCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), task.getTaskSts() < 100 ? LiftCommandModeType.PALLET_IN : LiftCommandModeType.PALLET_OUT);
list.addAll(command);
motion.setTemp(String.valueOf(assignCommand.getDeviceTaskNo()));
@@ -251,7 +260,7 @@
return false;
}
- if (!liftProtocol.getLev().equals(Integer.valueOf(motion.getTarget()))) {
+ if (!liftProtocol.getLev().equals(liftDispatcher.getLiftLevLogic(liftThread.getDevice().getId().intValue(), Integer.valueOf(motion.getTarget())))) {
return false;
}
@@ -270,21 +279,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()) {
- return false;
- }
+// //鍒ゆ柇鎻愬崌鏈烘墭鐩樻槸鍚﹀瓨鍦�
+// 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());
@@ -308,36 +318,53 @@
// }
// //*************************************************
- //*************姝や唬鐮佷负鍏夋嘲瀹氬埗浠ｇ爜********************
- 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 (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
+ task.setLiftNo(0);
+ task.setUpdateTime(new Date());
+ if (!taskService.updateById(task)) {
+ return false;
}
}
- if (!check) {
+ break;
+ case LIFT_WITH_GOODS_IN:
+ // 鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂�
+ if (!liftThread.isIdle()) {
return false;
}
- //*************************************************
+ if (!liftProtocol.getLev().equals(liftDispatcher.getLiftLevLogic(liftThread.getDevice().getId().intValue(), Integer.valueOf(motion.getTarget())))) {
+ return false;
+ }
+
+ //鍒ゆ柇鎻愬崌鏈烘墭鐩樻槸鍚﹀瓨鍦�
+ if (!liftProtocol.getHasTray()) {
+ return false;
+ }
+
+ if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
+ task.setLiftNo(0);
+ task.setUpdateTime(new Date());
+ if (!taskService.updateById(task)) {
+ return false;
+ }
+ }
+
+ break;
+ case LIFT_WITH_GOODS_OUT:
+ // 鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂�
+ if (!liftThread.isIdle()) {
+ return false;
+ }
+
+ if (!liftProtocol.getLev().equals(liftDispatcher.getLiftLevLogic(liftThread.getDevice().getId().intValue(), Integer.valueOf(motion.getTarget())))) {
+ return false;
+ }
+
+ //鍒ゆ柇鎻愬崌鏈烘墭鐩樻槸鍚﹀瓨鍦�
+ if (liftProtocol.getHasTray()) {
+ return false;
+ }
if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
task.setLiftNo(0);
--
Gitblit v1.9.1