Commit ec78344f0eb778847555f61d2cb682edcc5a0e39
1 parent
53fbb1e6
修复双升位移库任务BUG
Signed-off-by: TanYibin <5491541@qq.com>
Showing
2 changed files
with
9 additions
and
0 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
@@ -341,6 +341,12 @@ public class WcsServiceImpl implements WcsService { | @@ -341,6 +341,12 @@ public class WcsServiceImpl implements WcsService { | ||
341 | return Result.error("创建移库任务失败"); | 341 | return Result.error("创建移库任务失败"); |
342 | } | 342 | } |
343 | preTaskNo = result.getResult().getId(); | 343 | preTaskNo = result.getResult().getId(); |
344 | + taskHeader.setPreTaskNo(preTaskNo); | ||
345 | + boolean success = taskHeaderService.updateById(taskHeader); | ||
346 | + if (!success) { | ||
347 | + return Result.error("更新任务状态失败"); | ||
348 | + } | ||
349 | + return Result.error("先执行移库任务"); | ||
344 | } | 350 | } |
345 | } else { | 351 | } else { |
346 | // 如果是有任务,从这个库位入托盘,那么不能生成新的出库任务。必须等这个任务完成以后,重新生成新的移库后,这个任务才能执行。 | 352 | // 如果是有任务,从这个库位入托盘,那么不能生成新的出库任务。必须等这个任务完成以后,重新生成新的移库后,这个任务才能执行。 |
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 | @@ -952,6 +952,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
952 | } | 952 | } |
953 | Result result = wcsService.wcsTaskAssign(taskHeader); | 953 | Result result = wcsService.wcsTaskAssign(taskHeader); |
954 | if (!result.isSuccess()) { | 954 | if (!result.isSuccess()) { |
955 | + if (result.getMessage().equals("先执行移库任务")) { | ||
956 | + return result; | ||
957 | + } | ||
955 | throw new JeecgBootException(result.getMessage()); | 958 | throw new JeecgBootException(result.getMessage()); |
956 | } | 959 | } |
957 | taskHeader.setStatus(QuantityConstant.TASK_STATUS_RELEASE); | 960 | taskHeader.setStatus(QuantityConstant.TASK_STATUS_RELEASE); |