机器人

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

@@ -36,6 +36,7 @@ import com.github.zuihou.tenant.service.ModuleService;
 import com.github.zuihou.tenant.service.ProductionresourceService;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -131,9 +132,6 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                 robotList = productionresourcePositionService.getFreeProductionresourcePositionByIds(deviceArr);
             }
         }
-        //获取机器人操作线边库
-        xbkArr = new String[]{DictionaryKey.YJ_ZONE_XBK.get(zoneName)};
-        xbkList = productionresourcePositionService.getFreeProductionresourcePositionByNos(xbkArr);
         //jbwArr = modules.stream().map(Module::getNo).toArray(String[]::new);
         // 获取机器人抓取、放可操作的接驳位(依据产线  待定)
 //        List<Productionresource> dataList = productionresourceService.list(new QueryWrapper<Productionresource>().like("name", robotType));
@@ -417,22 +415,39 @@ public class RobotNodeServiceImpl implements NodeOperationService {
         Map returnMap = new HashMap();
         Storge targetStorge = null;
         Long resourceId = taskNode.getResourceId();
+        String xbkFlag = "";
         //目标设备
         if(resourceId!=null){
             targetList = productionresourcePositionService.getFreeProductionresourcePositionByIds(new String[] {resourceId.toString()});
             if(CollectionUtil.isNotEmpty(targetList)){
                 targetStorge = storgeService.getById(targetList.get(0).getStorgeId());
                 returnMap.put("store",targetStorge);
-                returnMap.put("type","resource");
-
+                returnMap.put("bizType","common");
+            }else{//需要放到线边库
+                xbkFlag = "1";
             }
-        }else{//放到线边库
+        }else{//放到接驳位
             Map map = storgeService.getPlateStorgeByNo(zZone);
             targetStorge = map.get("storge") ==null?null:(Storge)map.get("storge");
             if(targetStorge!=null){
                 returnMap.put("store",targetStorge);
-                returnMap.put("type","xbk");
+                returnMap.put("bizType","common");
+            }else{//需要放到线边库
+                xbkFlag = "1";
+            }
+        }
+
+        if("1".equals(xbkFlag)){//最终放到线边库中
+            //获取机器人操作线边库
+            xbkArr = new String[]{DictionaryKey.YJ_ZONE_XBK.get(zoneName)};
+            xbkList = productionresourcePositionService.getFreeProductionresourcePositionByNos(xbkArr);
+            if(CollectionUtil.isNotEmpty(xbkList)){
+                ProductionresourcePosition position = xbkList.get(0);
+                targetStorge = storgeService.getById(position.getStorgeId());
+                returnMap.put("bizType","xbk");
             }
+
+
         }
         return returnMap;
     }