|
|
|
@ -80,7 +80,7 @@ public class YZSLTask extends AbstractTask { |
|
|
|
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>() |
|
|
|
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE)); |
|
|
|
for (SchBaseTask task : tasks) { |
|
|
|
TaskUtils.setUpdateByAcs(task); // 修改修改者
|
|
|
|
TaskUtils.setUpdateByAcs(task); |
|
|
|
List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(",")) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
// 找终点
|
|
|
|
@ -117,7 +117,7 @@ public class YZSLTask extends AbstractTask { |
|
|
|
// 配置信息
|
|
|
|
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>() |
|
|
|
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE)); |
|
|
|
TaskUtils.setUpdateByAcs(task); // 修改修改者
|
|
|
|
TaskUtils.setUpdateByAcs(task); |
|
|
|
List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(",")) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
// 找终点
|
|
|
|
@ -168,7 +168,7 @@ public class YZSLTask extends AbstractTask { |
|
|
|
} |
|
|
|
// 判断是否加急，加急则去窑口，不加急就是去双层缓存输送线
|
|
|
|
if (one.getIs_urgent()) { |
|
|
|
regionCode = nextRegionStr.get(1); // 去窑区
|
|
|
|
regionCode = nextRegionStr.get(1); |
|
|
|
// 判断窑区是否可用
|
|
|
|
SchBasePoint basePoint = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>() |
|
|
|
.eq(SchBasePoint::getRegion_code, regionCode) |
|
|
|
@ -183,15 +183,17 @@ public class YZSLTask extends AbstractTask { |
|
|
|
LambdaQueryWrapper<SchBasePoint> lam = new QueryWrapper<SchBasePoint>().lambda(); |
|
|
|
lam.eq(SchBasePoint::getRegion_code, regionCode) |
|
|
|
.eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode()) |
|
|
|
.eq(SchBasePoint::getPoint_type, GeneralDefinition.ENTRANCE) // 对接位
|
|
|
|
.and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
|
|
|
|
.eq(SchBasePoint::getPoint_type, GeneralDefinition.ENTRANCE) |
|
|
|
.and(la -> la.isNull(SchBasePoint::getIng_task_code) |
|
|
|
.or() |
|
|
|
.eq(SchBasePoint::getIng_task_code, "")) |
|
|
|
.eq(SchBasePoint::getIs_used, true); |
|
|
|
// 如果一个有货一个没货，但是载具数量又是5的时候，就要不需要检测不能为5
|
|
|
|
List<SchBasePoint> list = pointService.list(lam); |
|
|
|
boolean doDetection = list.size() != 1; // 如果只有一条符合的数据就不需要检验不符合5个托
|
|
|
|
lam.ne(doDetection, SchBasePoint::getVehicle_qty, 5) // 载具数量不能等于5
|
|
|
|
// 如果只有一条符合的数据就不需要检验不符合5个托
|
|
|
|
boolean doDetection = list.size() != 1; |
|
|
|
// 载具数量不能等于5
|
|
|
|
lam.ne(doDetection, SchBasePoint::getVehicle_qty, 5) |
|
|
|
.orderByDesc(SchBasePoint::getVehicle_qty); |
|
|
|
List<SchBasePoint> schBasePoints = pointService.list(lam); |
|
|
|
return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null; |
|
|
|
@ -271,12 +273,11 @@ public class YZSLTask extends AbstractTask { |
|
|
|
groupEntity.setVehicle_code(vehicleCode); |
|
|
|
groupEntity.setVehicle_type(vehicleType); |
|
|
|
groupEntity.setMaterial_qty(qty); |
|
|
|
groupEntity.setExt_data(JSONObject.toJSONString(stackParameters)); // 垛型参数
|
|
|
|
groupEntity.setPoint_code(basePoint.getPoint_code()); // 对接位
|
|
|
|
groupEntity.setExt_data(JSONObject.toJSONString(stackParameters)); |
|
|
|
groupEntity.setPoint_code(basePoint.getPoint_code()); |
|
|
|
groupEntity.setPoint_name(basePoint.getPoint_name()); |
|
|
|
groupEntity.setSource_vehicle_code(basePoint.getPoint_code()); |
|
|
|
groupEntity.setMove_way(basePoint.getPoint_code()); |
|
|
|
// groupEntity.setPcsn(DateUtil.format(DateUtil.date(), "yyyyMMdd")); // 批次号使用自己定义的、暂时没用压机工单
|
|
|
|
groupEntity.setPcsn(ObjectUtil.isNotEmpty(workorderObject) |
|
|
|
? workorderObject.getBatch_no() |
|
|
|
: DateUtil.format(DateUtil.date(), "yyyyMMdd")); |
|
|
|
@ -324,8 +325,8 @@ public class YZSLTask extends AbstractTask { |
|
|
|
// 组盘表数据改成已绑定
|
|
|
|
SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id()); |
|
|
|
TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType); |
|
|
|
vehiclematerialgroup.setTask_code(taskObj.getTask_code()); // 当前任务
|
|
|
|
vehiclematerialgroup.setBuss_move_id(taskObj.getTask_code()); // 设置链路id，使用任务编码
|
|
|
|
vehiclematerialgroup.setTask_code(taskObj.getTask_code()); |
|
|
|
vehiclematerialgroup.setBuss_move_id(taskObj.getTask_code()); |
|
|
|
vehiclematerialgroup.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); |
|
|
|
vehiclematerialgroup.setPoint_code(endPointObj.getPoint_code()); |
|
|
|
vehiclematerialgroup.setPoint_name(endPointObj.getPoint_name()); |
|
|
|
|
