diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsService.java index 93b0a22..e5a244a 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsService.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsService.java @@ -55,4 +55,5 @@ public interface WcsService { * 选取空托盘组出库 */ Result manyEmptyOut(String zoneCode, String port, String warehouseCode); + } 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 0f5c539..8617447 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 @@ -339,7 +339,7 @@ public class WcsServiceImpl implements WcsService { } preTaskNo = result.getResult().getId(); taskHeader.setPreTaskNo(preTaskNo); - boolean success = taskHeaderService.updateById(taskHeader); + boolean success = taskHeaderService.updatePreTaskNoById(preTaskNo, taskHeader.getId()); if (!success) { throw new JeecgBootException("更新任务状态失败"); } @@ -358,7 +358,7 @@ public class WcsServiceImpl implements WcsService { } } taskHeader.setPreTaskNo(preTaskNo); - boolean success = taskHeaderService.updateById(taskHeader); + boolean success = taskHeaderService.updatePreTaskNoById(preTaskNo, taskHeader.getId()); if (!success) { throw new JeecgBootException("更新任务状态失败"); } @@ -420,6 +420,7 @@ public class WcsServiceImpl implements WcsService { } @Override + @Transactional(rollbackFor = Exception.class) public Result cancelWcsTask(TaskHeader taskHeader) { WcsTask wcsTask = new WcsTask(); wcsTask.setTaskNo(String.valueOf(taskHeader.getId())); 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 86ff715..8cf5abf 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 @@ -305,6 +305,14 @@ public interface ITaskHeaderService extends IService<TaskHeader> { boolean updateStatusById(int status, int id); /** + * 更新状态 + * @param preTaskNo + * @param id + * @return + */ + boolean updatePreTaskNoById(int preTaskNo, int id); + + /** * 合并库存 * @param taskHeader * @return 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 67b80a3..e6299ab 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 @@ -2318,6 +2318,15 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea return success; } + @Override + public boolean updatePreTaskNoById(int preTaskNo, int id) { + TaskHeader taskHeader = new TaskHeader(); + taskHeader.setId(id); + taskHeader.setPreTaskNo(preTaskNo); + boolean success = taskHeaderService.updateById(taskHeader); + return success; + } + /** * 取消任务,恢复容器和库位状态 * @param taskHeader