|
@@ -3,6 +3,7 @@ package com.ruoyi.ams.task.service.impl;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.google.common.collect.Lists;
|
|
@@ -427,7 +428,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
|
|
|
|
|
|
moveStartingPointToMiddleCache(wcsTask);
|
|
|
|
|
|
- wmsDocAsnSubService.wmsAgvCallbackOuttask(taskNo);
|
|
|
+ wmsDocAsnSubService.callbackWcsAgvOutTask(taskNo);
|
|
|
|
|
|
if (!StringUtils.isEmpty(wcsTask.getExt8())) {
|
|
|
redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()), wcsTask.getLocationFrom());
|
|
@@ -450,7 +451,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
|
|
|
|
|
|
updateInvAsnSoMarking(wcsTask);
|
|
|
|
|
|
- wmsDocAsnSubService.wmsAgvCallbackIntask(taskNo);
|
|
|
+ wmsDocAsnSubService.callbackWcsAgvInTask(taskNo);
|
|
|
|
|
|
if (!StringUtils.isEmpty(wcsTask.getExt8())) {
|
|
|
redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()));
|
|
@@ -519,7 +520,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
|
|
|
invLotLocIdMapper.moveInvByLocationId(locationFrom, middleCache, taskNo);
|
|
|
}
|
|
|
|
|
|
- baseLocationInfoService.updateLocationIdleAndEmpty(locationFrom, Constant.WAREHOUSE_ID, wcsTask.getUpdateBy());
|
|
|
+ baseLocationInfoService.updateLocationIdleAndEmpty(locationFrom, Constant.WAREHOUSE_ID, wcsTask.getUpdateUser());
|
|
|
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
@@ -557,10 +558,18 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
|
|
|
|
|
|
invLotLocIdMapper.moveInvByTraceIdOut(locationFrom, locationTo, taskNo);
|
|
|
|
|
|
- baseLocationInfoService.occupyLocation(locationTo, Constant.WAREHOUSE_ID, wcsTask.getUpdateBy());
|
|
|
+ baseLocationInfoService.occupyLocation(locationTo, Constant.WAREHOUSE_ID, wcsTask.getUpdateUser());
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public WcsTask selectWcsTask(String billNo, String taskType) {
|
|
|
+ LambdaQueryWrapper<WcsTask> queryWrapper = Wrappers.<WcsTask>lambdaQuery().eq(WcsTask::getExt1, billNo).eq(WcsTask::getWhTypeFrom, taskType);
|
|
|
+ List<WcsTask> wcsTaskList = wcsTaskMapper.selectList(queryWrapper);
|
|
|
+ return CollectionUtil.isNotEmpty(wcsTaskList) ? wcsTaskList.get(0) : new WcsTask();
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public Boolean updateTaskStatus(String billNo, String taskType, Integer sourceStatus, Integer targetStatus) {
|
|
|
LambdaUpdateWrapper<WcsTask> updateWrapper = Wrappers.<WcsTask>lambdaUpdate().set(WcsTask::getState, targetStatus)
|