wms / wms_guangzhouwanbao · Commits

Commit 7e245086049233afc632b9de9a10d80b28101399

Authored by xumiao
1 parent a7449a00

edit

Inline Side-by-side
Showing 2 changed files with 14 additions and 4 deletions
src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java
  View file @7e24508
... ... @@ -138,7 +138,7 @@ public class AgvTaskController extends BaseController {
138 138 @PostMapping("/emptyContainer")
139 139 @ResponseBody
140 140 @ApiLogger(apiName = "MES空托叫回")
141   - public AjaxResult emptyContainer (AgvTask agvTask) {
  141 + public AjaxResult emptyContainer (@RequestBody AgvTask agvTask) {
142 142 if(StringUtils.isEmpty(agvTask.getFromPort())){
143 143 return AjaxResult.error("起始点位为空");
144 144 }
... ...
src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
  View file @7e24508
... ... @@ -78,6 +78,8 @@ public class AcsServiceImpl extends ServiceImpl<AcsMapper,AgvTask> implements Ac
78 78 */
79 79  
80 80 @Resource
  81 + public AcsService acsService;
  82 + @Resource
81 83 private ConfigService configService;
82 84 @Resource
83 85 private AddressService addressService;
... ... @@ -145,13 +147,21 @@ public class AcsServiceImpl extends ServiceImpl<AcsMapper,AgvTask> implements Ac
145 147 }
146 148 }
147 149 agvTask.setStatus(QuantityConstant.TASK_STATUS_BUILD);
148   - agvTask.setCreatedBy(ShiroUtils.getLoginName());
  150 + if(StringUtils.isNotEmpty(ShiroUtils.getLoginName())){
  151 + agvTask.setCreatedBy(ShiroUtils.getLoginName());
  152 + }else {
  153 + agvTask.setCreatedBy(agvTask.getCreatedBy());
  154 + }
149 155 agvTask.setTaskType(QuantityConstant.STATUS_TASK_CARRY);
150 156 agvTask.setCreatedTime(new Date());
151 157 agvTask.setUpdated(new Date());
152   - agvTask.setUpdatedBy(ShiroUtils.getLoginName());
  158 + if(StringUtils.isNotEmpty(ShiroUtils.getLoginName())){
  159 + agvTask.setUpdatedBy(ShiroUtils.getLoginName());
  160 + }else {
  161 + agvTask.setUpdatedBy(agvTask.getCreatedBy());
  162 + }
153 163 agvTask.setWarehouseCode("CS0001");
154   - if (save(agvTask)) {
  164 + if (acsService.save(agvTask)) {
155 165 if(StringUtils.isEmpty(agvTask.getPreTaskNo())){
156 166 agvPortService.updateStatus(agvTask.getFromPort(), QuantityConstant.STATUS_POSITION_LOCK);
157 167 AgvPort desPosition = agvPortService.getAgvportByCode(agvTask.getToPort());
... ...