diff --git a/src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java b/src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java index afc82fc..2c0b78e 100644 --- a/src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java +++ b/src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java @@ -138,7 +138,7 @@ public class AgvTaskController extends BaseController { @PostMapping("/emptyContainer") @ResponseBody @ApiLogger(apiName = "MES空托叫回") - public AjaxResult emptyContainer (AgvTask agvTask) { + public AjaxResult emptyContainer (@RequestBody AgvTask agvTask) { if(StringUtils.isEmpty(agvTask.getFromPort())){ return AjaxResult.error("起始点位为空"); } diff --git a/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java b/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java index c98f741..c6a5d8c 100644 --- a/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java +++ b/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java @@ -78,6 +78,8 @@ public class AcsServiceImpl extends ServiceImpl<AcsMapper,AgvTask> implements Ac */ @Resource + public AcsService acsService; + @Resource private ConfigService configService; @Resource private AddressService addressService; @@ -145,13 +147,21 @@ public class AcsServiceImpl extends ServiceImpl<AcsMapper,AgvTask> implements Ac } } agvTask.setStatus(QuantityConstant.TASK_STATUS_BUILD); - agvTask.setCreatedBy(ShiroUtils.getLoginName()); + if(StringUtils.isNotEmpty(ShiroUtils.getLoginName())){ + agvTask.setCreatedBy(ShiroUtils.getLoginName()); + }else { + agvTask.setCreatedBy(agvTask.getCreatedBy()); + } agvTask.setTaskType(QuantityConstant.STATUS_TASK_CARRY); agvTask.setCreatedTime(new Date()); agvTask.setUpdated(new Date()); - agvTask.setUpdatedBy(ShiroUtils.getLoginName()); + if(StringUtils.isNotEmpty(ShiroUtils.getLoginName())){ + agvTask.setUpdatedBy(ShiroUtils.getLoginName()); + }else { + agvTask.setUpdatedBy(agvTask.getCreatedBy()); + } agvTask.setWarehouseCode("CS0001"); - if (save(agvTask)) { + if (acsService.save(agvTask)) { if(StringUtils.isEmpty(agvTask.getPreTaskNo())){ agvPortService.updateStatus(agvTask.getFromPort(), QuantityConstant.STATUS_POSITION_LOCK); AgvPort desPosition = agvPortService.getAgvportByCode(agvTask.getToPort());