参数修改

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

@@ -1270,7 +1270,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
         String taskNodeId = bean.getTaskNodeId() == null ? "" : bean.getTaskNodeId().toString();
 
         //接口不让传多余参数，只能从缓存传
-        String jsonParam = msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_JXS + taskNodeId)==null?"":msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_JXS + taskNodeId).toString();
+        String jsonParam = msgUtil.redis_get(YunjianConstant.YUNJIAN_CALLBACK_PARAM+"_" + taskNodeId)==null?"":msgUtil.redis_get(YunjianConstant.YUNJIAN_CALLBACK_PARAM+"_" + taskNodeId).toString();
 
 
         Object taskInfoObject = msgUtil.redis_get(taskNodeId);
@@ -1337,8 +1337,8 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
 
         updateBizStatus(taskNode, task, taskNodeList, lg, callBackJson, r);
 
-        //websocket推送
-        msgUtil.pushTask(task);
+        //websocket推送TODO临时注释
+//        msgUtil.pushTask(task);
 
         //推送到消息队列
         msgUtil.pushToNextMq(taskNode, task, taskNodeList, n, callBackJson);

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

@@ -467,14 +467,14 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                 if (po!=null) {//机器人只有一只手
                     jqrStorge = storgeService.getById(robotList.get(0).getStorgeId());
 
-                    dataMap.put("fromStorge", startStore);
+                    dataMap.put("fromStorge", targetStorge);
 
                     Map locationMap = new HashMap();
                     locationMap.put("location",targetStorge.getPointId());
                     dataMap.put("data", locationMap);
                     // TODO 有问题，需要区分是否是第一步上料
                     //出入库类型
-                    dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
+                    dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_TRAY_CRK);
                     //目的地为机器人手臂
                     dataMap.put("toStorge", jqrStorge);