diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java index fa7bcf8..4af34be 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -657,6 +657,7 @@ public class LoginController { /** * 通过用户名获取可以登陆的仓库列表 */ + @ApiOperation(value = "获取用户仓库", notes = "根据登录名查仓库") @PostMapping("/getWarehouseByUserCode") @ResponseBody public Result getWarehouseByUserCode(@RequestBody SysUser sysUser) diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java index d04cd0a..d411c24 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java @@ -403,7 +403,7 @@ public class TaskHeaderController extends JeecgController<TaskHeader, ITaskHeade @ApiOperation(value="任务表-创建空托入库任务", notes="任务表-创建空托入库任务") @PostMapping( "/createEmptyIn") @RequiresPermissions("taskHeader:emptyIn") - public Result createEmptyIn(@RequestBody TaskHeader taskHeader, HttpServletRequest req) { + public Result<TaskHeader> createEmptyIn(@RequestBody TaskHeader taskHeader, HttpServletRequest req) { String contaienrCode = taskHeader.getContainerCode(); String toLocationCode = taskHeader.getToLocationCode(); String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java index d99508e..e4cecea 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java @@ -102,7 +102,7 @@ public interface ITaskHeaderService extends IService<TaskHeader> { * @param warehouseCode * @return */ - Result createEmptyIn(String containerCode, String toLocationCode, String warehouseCode); + Result<TaskHeader> createEmptyIn(String containerCode, String toLocationCode, String warehouseCode); /** * 创建空托盘出库任务 diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java index 9730609..2fe280f 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java @@ -806,7 +806,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea */ @Override @Transactional(rollbackFor = Exception.class) - public Result createEmptyIn(String containerCode, String toLocationCode, String warehouseCode) { + public Result<TaskHeader> createEmptyIn(String containerCode, String toLocationCode, String warehouseCode) { if(StringUtils.isEmpty(containerCode)) { return Result.error("创建空托盘入库时, 托盘号为空"); } @@ -858,7 +858,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea if(!success) { throw new ServiceException("创建空托盘入库时,保存任务失败"); } - return Result.OK("创建空托盘入库任务成功"); + return Result.OK("创建空托盘入库任务成功", taskHeader); } /**