diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java index 5239b352..904cc287 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java @@ -951,17 +951,18 @@ public class AppTaskController extends BaseController * @param outRequest 出库请求 * @return 结果 */ - @ApiOperation("请求出库") + @ApiOperation("请求空托出库") @PostMapping("/createOutRequest") @Transactional(rollbackFor = Exception.class) @Anonymous public AjaxResult createOutRequest(@RequestBody TaskOutRequest outRequest) { - logger.info("请求出库:{}", JSON.toJSONString(outRequest)); + logger.info("请求空托出库:{}", JSON.toJSONString(outRequest)); // 判断请求数据完整性 - if (outRequest == null || StringUtils.isEmpty(outRequest.getGoodsId()) - || outRequest.getNeedNum() == null || outRequest.getNeedNum().compareTo(BigDecimal.ZERO) <= 0) { - return error("请求参数不完整。"); + if (outRequest.getNeedNum() == null || StringUtils.compare("0",outRequest.getGoodsId()) != 0 || + outRequest.getNeedNum().compareTo(BigDecimal.ZERO) <= 0) + { + return error("缺少必要参数或者物料编号有误,必须为0"); } handleOutRequest(outRequest); // if (totalNeedNum.compareTo(outRequest.getNeedNum()) == 0) { @@ -1026,9 +1027,9 @@ public class AppTaskController extends BaseController moveTask.setOrigin(moveLocation.getLocationId()); moveTask.setDestination(moveDestination.getLocationId()); moveTask.setCreateTime(new Date()); - moveTask.setOpUser("system"); + moveTask.setOpUser(getUsername()); appTaskService.insertAppTask(moveTask); - moveDestination.setIsWorking(1); +// moveDestination.setIsWorking(1); moveDestination.setLocationStatus(1); moveDestination.setVehicleId(moveLocation.getVehicleId()); appLocationService.updateAppLocation(moveDestination); @@ -1062,7 +1063,7 @@ public class AppTaskController extends BaseController outTask.setGoodsId(appStock.getGoodsId()); outTask.setOpNum(opNum); outTask.setStockNum(stockNum); - outTask.setOpUser("");// TODO 需要设定 + outTask.setOpUser(getUsername());// TODO 需要设定 outTask.setPreTask(preTaskId); outTask.setRemark(outRequest.getRemark()); appTaskService.insertAppTask(outTask);