|
@@ -507,8 +507,9 @@ public class TaskWorkNode {
|
|
|
|
|
|
Storge startStore = workpieceService.getWorkPieceStock(taskNode.getId(), false);
|
|
|
|
|
|
+ ProductionresourcePosition po = logical(robotList,targetStorge,zone);
|
|
|
//机器人手抓没被锁定,并且有空闲未知
|
|
|
- if (logical(robotList,targetStorge,zone)!=null) {
|
|
|
+ if (po!=null) {
|
|
|
jqrStorge = storgeService.getById(jqrMap.get(DemoLineConstant.DEMOLINE_RJQR_ZS).get(0).getStorgeId());
|
|
|
jqrStorge.setCompleteBatchNo(task.getCompleteBatchNo());
|
|
|
storgeService.lockStorge(jqrStorge, taskNode.getId());
|
|
@@ -533,7 +534,7 @@ public class TaskWorkNode {
|
|
|
dataMap.put("Data", startStore);
|
|
|
dataMap.put("method", "MoveRobotPosition");
|
|
|
}
|
|
|
- dataMap.put("result", logical(robotList,targetStorge,zone));
|
|
|
+ dataMap.put("result", po!=null);
|
|
|
} else if (count == 1) {
|
|
|
jqrStorge = (Storge) msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + YunjianConstant.YUNJIAN_JXS + taskNode.getId());
|
|
|
dataMap.put("method", "GetServoStacker");
|