参数修改

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

@@ -425,7 +425,10 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     dataMap.put("method", "GetServoStacker");
                     Storge currentStore = workpieceService.getWorkPieceStock(taskNode.getId(), false);
                     dataMap.put("fromStorge", currentStore);
-                    dataMap.put("Data", currentStore);
+
+                    Map locationMap = new HashMap();
+                    locationMap.put("location",currentStore);
+                    dataMap.put("Data", locationMap);
                     //出入库类型
                     dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
                     //目的地为机器人手臂
@@ -439,7 +442,11 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
                     //目的地为机器人手臂
                     Storge hcwStorge = (Storge) msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_HCW + taskNode.getId());
-                    dataMap.put("Data", hcwStorge);
+
+                    Map locationMap = new HashMap();
+                    locationMap.put("location",hcwStorge);
+                    dataMap.put("Data", locationMap);
+
                     dataMap.put("toStorge", hcwStorge);
                     dataMap.put("result", true);
                 }
@@ -458,7 +465,11 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     jqrStorge = storgeService.getById(robotList.get(0).getStorgeId());
 
                     dataMap.put("fromStorge", startStore);
-                    dataMap.put("Data", startStore);
+
+                    Map locationMap = new HashMap();
+                    locationMap.put("location",startStore);
+                    dataMap.put("Data", locationMap);
+
                     //出入库类型
                     dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
                     //目的地为机器人手臂
@@ -492,12 +503,20 @@ public class RobotNodeServiceImpl implements NodeOperationService {
             if(BizConstant.ROBOT_TYPE_CACHE.equals(zoneService.getRobotTypebyZone(zoneName))){
                 dataMap.put(YunjianConstant.YUNJIAN_XBK_CACHE_FLAG, "1");
                 if(count==0) {
-                    dataMap.put("Data", targetStorge);
+                    Map locationMap = new HashMap();
+                    locationMap.put("location",targetStorge);
+                    dataMap.put("Data", locationMap);
+
+
                     dataMap.put("method", "MoveRobotPosition");
                 }else if(count == 1){//从缓存位拿出来
                     dataMap.put("method", "GetServoStacker");
                     Storge hcwStorge = (Storge)msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_HCW + taskNode.getId());
-                    dataMap.put("Data", hcwStorge);
+
+                    Map locationMap = new HashMap();
+                    locationMap.put("location",hcwStorge);
+                    dataMap.put("Data", locationMap);
+
                     dataMap.put("fromStorge", hcwStorge);
                     Storge handStorge = (Storge)msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_JXS + taskNode.getId());
                     dataMap.put("toStorge", handStorge);
@@ -507,7 +526,11 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     dataMap.put("method", "SendServoStacker");
                     //出入库类型
                     dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE,DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
-                    dataMap.put("Data", targetStorge);
+
+                    Map locationMap = new HashMap();
+                    locationMap.put("location",targetStorge);
+                    dataMap.put("Data", locationMap);
+
                     dataMap.put("toStorge", targetStorge);
 
                     Storge handStorge = (Storge)msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_JXS + taskNode.getId());
@@ -522,7 +545,11 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                 dataMap.put("zkIp",ZK_ip_zndy);
                 dataMap.put("method", "SendServoStacker");
                 dataMap.put("toStorge", targetStorge);
-                dataMap.put("Data", targetStorge);
+
+                Map locationMap = new HashMap();
+                locationMap.put("location",targetStorge);
+                dataMap.put("Data", locationMap);
+
                 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)){