From b678a2c6b0b43feaad90c558b2c2c3bd608deedb Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 22 六月 2024 14:56:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java
index 8cad0eb..b0b342d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java
@@ -84,6 +84,10 @@
}
motion.setTarget(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), target.getLev())));
motion.setTarDrt(target.getStaNo());//鐩爣绔�
+
+ if (target.getSync() != null) {
+ motion.setSync(target.getSync());
+ }
}));
return motionList;
@@ -308,6 +312,34 @@
return motionList;
}
+ /**
+ * 绌挎杞﹀姩浣�
+ */
+ public List<Motion> shuttleAction(MotionDto origin, MotionDto target, MotionCtgType motionCtgType) {
+ List<Motion> motionList = new ArrayList<>();
+
+ motionList.add(Motion.build(motion -> {
+ motion.setDeviceCtg(DeviceCtgType.SHUTTLE.val());
+ motion.setDevice(String.valueOf(target.getShuttleNo()));
+
+ motion.setMotionCtg(motionCtgType.val());
+
+ switch (motionCtgType) {
+ case SHUTTLE_PALLET_LIFT://鎵樼洏椤跺崌
+
+ break;
+ case SHUTTLE_PALLET_DOWN://鎵樼洏涓嬮檷
+
+ break;
+ default:
+ break;
+ }
+
+ }));
+
+ return motionList;
+ }
+
public List<Motion> shuttleCharge(MotionDto origin, MotionDto target) {
List<Motion> motionList = new ArrayList<>();
--
Gitblit v1.9.1