소스 검색

临时测试

姚云青 3 년 전
부모
커밋
af83628a93
1개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 2
      imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

+ 3 - 2
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -507,8 +507,9 @@ public class TaskWorkNode {
 
                 Storge startStore = workpieceService.getWorkPieceStock(taskNode.getId(), false);
 
+                ProductionresourcePosition po = logical(robotList,targetStorge,zone);
                 //机器人手抓没被锁定,并且有空闲未知
-                if (logical(robotList,targetStorge,zone)!=null) {
+                if (po!=null) {
                     jqrStorge = storgeService.getById(jqrMap.get(DemoLineConstant.DEMOLINE_RJQR_ZS).get(0).getStorgeId());
                     jqrStorge.setCompleteBatchNo(task.getCompleteBatchNo());
                     storgeService.lockStorge(jqrStorge, taskNode.getId());
@@ -533,7 +534,7 @@ public class TaskWorkNode {
                     dataMap.put("Data", startStore);
                     dataMap.put("method", "MoveRobotPosition");
                 }
-                dataMap.put("result", logical(robotList,targetStorge,zone));
+                dataMap.put("result", po!=null);
             } else if (count == 1) {
                 jqrStorge = (Storge) msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_JXS + taskNode.getId());
                 dataMap.put("method", "GetServoStacker");