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/KernelService.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 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 2d75205..ef67e16 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
@@ -65,11 +65,11 @@
 
             motion.setMotionCtg(MotionCtgType.LIFT_MOVE.val());
 
-            if (null != origin) {
-                motion.setOrigin(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), origin.getLev())));
-            }
-            motion.setTarget(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), target.getLev())));
-
+//            if (null != origin) {
+//                motion.setOrigin(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), origin.getLev())));
+//            }
+//            motion.setTarget(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), target.getLev())));
+            motion.setTarget(target.getLev().toString());
             if (target.getSync() != null) {
                 motion.setSync(target.getSync());
             }
@@ -95,11 +95,13 @@
             motion.setMotionCtg(MotionCtgType.LIFT_WITH_GOODS.val());
 
             if (null != origin) {
-                motion.setOrigin(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), origin.getLev())));
-                motion.setOriDrt(origin.getStaNo());//婧愮珯
+//                motion.setOrigin(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), origin.getLev())));
+//                motion.setOriDrt(origin.getStaNo());//婧愮珯
+                motion.setOrigin(String.valueOf(origin.getStaNo()));
             }
-            motion.setTarget(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), target.getLev())));
-            motion.setTarDrt(target.getStaNo());//鐩爣绔�
+//            motion.setTarget(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), target.getLev())));
+//            motion.setTarDrt(target.getStaNo());//鐩爣绔�
+            motion.setTarget(String.valueOf(target.getStaNo()));
 
             if (target.getDevpNo() != null) {
                 motion.setDockNo(String.valueOf(target.getDevpNo()));//杈撻�佺嚎ID

--
Gitblit v1.9.1