|
|
@@ -240,6 +240,7 @@ public class CacheRobotStrategy implements RobotStrategy {
|
|
|
hcwStorge = startStorge;
|
|
|
}
|
|
|
Object hcwExecFlag = msgUtil.redis_get(DemoLineConstant.JQR_HCW_PART_PRIOTY_EXEC_FLAG + taskNode.getId());
|
|
|
+ Object hcwXbkFlag = msgUtil.redis_get(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_HCW_XBK_FLAG + taskNode.getId());
|
|
|
|
|
|
//暂存位判断（暂存位无占用目标位占用 或者 暂存位被占用一个需进行优先级处理判断)
|
|
|
if (hcwList.size() > 1 && targetXbk.equals("1")) {
|
|
|
@@ -249,7 +250,7 @@ public class CacheRobotStrategy implements RobotStrategy {
|
|
|
returnMap.put(YunjianConstant.YUNJIAN_XBKFLAG, "1");
|
|
|
returnMap.put(YunjianConstant.YUNJIAN_HCW_XBKFLAG, "1");
|
|
|
msgUtil.redis_set(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_STORE + taskNode.getId(), targetStorge, 10, TimeUnit.DAYS);
|
|
|
- }else if(hcwList.size() == 1 && ObjectUtil.isEmpty(hcwExecFlag)){
|
|
|
+ }else if(hcwList.size() == 1 && ObjectUtil.isEmpty(hcwExecFlag) && ObjectUtil.isEmpty(hcwXbkFlag)){
|
|
|
targetStorge = hcwStorge;
|
|
|
returnMap.put(YunjianConstant.YUNJIAN_XBKFLAG, "1");
|
|
|
returnMap.put(YunjianConstant.YUNJIAN_HCW_XBKFLAG, "1");
|
