From 7a60ae36c251fbdfca631b459e2cc649255ace85 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 18:17:06 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 5 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 df05a64..35cac52 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
@@ -115,6 +115,11 @@
command = liftThread.getPalletInOutCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), LiftCommandModeType.PALLET_INOUT);
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:
//鍒ゆ柇鎻愬崌鏈烘槸鍚﹁嚜鍔�
@@ -236,13 +241,59 @@
if (devpThread == null) {
return false;
}
- StaProtocol staProtocol = devpThread.getStation().get(motion.getTarDrt());
- if(staProtocol == null) {
+
+// //*************姝や唬鐮佷负鏍囧噯鐗堟湰浠ｇ爜********************
+// 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;
+// }
+// }
+// //*************************************************
+
+ //*************姝や唬鐮佷负鍏夋嘲瀹氬埗浠ｇ爜********************
+ 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 (!staProtocol.isLoading()) {
- return false;
- }
+ //*************************************************
+
if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
task.setLiftNo(0);
--
Gitblit v1.9.1