From ec78344f0eb778847555f61d2cb682edcc5a0e39 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Wed, 31 May 2023 11:59:10 +0800
Subject: [PATCH] 修复双升位移库任务BUG
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java | 6 ++++++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java | 3 +++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
index b4be2a2..707403e 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
@@ -341,6 +341,12 @@ public class WcsServiceImpl implements WcsService {
return Result.error("创建移库任务失败");
}
preTaskNo = result.getResult().getId();
+ taskHeader.setPreTaskNo(preTaskNo);
+ boolean success = taskHeaderService.updateById(taskHeader);
+ if (!success) {
+ return Result.error("更新任务状态失败");
+ }
+ return Result.error("先执行移库任务");
}
} else {
// 如果是有任务，从这个库位入托盘，那么不能生成新的出库任务。必须等这个任务完成以后，重新生成新的移库后，这个任务才能执行。
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
index 9310827..4a527fa 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -952,6 +952,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
Result result = wcsService.wcsTaskAssign(taskHeader);
if (!result.isSuccess()) {
+ if (result.getMessage().equals("先执行移库任务")) {
+ return result;
+ }
throw new JeecgBootException(result.getMessage());
}
taskHeader.setStatus(QuantityConstant.TASK_STATUS_RELEASE);
--
libgit2 0.22.2