From 236d970338b4a5cb1bd33b5cc042fac89b61df66 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 16:45:21 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 9789394..403c932 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
@@ -84,6 +84,7 @@
LiftAssignCommand assignCommand = new LiftAssignCommand();
assignCommand.setLiftNo(liftProtocol.getLiftNo());
assignCommand.setTaskNo(motion.getTaskNo());
+ assignCommand.setDeviceTaskNo(liftThread.generateDeviceTaskNo(motion.getTaskNo(), MotionCtgType.get(motion.getMotionCtgEl())));
assignCommand.setCommands(list);
List<LiftCommand> command = new ArrayList<>();
@@ -100,7 +101,7 @@
break;
}
- command = liftThread.getMoveCommand(motion.getTaskNo(), 0, Integer.parseInt(motion.getTarget()), LiftCommandModeType.MOVE);
+ command = liftThread.getMoveCommand(assignCommand.getDeviceTaskNo(), 0, Integer.parseInt(motion.getTarget()), LiftCommandModeType.MOVE);
list.addAll(command);
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_WITH_GOODS:
@@ -112,8 +113,13 @@
// return false;
// }
- command = liftThread.getPalletInOutCommand(motion.getTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), LiftCommandModeType.PALLET_INOUT);
+ 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:
//鍒ゆ柇鎻愬崌鏈烘槸鍚﹁嚜鍔�
@@ -125,7 +131,7 @@
return false;
}
- command = liftThread.getMoveWithShuttleCommand(motion.getTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), LiftCommandModeType.MOVE_CAR);
+ command = liftThread.getMoveWithShuttleCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), LiftCommandModeType.MOVE_CAR);
list.addAll(command);
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_WITH_GOODS_AND_SHUTTLE:
@@ -144,7 +150,7 @@
return false;
}
- command = liftThread.getLockCommand(motion.getTaskNo(), true);//鑾峰彇鎻愬崌鏈洪攣瀹氬懡浠�
+ command = liftThread.getLockCommand(assignCommand.getDeviceTaskNo(), true);//鑾峰彇鎻愬崌鏈洪攣瀹氬懡浠�
list.addAll(command);
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_UNLOCK:
@@ -154,7 +160,7 @@
return false;
}
- command = liftThread.getLockCommand(motion.getTaskNo(), false);//鑾峰彇鎻愬崌鏈鸿В瀹氬懡浠�
+ command = liftThread.getLockCommand(assignCommand.getDeviceTaskNo(), false);//鑾峰彇鎻愬崌鏈鸿В瀹氬懡浠�
list.addAll(command);
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
case LIFT_SHUTTLE_ARRIVAL:
@@ -164,7 +170,7 @@
return false;
}
- command = liftThread.getShuttleSignalCommand(motion.getTaskNo(), true);//鑾峰彇灏忚溅宸插埌浣嶅懡浠�
+ command = liftThread.getShuttleSignalCommand(assignCommand.getDeviceTaskNo(), true);//鑾峰彇灏忚溅宸插埌浣嶅懡浠�
list.addAll(command);
return liftAction.assignWork(liftThread.getDevice(), assignCommand);
default:
@@ -239,9 +245,21 @@
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