소스 검색

fix:修改mes任务接受数据

wang.sq@aliyun.com 1 개월 전
부모
커밋
e6e49479b0

+ 3 - 1
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/ToolTaskServiceImpl.java

@@ -188,6 +188,7 @@ public class ToolTaskServiceImpl extends SuperCacheServiceImpl<ToolTaskMapper, T
             cuttingToolPositionList = machineCuttingTools.stream().map(item->item.getCuttingToolPosition().replace("1.", "")).collect(Collectors.toList());
         }
 
+
         // 获取临时表订单所占刀位信息
         List<OrderTask> orderTasks = orderTaskService.list();
         List<String> orderTaskList = new ArrayList<>();
@@ -195,7 +196,8 @@ public class ToolTaskServiceImpl extends SuperCacheServiceImpl<ToolTaskMapper, T
             orderTaskList = orderTasks.stream().map(item -> item.getCutGoalNo().replace("1.", "")).collect(Collectors.toList());
         }
 
-        //过滤进行中被锁定的刀位号
+
+        //过滤有任务的被锁定的刀位号
         List<CuttingToolApply> cuttingToolApplies = cuttingToolApplyService.list(new LbqWrapper<CuttingToolApply>().ne(CuttingToolApply::getProcessStatus, "3"));
         List<String> runApplyList = new ArrayList<>();
         if(!cuttingToolApplies.isEmpty()){