From 0fc62ab3d5d038235b328d91cda0192a34617fb9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 19 五月 2025 20:17:30 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 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 35cac52..c8680e1 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
@@ -113,6 +113,50 @@
// 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 (staProtocol.getWorkNo().intValue() != 0) {
+// return false;
+// }
+// //*************************************************
+
+
+ //*************姝や唬鐮佷负鍏夋嘲瀹氬埗浠ｇ爜********************
+ Integer tarDrt = motion.getTarDrt();
+ if (tarDrt == 31001) {
+ tarDrt = 31004;
+ }
+
+ 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(), LiftCommandModeType.PALLET_INOUT);
list.addAll(command);
--
Gitblit v1.9.1