From ac09ee9c9f39cb9d452b57504e5c79321e0371eb Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 03 四月 2025 15:34:34 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 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..615f3a8 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,7 +113,23 @@
 //                    return false;
 //                }
 
-                command = liftThread.getPalletInOutCommand(assignCommand.getDeviceTaskNo(), Integer.parseInt(motion.getOrigin()), Integer.parseInt(motion.getTarget()), motion.getOriDrt(), motion.getTarDrt(), LiftCommandModeType.PALLET_INOUT);
+//                //*************鏍囧噯绯荤粺浠g爜********************
+//                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()));

--
Gitblit v1.9.1