From 0d04bc5d8080b82338302fba0a59fccff2eaedfc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 06 七月 2025 11:28:29 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java
index 6bc68e0..60ce3cf 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java
@@ -42,8 +42,29 @@
@Override
public Boolean hasRunningMotion(String uuid, Long hostId) {
- return null != this.selectOfTop1(uuid, MotionStsType.EXECUTING.val(), hostId)
- || null != this.selectOfTop1(uuid, MotionStsType.ERROR.val(), hostId);
+ Motion executeMotion = this.selectOfTop1(uuid, MotionStsType.EXECUTING.val(), hostId);
+ Motion errorMotion = this.selectOfTop1(uuid, MotionStsType.ERROR.val(), hostId);
+ if(errorMotion != null) {
+ return true;
+ }
+
+ if(executeMotion != null) {
+ if (executeMotion.getSync() == 0) {
+ //妫�娴嬫槸鍚︽湁鍚屾鍔ㄤ綔
+ List<Motion> syncMotion = this.list(new LambdaQueryWrapper<Motion>()
+ .eq(Motion::getUuid, uuid)
+ .eq(Motion::getMotionSts, MotionStsType.EXECUTING.val())
+ .eq(Motion::getHostId, hostId)
+ .eq(Motion::getSync, 1));
+ if (!syncMotion.isEmpty()) {
+ return true;//瀛樺湪鍚屾鍔ㄤ綔
+ }
+ return false;//褰撳墠鍔ㄤ綔涓哄紓姝ユ搷浣�
+ }
+ return true;
+ }
+
+ return false;
}
@Override
--
Gitblit v1.9.1