翻面初步

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

@@ -183,6 +183,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
         //this.sxlzIdArr = new String[] {DemoLineConstant.JQR1};
         String moduleName = dataMap.get("moduleName") == null ? "" : dataMap.get("moduleName").toString();
         String robotType = dataMap.get("robotType") == null ? "" : dataMap.get("robotType").toString();
+
         ZZoneProductionresource zoneProductionresource = zZoneProductionresourceMapper.selectOne(Wraps.<ZZoneProductionresource>lbQ().eq(ZZoneProductionresource::getResourceId,taskNode.getResourceId()));
         if(StringUtil.isNotEmpty(moduleName)) {
             //List<Module> modules = moduleService.list(new QueryWrapper<Module>().like("name", moduleName));
@@ -765,7 +766,12 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                 if(taskNode.getCompleteBatchSort()==2){//TODO 条件后续再丰富
                     dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_TRAY_CRK);
                 }else {
-                    dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
+                    String bizType = dataMap.get("bizType") == null ? "" : dataMap.get("bizType").toString();
+                    if("3".equals(bizType)){//翻面。
+                        dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_TRAY_CRK);
+                    }else{
+                        dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
+                    }
                 }
                 String targetxbk =(String)msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_XBK_FLAG + taskNode.getId());
                 if("1".equals(targetxbk)){
@@ -863,7 +869,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
         Storge targetStorge = null;
         int count = Integer.parseInt(dataMap.get(taskNode.getId().toString() + "count") == null ? "0" : dataMap.get(taskNode.getId().toString() + "count").toString());
         Long resourceId = null;
-        if(count==0){//先
+        if(count==0){//把托盘夹具挪到空的线边库
             //获取机器人操作线边库
             String xbkKey = zoneName+"-"+bomzZone.getNo();
             xbkArr = DictionaryKey.YJ_ZONE_XBK.get(xbkKey).split(",");
@@ -881,7 +887,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
             returnMap.put("storeResourceId",position.getResourceId());
             returnMap.put("store",targetStorge);
 
-        }else if(count==4){//到线边库
+        }else if(count==4){//到上下料站
             //获取翻面工序的托盘夹具
             resourceId = taskNode.getTargetResourceId();
             targetList = productionresourcePositionService.getFreeProductionresourcePositionByIds(new String[] {resourceId.toString()});

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/util/MsgUtil.java

@@ -547,7 +547,7 @@ public class MsgUtil implements ApplicationContextAware {
                     }
             }else if(callBackJson.containsKey(BizConstant.MQ_TASK_NODE_TYPE_VIRTUALLY)){//翻面
                 int count =  callBackJson.getString(taskNode.getId().toString()+"count")==null?-1:Integer.parseInt(callBackJson.getString(taskNode.getId().toString()+"count"));
-                int limit =5;
+                int limit =6;
                 if(count<limit){//
                     count = ++count;
                     //把当前节点推送到mq