Ver Fonte

修改bug

姚云青 há 3 anos atrás
pai
commit
e950fe3645

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

@@ -704,7 +704,7 @@ public class TaskWorkNode {
 
                     //满足条件--机器人空闲,设备或线边库有一个空闲
                     Map locationMap = new HashMap();
-                    locationMap.put("location", startStore);
+                    locationMap.put("location", startStore.getPointId());
                     dataMap.put("data", locationMap);
 
                     dataMap.put("method", "MoveRobotPosition");
@@ -717,7 +717,7 @@ public class TaskWorkNode {
                 dataMap.put("fromStorge", currentStore);
 
                 Map locationMap = new HashMap();
-                locationMap.put("location", currentStore);
+                locationMap.put("location", currentStore.getPointId());
                 dataMap.put("data", locationMap);
                 //出入库类型
                 dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
@@ -734,7 +734,7 @@ public class TaskWorkNode {
                 Storge hcwStorge = (Storge) msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_HCW + taskNode.getId());
 
                 Map locationMap = new HashMap();
-                locationMap.put("location", hcwStorge);
+                locationMap.put("location", hcwStorge.getPointId());
                 dataMap.put("data", locationMap);
 
                 dataMap.put("toStorge", hcwStorge);
@@ -742,7 +742,7 @@ public class TaskWorkNode {
             }
             if (count == 3) {
                 Map locationMap = new HashMap();
-                locationMap.put("location", targetStorge);
+                locationMap.put("location", targetStorge.getPointId());
                 dataMap.put("Data", locationMap);
 
                 dataMap.put("method", "MoveRobotPosition");
@@ -751,7 +751,7 @@ public class TaskWorkNode {
                 Storge hcwStorge = (Storge) msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_HCW + taskNode.getId());
 
                 Map locationMap = new HashMap();
-                locationMap.put("location", hcwStorge);
+                locationMap.put("location", hcwStorge.getPointId());
                 dataMap.put("data", locationMap);
 
                 dataMap.put("fromStorge", hcwStorge);
@@ -765,7 +765,7 @@ public class TaskWorkNode {
                 dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
 
                 Map locationMap = new HashMap();
-                locationMap.put("location", targetStorge);
+                locationMap.put("location", targetStorge.getPointId());
                 dataMap.put("data", locationMap);
 
                 dataMap.put("toStorge", targetStorge);
@@ -790,7 +790,7 @@ public class TaskWorkNode {
                     dataMap.put("fromStorge", startStore);
 
                     Map locationMap = new HashMap();
-                    locationMap.put("location", startStore);
+                    locationMap.put("location", startStore.getPointId());
                     dataMap.put("data", locationMap);
                     //出入库类型
                     dataMap.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_ALL_CRK);
@@ -812,7 +812,7 @@ public class TaskWorkNode {
             } else if (count == 1) {
                 targetStorge = msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_STORE + taskNode.getId()) == null ? null : (Storge) msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_STORE + taskNode.getId());
                 dataMap.put("method", "SendServoStacker");
-                dataMap.put("toStorge", targetStorge);
+                dataMap.put("toStorge", targetStorge.getPointId());
 
                 Map locationMap = new HashMap();
                 locationMap.put("location", targetStorge);