临时测试

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

@@ -235,7 +235,7 @@ public class TaskWorkNode {
                 //运行条件验证
                 Map conMap = checkCon(taskNode, tTask, queryMap);
 
-                if(null == taskNode.getResourceId()){
+                if("03".equals(taskNode.getInterfaceType())){
                     // agv搬运
                     Map agvData = new HashMap();
                     agvData.put("start",beforTaskNode.getTargetResourceId());

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

@@ -208,7 +208,6 @@ public class RobotNodeServiceImpl implements NodeOperationService {
             StockInfo metetailStockInfo = stockInfos.get(0);
             currStore = storgeMapper.selectById(metetailStockInfo.getStorgeId());
         }else{
-            currStore = workpieceService.getWorkPieceStock(taskNode.getId(), false);
             // 先判断上一指令是否为是否为设备指令，在判断工序最后一个指令是agv动作时锁定锁定agv接驳位
             TaskNode beforTaskNode = taskNodeService.getNextNTaskNode(taskNode,-1);
             TaskNode nextTaskNode = taskNodeService.getNextNTaskNode(taskNode,1);
@@ -217,6 +216,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
             beforTaskNode.setAutoNode(resourceAutoCodeMapper.selectById(beforTaskNode.getAutoNode().getId()));
             //前序是设备序并且最后一个节点是agv搬运，锁定agv相关库位信息
             if(beforTaskNode.getTaskId().equals(taskNode.getTaskId()) && "1".equals(beforTaskNode.getAutoNode().getCategory()) && null == lastOperationTaskNode.getResourceId()){
+                currStore = workpieceService.getWorkPieceStock(taskNode.getId(), false);
                 ProductionresourcePosition startProductionresourcePosition = null;
                 ProductionresourcePosition endProductionresourcePosition = null;
                 Storge agvStartStationStorge = null;