点位任务限制

xumiao
1 parent 4f483e95
Showing 4 changed files with 18 additions and 15 deletions
src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
src/main/java/com/huaheng/framework/config/ShiroConfig.java
src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
@@ -144,6 +144,13 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
             //校验自己生成的任务中源点位的托盘和实际托盘一不一致
             checkContainerAndPositionLove(agvTask);
         }
+        List<String> list = Arrays.asList("Work 679","Work 680","Work 681","Work 682");
+        if(list.contains(agvTask.getFromPort())&&agvTask.getToPort().equals("Work 842")){
+            return AjaxResult.error("不能下推");
+        }
+        if(agvTask.getToPort().equals("Work 831")||agvTask.getFromPort().equals("Work 830")){
+            return AjaxResult.error("不能下");
+        }
         if(agvTask.getToPort().replace(" ","").toLowerCase().equals("work680")){
             AjaxResult ajaxResult = checkP6001Status();
             if(ajaxResult.hasErr()){
@@ -274,6 +274,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/agv/createAGVTask","anon");
         filterChainDefinitionMap.put("/agv/emptyContainer","anon");
         filterChainDefinitionMap.put("/MES/**","anon");
+        filterChainDefinitionMap.put("/config/container/getEmptyContainerMany","anon");
+        filterChainDefinitionMap.put("/config/container/EmptyContainerManyOut","anon");
  
         filterChainDefinitionMap.put("/transmissionLine/getContainerCode","anon");
         filterChainDefinitionMap.put("/transmissionLine/setContainerCode","anon");
@@ -251,10 +251,10 @@ public class ContainerController extends BaseController {
     @PostMapping( "/EmptyContainerManyOut")
     @ResponseBody
     public AjaxResult EmptyContainerManyOut(Container container) {
-        if(StringUtils.isNotEmpty(container.getCode())){
+        if(StringUtils.isEmpty(container.getCode())){
            return AjaxResult.error("托盘号为空");
         }
-        if(StringUtils.isNotEmpty(container.getPort())){
+        if(StringUtils.isEmpty(container.getPort())){
             return AjaxResult.error("出库口为空");
         }
         AjaxResult ajaxResult = inventoryService.createEmptyContainerManyOut(container);
@@ -194,7 +194,7 @@ public class RyTask extends BaseController {
             System.out.println("===============================自动下发任务===========" + new Date().toString());
             LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
             taskHeaderLambdaQueryWrapper.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_BUILD)
-                    .eq(TaskHeader::getExceptionCode, "").last(" limit 3");
+                    .eq(TaskHeader::getExceptionCode, "").last(" order by case taskType when 800 then 1 else 2 end , taskType desc limit 3");
             List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
             for (TaskHeader taskHeader : taskHeaderList) {
                 try{
@@ -224,18 +224,12 @@ public class RyTask extends BaseController {
             if(CollectionUtils.isNotEmpty(agvTasks)){
                 for (AgvTask agvTask : agvTasks) {
                     try{
-//                        if(agvTask.getToPort().equals("Work 633")){
-//                            List<AgvTask> list = acsService.list(new LambdaQueryWrapper<AgvTask>().eq(AgvTask::getToPort, "Work 633").ge(AgvTask::getStatus, 10).lt(AgvTask::getStatus, 100));
-//                            if(CollectionUtils.isNotEmpty(list)&&list.size()>=2){
-//                                continue;
-//                            }
-//                        }
-//                        if(agvTask.getToPort().equals("Work 776")){
-//                            List<AgvTask> list = acsService.list(new LambdaQueryWrapper<AgvTask>().eq(AgvTask::getToPort, "Work 776").ge(AgvTask::getStatus, 10).lt(AgvTask::getStatus, 100));
-//                            if(CollectionUtils.isNotEmpty(list)&&list.size()>=2){
-//                                continue;
-//                            }
-//                        }
+                        if(agvTask.getToPort().equals("Work 633")){
+                            List<AgvTask> list = acsService.list(new LambdaQueryWrapper<AgvTask>().eq(AgvTask::getToPort, "Work 633").ge(AgvTask::getStatus, 10).lt(AgvTask::getStatus, 100));
+                            if(CollectionUtils.isNotEmpty(list)&&list.size()>=2){
+                                continue;
+                            }
+                        }
                         acsService.sendTaskToAGV(Convert.toIntArray(agvTask.getId().toString()));
                     }catch (Exception e){
                         e.printStackTrace();