From 6c9c3b0723bdb10c7f8db396b4e6f519b67a596d Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Tue, 30 May 2023 17:34:04 +0800
Subject: [PATCH] 更新双升位移库任务BUG
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java | 7 ++++---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java | 2 +-
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java | 4 ++--
3 files changed, 7 insertions(+), 6 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 d607aeb..7530938 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
@@ -336,18 +336,18 @@ public class WcsServiceImpl implements WcsService {
if (destinationLocation == null) {
return Result.error("移库没有剩余库位");
}
- Result result = taskHeaderService.createTransferTask(insideLocation.getCode(), destinationLocation.getCode(), warehouseCode);
- preTaskNo = (Integer)result.getResult();
+ Result<TaskHeader> result = taskHeaderService.createTransferTask(insideLocation.getCode(), destinationLocation.getCode(), warehouseCode);
if (!result.isSuccess()) {
return Result.error("创建移库任务失败");
}
+ preTaskNo = result.getResult().getId();
// 移库任务
taskHeader.setPreTaskNo(preTaskNo);
boolean success = taskHeaderService.updateById(taskHeader);
if (!success) {
return Result.error("更新任务状态失败");
}
- return Result.error("先执行移库任务");
+// return Result.error("先执行移库任务");
}
} else {
// 如果是有任务，从这个库位入托盘，那么不能生成新的出库任务。必须等这个任务完成以后，重新生成新的移库后，这个任务才能执行。
@@ -369,6 +369,7 @@ public class WcsServiceImpl implements WcsService {
}
}
+ // 下发移库任务
WcsTask wcsTask = new WcsTask();
wcsTask.setTaskNo(taskHeader.getId().toString());
wcsTask.setWarehouseCode(warehouseCode);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java
index 19c5382..86ff715 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java
@@ -134,7 +134,7 @@ public interface ITaskHeaderService extends IService<TaskHeader> {
* @param warehouseCode
* @return
*/
- Result createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode);
+ Result<TaskHeader> createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode);
/**
* 创建出库查看任务
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 20ce1df..9310827 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
@@ -181,7 +181,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
@Override
@Transactional(rollbackFor = Exception.class)
- public Result createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode) {
+ public Result<TaskHeader> createTransferTask(String fromLocationCode, String toLocationCode, String warehouseCode) {
log.info("开始创建移库任务,起始库位" + fromLocationCode + ",目标库位" + toLocationCode);
if (StringUtils.isEmpty(fromLocationCode)) {
return Result.error("创建移库任务时，起始库位为空");
@@ -295,7 +295,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (!success) {
throw new JeecgBootException("创建移库任务时，容器" + fromLocation.getContainerCode() + "更新失败");
}
- return Result.OK("创建移库任务成功");
+ return Result.OK("创建移库任务成功", taskHeader);
}
@Override
--
libgit2 0.22.2