From c13fe87d70e81d7dcb604f8f1227de8f313cbefc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 10 七月 2024 09:26:51 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 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 ae6aadf..db4c697 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
@@ -55,13 +55,15 @@
                 motion.setOrigin(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), origin.getLev())));
             }
             motion.setTarget(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), target.getLev())));
-        }));
 
-//        if (target.getUpdateLiftNo() != null && target.getWrkNo() != null) {
-//            if (target.getUpdateLiftNo()) {
-//
-//            }
-//        }
+            if (target.getSync() != null) {
+                motion.setSync(target.getSync());
+            }
+
+            if (target.getReleaseLift() != null) {
+                motion.setReleaseLift(target.getReleaseLift());
+            }
+        }));
 
         return motionList;
     }
@@ -87,6 +89,10 @@
 
             if (target.getSync() != null) {
                 motion.setSync(target.getSync());
+            }
+
+            if (target.getReleaseLift() != null) {
+                motion.setReleaseLift(target.getReleaseLift());
             }
         }));
 
@@ -166,6 +172,14 @@
             motion.setDeviceCtg(DeviceCtgType.LIFT.val());
             motion.setDevice(String.valueOf(target.getLiftNo()));
             motion.setMotionCtg(MotionCtgType.LIFT_LOCK.val());
+
+            if (target.getSync() != null) {
+                motion.setSync(target.getSync());
+            }
+
+            if (target.getReleaseLift() != null) {
+                motion.setReleaseLift(target.getReleaseLift());
+            }
         }));
 
         return motionList;
@@ -181,6 +195,14 @@
             motion.setDeviceCtg(DeviceCtgType.LIFT.val());
             motion.setDevice(String.valueOf(target.getLiftNo()));
             motion.setMotionCtg(MotionCtgType.LIFT_UNLOCK.val());
+
+            if (target.getSync() != null) {
+                motion.setSync(target.getSync());
+            }
+
+            if (target.getReleaseLift() != null) {
+                motion.setReleaseLift(target.getReleaseLift());
+            }
         }));
 
         return motionList;

--
Gitblit v1.9.1