任务状态维护

xumiao
1 parent 36784ac8
Showing 3 changed files with 31 additions and 6 deletions
src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java
src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
src/main/java/com/huaheng/pc/config/pointPosition/service/PointPositionServiceImpl.java
@@ -161,6 +161,10 @@ public class AgvTaskController extends BaseController {
         if(pointPosition!=null&&StringUtils.isNotEmpty(pointPosition.getContainCode())){
              return AjaxResult.error("目标点位有托盘，请选择其他点位");
         }
+        AgvTask one = acsService.getOne(new LambdaQueryWrapper<AgvTask>().eq(AgvTask::getToPort, agvTask.getToPort()).lt(AgvTask::getStatus, QuantityConstant.TASK_STATUS_COMPLETED));
+        if(one!=null){
+            return AjaxResult.error("目标点位存在未完成的任务");
+        }
         return toAjax(acsService.updateById(agvTask));
     }
  
@@ -139,7 +139,8 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
             LambdaQueryWrapper<AgvTask> agvTaskLambdaQueryWrapper=Wrappers.lambdaQuery();
             agvTaskLambdaQueryWrapper.eq(AgvTask::getToPort,task.getToPort())
                     .eq(AgvTask::getWarehouseCode,task.getWarehouseCode())
-                    .ge(AgvTask::getStatus,QuantityConstant.TASK_STATUS_RELEASE);
+                    .ge(AgvTask::getStatus,QuantityConstant.TASK_STATUS_RELEASE)
+                    .lt(AgvTask::getStatus,QuantityConstant.TASK_STATUS_COMPLETED);
             List<AgvTask> list = list(agvTaskLambdaQueryWrapper);
             if(list!=null&&list.size()>0){
                return AjaxResult.error("目标点位存在任务，请更换目标点位");
@@ -218,7 +219,8 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
                 default:
                     break;
             }
-            cancelPositionAndContainerStatus(agvTask);
+            cancelPositionStatus(agvTask);
+            cancelContainerStatus(agvTask);
         }
         return AjaxResult.success("取消任务成功！");
     }
@@ -301,8 +303,22 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
         agvTask.setId(taskNo);
         agvTask.setCarNo(carNo);
         agvTask.setStatus(Integer.parseInt(status));
+        AgvTask task = getById(taskNo);
+        if(task==null)return AjaxResult.error("任务号"+taskNo+"不存在");
+        if(task.getStatus().equals(QuantityConstant.TASK_STATUS_COMPLETED))return AjaxResult.error("任务"+taskNo+"已经完成");
+        if(agvTask.getStatus().equals(QuantityConstant.TASK_STATUS_RUNNING)){
+            pointPositionService.updateStatus(task.getFromPort(),QuantityConstant.STATUS_POSITION_EMPTY,task.getWarehouseCode());
+            pointPositionService.setContainerCode(task.getFromPort(),null,task.getWarehouseCode());
+            updateById(agvTask);
+        }
         if(agvTask.getStatus().equals(QuantityConstant.TASK_STATUS_COMPLETED)){
-              cancelPositionAndContainerStatus(agvTask);
+            pointPositionService.updateStatus(task.getFromPort(),QuantityConstant.STATUS_POSITION_EMPTY,task.getWarehouseCode());
+            pointPositionService.updateStatus(task.getToPort(),QuantityConstant.STATUS_POSITION_SOME,task.getWarehouseCode());
+            pointPositionService.setContainerCode(task.getFromPort(),null,task.getWarehouseCode());
+            pointPositionService.setContainerCode(task.getToPort(),task.getContainerCode(),task.getWarehouseCode());
+            containerService.updateLocationCodeAndStatus(task.getContainerCode(),task.getToPort(),QuantityConstant.STATUS_CONTAINER_EMPTY,task.getWarehouseCode());
+            updateById(agvTask);
+            cancelContainerStatus(task);
         }
         if(!updateById(agvTask)){ throw new ServiceException("更新失败"); };
         return AjaxResult.success();
@@ -441,8 +457,8 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
         }
     }
  
-    //更新点位状态及容器状态
-    private void cancelPositionAndContainerStatus(AgvTask agvTask) {
+    //更新点位状态
+    private void cancelPositionStatus(AgvTask agvTask) {
         if (agvTask.getFromPort() != null) {
             //更新点位状态
             PointPosition pointPosition = pointPositionService.getOne(new LambdaQueryWrapper<PointPosition>().eq(PointPosition::getPositionName, agvTask.getFromPort()));
@@ -462,6 +478,10 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
  
             }
         }
+
+    }
+    //更新容器状态
+    private void cancelContainerStatus(AgvTask agvTask){
         LambdaQueryWrapper<InventoryHeader> inventoryHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
         inventoryHeaderLambdaQueryWrapper.eq(InventoryHeader::getContainerCode, agvTask.getContainerCode());
         InventoryHeader inventoryHeader = inventoryHeaderService.getOne(inventoryHeaderLambdaQueryWrapper);
@@ -477,6 +497,7 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
         containerService.update(container, containerUpdateWrapper);
     }
  
+
     //检查点位是否存在
     private AjaxResult checkPointPositionExist(AgvTask agvTask){
         PointPosition sourcePosition = pointPositionService.getPositionByCode(agvTask.getFromPort(), "CS0001");
@@ -33,7 +33,7 @@ public class PointPositionServiceImpl extends ServiceImpl&lt;PointPositionMapper, P
  
     @Override
     public void setContainerCode(String positionName, String containerCode, String warehouseCode) {
-        if(StringUtils.isNotEmpty(positionName)&&StringUtils.isNotEmpty(containerCode)){
+        if(StringUtils.isNotEmpty(positionName)){
             pointPositionMapper.setContainerCode(positionName,containerCode,warehouseCode);
         }
     }