|
@ -151,10 +151,6 @@ public class FJMKTask extends AbstractTask { |
|
|
.collect(Collectors.toList()); |
|
|
.collect(Collectors.toList()); |
|
|
JSONObject jsonObject = JSONObject.parseObject(task.getRequest_param()); |
|
|
JSONObject jsonObject = JSONObject.parseObject(task.getRequest_param()); |
|
|
String startPoint = task.getPoint_code1(); |
|
|
String startPoint = task.getPoint_code1(); |
|
|
// 获取起点 回写载具编码
|
|
|
|
|
|
SchBasePoint startPointObj = pointService.getById(startPoint); |
|
|
|
|
|
// 起点的木托盘编码
|
|
|
|
|
|
task.setVehicle_code(startPointObj.getVehicle_code()); |
|
|
|
|
|
// 找终点
|
|
|
// 找终点
|
|
|
/** 包装位 */ |
|
|
/** 包装位 */ |
|
|
SchBasePoint packagePoint = findNextPoint(nextRegionStr, jsonObject); |
|
|
SchBasePoint packagePoint = findNextPoint(nextRegionStr, jsonObject); |
|
@ -380,7 +376,6 @@ public class FJMKTask extends AbstractTask { |
|
|
fjcPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode()); |
|
|
fjcPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode()); |
|
|
fjcPointObj.setVehicle_qty(1); |
|
|
fjcPointObj.setVehicle_qty(1); |
|
|
fjcPointObj.setVehicle_type(taskObj.getVehicle_type()); |
|
|
fjcPointObj.setVehicle_type(taskObj.getVehicle_type()); |
|
|
fjcPointObj.setVehicle_code(taskObj.getVehicle_code2()); // 拿过来的载具编码
|
|
|
|
|
|
PointUtils.setUpdateByType(fjcPointObj, taskFinishedType); |
|
|
PointUtils.setUpdateByType(fjcPointObj, taskFinishedType); |
|
|
pointService.updateById(fjcPointObj); |
|
|
pointService.updateById(fjcPointObj); |
|
|
} |
|
|
} |
|
|