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 | 78 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 22 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 6be4924..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());
@@ -113,8 +116,29 @@
// return false;
// }
- command = liftThread.getPalletInOutCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), LiftCommandModeType.PALLET_INOUT);
+// //*************鏍囧噯绯荤粺浠ｇ爜********************
+// StaProtocol staProtocol = devpThread.getStation().get(motion.getTarDrt());
+// 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);
+
+ motion.setTemp(String.valueOf(assignCommand.getDeviceTaskNo()));
+ motion.setUpdateTime(new Date());
+ motionService.updateById(motion);
+
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_WITH_SHUTTLE:
//鍒ゆ柇鎻愬崌鏈烘槸鍚﹁嚜鍔�
@@ -221,34 +245,44 @@
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;
- }
- StaProtocol staProtocol = devpThread.getStation().get(motion.getTarDrt());
- if(staProtocol == null) {
- return false;
- }
- if (!staProtocol.isAutoing()) {
- return false;
- }
- if (!staProtocol.isLoading()) {
- return false;
- }
- if (!motion.getTaskNo().equals(staProtocol.getWorkNo().intValue())) {
- 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) {
+// return false;
+// }
+// if (!staProtocol.isAutoing()) {
+// return false;
+// }
+// if (!staProtocol.isLoading()) {
+// return false;
+// }
+// if (!motion.getTaskNo().equals(staProtocol.getWorkNo().intValue())) {
+// if (motion.getTemp() == null) {
+// return false;
+// }
+//
+// if (Integer.parseInt(motion.getTemp()) != staProtocol.getWorkNo().intValue()) {
+// return false;
+// }
+// }
+// //*************************************************
if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
task.setLiftNo(0);
--
Gitblit v1.9.1