云箭代码适配示范线

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

@@ -13,6 +13,7 @@ import com.github.zuihou.business.edgeLibrary.entity.StockInfo;
 import com.github.zuihou.business.edgeLibrary.entity.Storge;
 import com.github.zuihou.business.edgeLibrary.service.StorgeService;
 import com.github.zuihou.business.externalApi.service.AgvHikOrderInfoService;
+import com.github.zuihou.business.externalApi.service.ExternalApiService;
 import com.github.zuihou.business.operationManagementCenter.dao.*;
 import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
@@ -144,7 +145,8 @@ public class TaskWorkNode {
     private BBomMapper bBomMapper;
     @Autowired
     private BomProcedureMapper bomProcedureMapper;
-
+    @Autowired
+    private ExternalApiService externalApiService;
 
     //总控端口
     private final String ZK_port = "120";
@@ -329,6 +331,9 @@ public class TaskWorkNode {
                                 //缓存执行当前节点传参
                                 msgUtil.redis_set(CacheKey.TASK_CURRENT_NODE_PARAMS + "_" + taskNode.getId(), agvParam.toJSONString());
                                 R addHikTask = agvHikOrderInfoService.addHikTask(agvData);
+
+//                                R addAgvTask = externalApiService.processTransferJob(agvData);
+
                             }
                         } else {
                             if (!"04".equals(taskNode.getInterfaceType())) {
@@ -1131,7 +1136,7 @@ public class TaskWorkNode {
     private long getLikuStockInList(){
         List <StockInfo> returnList = null;
 
-        List<Productionresource> productionresources = productionresourceBizMapper.selectList(Wraps.<Productionresource>lbQ().like(Productionresource::getName,"立库"));
+        List<Productionresource> productionresources = productionresourceBizMapper.selectList(Wraps.<Productionresource>lbQ().like(Productionresource::getCode,DictionaryKey.YJ_ZONE_XBK.get("plateAndClamp")));
         List<Long> productionresourceIds = productionresources.stream().map(t->t.getId()).collect(Collectors.toList());
 
         if(CollectionUtil.isEmpty(productionresourceIds)){

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

@@ -12,7 +12,9 @@ import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
 import com.github.zuihou.business.operationManagementCenter.entity.TaskNode;
 import com.github.zuihou.business.operationManagementCenter.service.TaskNodeService;
 import com.github.zuihou.business.operationManagementCenter.service.WorkpieceService;
+import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourceBizMapper;
 import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourcePositionMapper;
+import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
 import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.productionResourceCenter.entity.ResourceAutoCode;
 import com.github.zuihou.business.productionResourceCenter.entity.ZZoneProductionresource;
@@ -61,6 +63,8 @@ public class AGVNodeServiceImpl implements NodeOperationService {
 
     @Autowired
     private ZZoneProductionresourceService zZoneProductionresourceService;
+    @Autowired
+    private ProductionresourceBizMapper productionresourceBizMapper;
 
     private ProductionresourcePosition productionresourcePosition;
     private String[] jbwarr = null;
@@ -99,11 +103,13 @@ public class AGVNodeServiceImpl implements NodeOperationService {
         ProductionresourcePosition startPosition = productionresourcePositionMapper.selectOne(Wraps.<ProductionresourcePosition>lbQ().eq(ProductionresourcePosition::getResourceId,beforTaskNode.getTargetResourceId()));
         ProductionresourcePosition endPosition = productionresourcePositionMapper.selectOne(Wraps.<ProductionresourcePosition>lbQ().eq(ProductionresourcePosition::getResourceId,taskNode.getTargetResourceId()));
 
+        Productionresource startProductionresource = productionresourceBizMapper.selectById(startPosition.getResourceId());
+        Productionresource endProductionresource = productionresourceBizMapper.selectById(endPosition.getResourceId());
 
         Storge fstorge = storgeService.getOne(Wraps.<Storge>lbQ().eq(Storge::getId,startPosition.getStorgeId()));
         Storge tstorge = storgeService.getOne(Wraps.<Storge>lbQ().eq(Storge::getId,endPosition.getStorgeId()));
-        map.put("start", fstorge.getPointId().toString());
-        map.put("goal", tstorge.getPointId().toString());
+        map.put("start", startProductionresource.getCode());
+        map.put("goal", endProductionresource.getCode());
         map.put("transferType", "agv");
         //此数据用来业务回传
         map.put("fromStorge", fstorge);

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

@@ -255,6 +255,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                 dataMap = this.commandHandle(dataMap,agvStartStationStorge, functionName);
                 dataMap.put("deviceUrl", ZK_ip_rxx);
                 break;
+            default:
+                dataMap = this.commandHandle(dataMap,agvStartStationStorge, functionName);
         }
         dataMap.put("url",plcInfo.get("url"));
         dataMap.put("port",plcInfo.get("port"));
@@ -762,7 +764,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
     private List<StockInfo>getLikuStockList(TTask task){
         List <StockInfo> returnList = null;
 
-        List<Productionresource> productionresources = productionresourceBizMapper.selectList(Wraps.<Productionresource>lbQ().like(Productionresource::getName,"立库"));
+        List<Productionresource> productionresources = productionresourceBizMapper.selectList(Wraps.<Productionresource>lbQ().like(Productionresource::getCode,DictionaryKey.YJ_ZONE_XBK.get("plateAndClamp")));
         List<Long> productionresourceIds = productionresources.stream().map(t->t.getId()).collect(Collectors.toList());
         List<ProductionresourcePosition> startProductionresourcePositions = productionresourcePositionMapper.selectList(Wraps.<ProductionresourcePosition>lbQ().in(ProductionresourcePosition::getResourceId, productionresourceIds));
         List<Long> startProductionresourcePositionIds = startProductionresourcePositions.stream().map(t->t.getStorgeId()).collect(Collectors.toList());
@@ -798,7 +800,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
     private long getLikuStockInList(){
         List <StockInfo> returnList = null;
 
-        List<Productionresource> productionresources = productionresourceBizMapper.selectList(Wraps.<Productionresource>lbQ().like(Productionresource::getName,"立库"));
+        List<Productionresource> productionresources = productionresourceBizMapper.selectList(Wraps.<Productionresource>lbQ().like(Productionresource::getCode,DictionaryKey.YJ_ZONE_XBK.get("plateAndClamp")));
         List<Long> productionresourceIds = productionresources.stream().map(t->t.getId()).collect(Collectors.toList());
 
         if(CollectionUtil.isEmpty(productionresourceIds)){

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

@@ -679,9 +679,10 @@ public class ZZoneServiceImpl extends SuperServiceImpl<ZZoneMapper, ZZone> imple
 
     @Override
     public String getRobotTypebyZone(String zoneName) {
-        if(zoneName.indexOf("舱体")>=0||zoneName.indexOf("框体")>=0){
+        // TODO 20220705 for 后续机器人是否存在缓存位改成动态
+        if(zoneName.indexOf("舱体")>=0||zoneName.indexOf("框体")>=0 ||zoneName.contains("柔性")){
             return BizConstant.ROBOT_TYPE_CACHE;
-        }else if(zoneName.indexOf("保障")>0){
+        }else if(zoneName.indexOf("保障")>0 || zoneName.contains("质量中心")){
             return BizConstant.ROBOT_TYPE_NOCACHE;
         }
         return "";

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/edgeLibrary/StockInfoMapper.xml

@@ -199,7 +199,7 @@
             ON ippp.storge_id = issi.storge_id
         WHERE ippp.resource_id IN (${resourceIds})
         AND issi.storge_id IS NULL
-        AND ippp.status = '1'
+        AND ippp.status = '0'
         ORDER BY ippp.storge_id
     </select>
 </mapper>

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionResourceCenter/ProductionresourcePositionMapper.xml

@@ -55,7 +55,7 @@
         <if test="goodsName != null and goodsName != ''">
             left join view_stock_goods b on i.spec_id = b.specId
         </if>
-        where 1=1 AND p.status = '1'
+        where 1=1 AND p.status = '0'
         <if test="haveGoods != null and haveGoods != ''">
             and i.storge_id is not null
         </if>

imcs-admin-boot/imcs-tenant-biz/src/main/java/com/github/zuihou/tenant/service/impl/ProductionresourceServiceImpl.java

@@ -1071,7 +1071,7 @@ public class ProductionresourceServiceImpl extends SuperCacheServiceImpl<Product
 
     @Override
     public List<Map> getStations(Map params){
-        params.put("name","保障中心_上下料站");
+        params.put("name","上下料站");
         return baseMapper.getStations(params);
     }