机器人多个缓存位逻辑修改，三坐标滑台逻辑节点增加标志区分

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

@@ -980,7 +980,7 @@ public class TaskWorkNode {
                     String jqrHcwPartPriotyExec = (null == msgUtil.redis_get(DemoLineConstant.JQR_HCW_PART_PRIOTY_EXEC_FLAG + taskNode.getId())) ? "" : (String)msgUtil.redis_get(DemoLineConstant.JQR_HCW_PART_PRIOTY_EXEC_FLAG + taskNode.getId());
                     logger.info("节点{}是否存在当前缓存位上工件先放到目标设备标志{}",taskNode.getId(),jqrHcwPartPriotyExec);
                     if("1".equals(jqrHcwPartPriotyExec)){
-                        robotList = productionresourcePositionMapper.selectList(Wraps.<ProductionresourcePosition>lbQ().eq(ProductionresourcePosition::getResourceId,taskNode.getResourceId().toString()).eq(ProductionresourcePosition::getPointId,DemoLineConstant.DEMOLINE_RJQR_ZS).eq(ProductionresourcePosition::getStatus,"0"));
+                        robotList = productionresourcePositionMapper.selectList(Wraps.<ProductionresourcePosition>lbQ().eq(ProductionresourcePosition::getResourceId,taskNode.getResourceId()).eq(ProductionresourcePosition::getPointId,DemoLineConstant.DEMOLINE_RJQR_ZS).eq(ProductionresourcePosition::getStatus,"0"));
                     }else{
                         robotList = productionresourcePositionService.getFreeProductionresourcePositionByIds(new String[]{taskNode.getResourceId().toString()});
                     }
@@ -1007,9 +1007,9 @@ public class TaskWorkNode {
                         targetStorge = returnMap.get("store") == null ? null : (Storge) returnMap.get("store");
 
                         if(null != targetStorge){
-                            jqrStorge = storgeService.getById(jqrMap.get(DemoLineConstant.DEMOLINE_RJQR_ZS).get(0).getStorgeId());
-                            jqrStorge.setCompleteBatchNo(task.getCompleteBatchNo());
-                            storgeService.lockStorge(jqrStorge, taskNode.getId());
+//                            jqrStorge = storgeService.getById(jqrMap.get(DemoLineConstant.DEMOLINE_RJQR_ZS).get(0).getStorgeId());
+//                            jqrStorge.setCompleteBatchNo(task.getCompleteBatchNo());
+//                            storgeService.lockStorge(jqrStorge, taskNode.getId());
 
                             //锁定目标库位
                             targetStorge.setCompleteBatchNo(task.getCompleteBatchNo());

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/MachineNodeServiceImpl.java

@@ -361,6 +361,10 @@ public class MachineNodeServiceImpl implements NodeOperationService {
                     if("1".equals(procedure.getThreeDimensionalDeviationConf())){
                         data.put("workId", task.getCompleteBatchNo() + "-" + task.getProcedureNo());
                         data.put("workType", procedure.getThreeDimensionalDeviationPrograme());
+                        // begin modify by yejian on 20220928 for 更新tasknode表中nodetype，方便三坐标工件坐标系测量后更新坐标系偏移量表
+                        taskNode.setNodeType("5");
+                        taskNodeService.updateById(taskNode);
+                        // end modify by yejian on 20220928 for 更新tasknode表中nodetype，方便三坐标工件坐标系测量后更新坐标系偏移量表
                     }
 //                    String unionCode = workpieceService.getUnionCode(task.getCompleteBatchNo());
 

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/RobotNodeServiceImpl.java

@@ -373,6 +373,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     if(CollectionUtil.isNotEmpty(flikustockInfos)){//
                         startStore = storgeMapper.selectById(flikustockInfos.get(0).getStorgeId());
                     }
+                    log.info("节点{}查找机器人可用{}",taskNode.getId(),robotList.stream().map(t->t.getPointId()).collect(Collectors.toList()));
                     log.info("节点{}查找物料所在位子{}",taskNode.getId(),startStore.getPointId());
                     // begin modify by yejian on 20220510 for 条件检验先检查机器人，在检查目标库位
                     ProductionresourcePosition po = logical(robotList,flikustockInfos,taskNode);

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/TaskNode.java

@@ -76,7 +76,7 @@ public class TaskNode extends Entity<Long> {
      * 编号
      */
     @ApiModelProperty(value = "节点类型")
-    @Length(max = 32, message = "节点类型(1-普通节点2-上下料节点3-质检节点)")
+    @Length(max = 32, message = "节点类型(1-普通节点2-上下料节点3-质检节点4-翻面5-工件坐标徐测量)")
     @TableField(value = "node_type", condition = LIKE)
     @Excel(name = "节点类型")
     private String nodeType;